Merge pull request #133432 from risicle/ris-geomet-0.3.0

This commit is contained in:
Sandro 2021-08-21 14:14:58 +02:00 committed by GitHub
commit a39be830d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 11 deletions

View File

@ -35,6 +35,10 @@ buildPythonPackage rec {
sha256 = "1dn7iiavsrhh6i9hcyw0mk8j95r5ym0gbrvdca998hx2rnz5ark6"; sha256 = "1dn7iiavsrhh6i9hcyw0mk8j95r5ym0gbrvdca998hx2rnz5ark6";
}; };
postPatch = ''
substituteInPlace setup.py --replace 'geomet>=0.1,<0.3' 'geomet'
'';
nativeBuildInputs = [ cython ]; nativeBuildInputs = [ cython ];
buildInputs = [ libev ]; buildInputs = [ libev ];
propagatedBuildInputs = [ six geomet ] propagatedBuildInputs = [ six geomet ]
@ -80,6 +84,8 @@ buildPythonPackage rec {
"_PoolTests" "_PoolTests"
# attempts to make connection to localhost # attempts to make connection to localhost
"test_connection_initialization" "test_connection_initialization"
# time-sensitive
"test_nts_token_performance"
]; ];
meta = with lib; { meta = with lib; {

View File

@ -1,31 +1,22 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, click , click
, six , six
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "geomet"; pname = "geomet";
version = "0.2.1"; version = "0.3.0";
# pypi tarball doesn't include tests # pypi tarball doesn't include tests
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "geomet"; owner = "geomet";
repo = "geomet"; repo = "geomet";
rev = version; rev = version;
sha256 = "0fdi26glsmrsyqk86rnsfcqw79svn2b0ikdv89pq98ihrpwhn85y"; sha256 = "1lb0df78gkivsb7hy3ix0xccvcznvskip11hr5sgq5y76qnfc8p0";
}; };
patches = [
(fetchpatch {
name = "python-3.8-support.patch";
url = "https://github.com/geomet/geomet/commit/dc4cb4a856d3ad814b57b4b7487d86d9e0f0fad4.patch";
sha256 = "1f1cdfqyp3z01jdjvax77219l3gc75glywqrisqpd2k0m0g7fwh3";
})
];
propagatedBuildInputs = [ click six ]; propagatedBuildInputs = [ click six ];
meta = with lib; { meta = with lib; {