From b555997f312cd691ac7efaaafa251dc5d4164481 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 29 Dec 2019 17:52:40 -0500 Subject: python3Packages.fsspec: 0.5.2 -> 0.6.2 enable tests --- pkgs/development/python-modules/fsspec/default.nix | 32 ++++++++++++++-------- 1 file changed, 20 insertions(+), 12 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index a94f847fc908..8c2f87c8a407 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -1,26 +1,34 @@ { lib , buildPythonPackage -, fetchPypi -, pythonOlder +, fetchFromGitHub +, isPy27 +, pytest }: buildPythonPackage rec { pname = "fsspec"; - version = "0.5.2"; + version = "0.6.2"; + disabled = isPy27; - disabled = pythonOlder "3.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "6531a5fa9ea6bf27a5180d225558a8a7aa5d7c3cbf7e8b146dd37ac699017937"; + src = fetchFromGitHub { + owner = "intake"; + repo = "filesystem_spec"; + rev = version; + sha256 = "1y3d6xw14rcldz9779ir6mjaff4rk82ch6ahn4y9mya0qglpc31i"; }; - # no tests - doCheck = false; + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest + ''; meta = with lib; { - description = "A specification that python filesystems should adhere to."; - homepage = "https://github.com/intake/filesystem_spec"; + description = "A specification that python filesystems should adhere to"; + homepage = https://github.com/intake/filesystem_spec; license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; }; } -- cgit 1.4.1 From 8bb4ccd1b5f492cdd6b12c3eefc3d83a672df336 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 29 Dec 2019 19:30:23 -0500 Subject: pythonPackages.diskcache: refactor fix broken build --- .../python-modules/diskcache/default.nix | 26 +++++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix index 6aec01ed7388..a420fc037bbe 100644 --- a/pkgs/development/python-modules/diskcache/default.nix +++ b/pkgs/development/python-modules/diskcache/default.nix @@ -1,22 +1,36 @@ { lib , buildPythonPackage -, fetchPypi -, tox +, fetchFromGitHub +, pytest +, pytestcov +, pytest_xdist +, pytest-django +, mock }: buildPythonPackage rec { pname = "diskcache"; version = "4.1.0"; - src = fetchPypi { - inherit pname version; - sha256 = "bcee5a59f9c264e2809e58d01be6569a3bbb1e36a1e0fb83f7ef9b2075f95ce0"; + src = fetchFromGitHub { + owner = "grantjenks"; + repo = "python-diskcache"; + rev = "v${version}"; + sha256 = "0xy2vpk4hixb4gg871d9sx9wxdz8pi0pmnfdwg4bf8jqfjg022w8"; }; checkInputs = [ - tox + pytest + pytestcov + pytest_xdist + pytest-django + mock ]; + checkPhase = '' + pytest + ''; + meta = with lib; { description = "Disk and file backed persistent cache"; homepage = "http://www.grantjenks.com/docs/diskcache/"; -- cgit 1.4.1 From e291a32cd44767db8b43e5e74967130f757a407f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 30 Dec 2019 08:30:28 -0500 Subject: pythonPackages.imagecodecs-lite: 2019.4.20 -> 2019.12.3 --- .../python-modules/imagecodecs-lite/default.nix | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/imagecodecs-lite/default.nix b/pkgs/development/python-modules/imagecodecs-lite/default.nix index 6374b882718b..861a0ed0db3d 100644 --- a/pkgs/development/python-modules/imagecodecs-lite/default.nix +++ b/pkgs/development/python-modules/imagecodecs-lite/default.nix @@ -6,15 +6,28 @@ buildPythonPackage rec { pname = "imagecodecs-lite"; - version = "2019.4.20"; + version = "2019.12.3"; src = fetchPypi { inherit pname version; - sha256 = "1cp88g7g91gdhjhaz6gvb4jzvi5ad817id9f2bnc5r95ag93bqb0"; + sha256 = "0s4xb17qd7vimc46rafbjnibj4sf0lnv8cwl22k1h6zb7jhqmlcm"; }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ numpy cython ]; + nativeBuildInputs = [ + cython + ]; + + checkInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + numpy + ]; + + checkPhase = '' + pytest + ''; meta = with lib; { description = "Block-oriented, in-memory buffer transformation, compression, and decompression functions"; -- cgit 1.4.1 From 0a126855c014008d817157a67412eabe3cb5e75e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 30 Dec 2019 08:52:01 -0500 Subject: python3Packages.tifffile: refactor fix broken build --- .../python-modules/tifffile/default.nix | 27 ++++++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 8aafc39fc344..2220c8069291 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -1,5 +1,12 @@ -{ lib, fetchPypi, buildPythonPackage, isPy27 -, numpy, enum34, futures, pathlib +{ lib +, fetchPypi +, buildPythonPackage +, isPy27 +, numpy +, imagecodecs-lite +, enum34 +, futures +, pathlib , pytest }: @@ -17,13 +24,23 @@ buildPythonPackage rec { # Missing dependencies: imagecodecs, czifile, cmapfile, oiffile, lfdfiles # and test data missing from PyPI tarball doCheck = false; - checkInputs = [ pytest ]; + + checkInputs = [ + pytest + ]; + checkPhase = '' pytest ''; - propagatedBuildInputs = [ numpy ] - ++ lib.optionals isPy27 [ futures enum34 pathlib ]; + propagatedBuildInputs = [ + numpy + imagecodecs-lite + ] ++ lib.optionals isPy27 [ + futures + enum34 + pathlib + ]; meta = with lib; { description = "Read and write image data from and to TIFF files."; -- cgit 1.4.1