Merge pull request #97993 from bcdarwin/update-batchgenerators

python3Packages.batchgenerators: 0.20.0 -> 0.20.1

2 files changed, 9 insertions, 13 deletions

diff --git a/pkgs/development/python-modules/batchgenerators/default.nix b/pkgs/development/python-modules/batchgenerators/default.nix
index b0f3cdb6e119..16b8f317a223 100644
--- a/pkgs/development/python-modules/batchgenerators/default.nix
+++ b/pkgs/development/python-modules/batchgenerators/default.nix
@@ -3,7 +3,7 @@
 , isPy27
 , fetchFromGitHub
 , fetchpatch
-, pytest
+, pytestCheckHook
 , unittest2
 , future
 , numpy
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "batchgenerators";
-  version = "0.20.0";
+  version = "0.20.1";
 
   disabled = isPy27;
 
@@ -24,11 +24,12 @@ buildPythonPackage rec {
     owner = "MIC-DKFZ";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0cc3i4wznqb7lk8n6jkprvkpsby6r7khkxqwn75k8f01mxgjfpvf";
+    sha256 = "1f91yflv9rschyl5bnfn735hp1rxrzcxkx18aajmlzb067h0ip8m";
 
   };
 
   patches = [
+    # lift Pillow bound; should be merged in next release
     (fetchpatch {
       url = "https://github.com/MIC-DKFZ/batchgenerators/pull/59.patch";
       sha256 = "171b3dm40yn0wi91m9s2nq3j565s1w39jpdf1mvc03rn75i8vdp0";
@@ -39,9 +40,7 @@ buildPythonPackage rec {
     future numpy pillow scipy scikitlearn scikitimage threadpoolctl
   ];
 
-  checkInputs = [ pytest unittest2 ];
-
-  checkPhase = "pytest tests";
+  checkInputs = [ pytestCheckHook unittest2 ];
 
   meta = {
     description = "2D and 3D image data augmentation for deep learning";
diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix
index e57b5c3b1567..fb2c6094b37c 100644
--- a/pkgs/development/python-modules/threadpoolctl/default.nix
+++ b/pkgs/development/python-modules/threadpoolctl/default.nix
@@ -3,7 +3,7 @@
 , isPy27
 , fetchFromGitHub
 , flit
-, pytest
+, pytestCheckHook
 , pytestcov
 , numpy
 , scipy
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "threadpoolctl";
-  version = "2.0.0";
+  version = "2.1.0";
 
   disabled = isPy27;
   format = "flit";
@@ -20,13 +20,10 @@ buildPythonPackage rec {
     owner = "joblib";
     repo = pname;
     rev = version;
-    sha256 = "16z4n82f004i4l1jw6qrzazda1m6v2yjnpqlp71ipa8mzy9kw7dw";
+    sha256 = "0sl6mp3b2gb0dvqkhnkmrp2g3r5c7clyyyxzq44xih6sw1pgx9df";
   };
 
-  checkInputs = [ pytest pytestcov numpy scipy ];
-
-  checkPhase = "pytest tests -k 'not test_nested_prange_blas'";
-  # cython doesn't get run on the tests when added to nativeBuildInputs, breaking this test
+  checkInputs = [ pytestCheckHook pytestcov numpy scipy ];
 
   meta = with lib; {
     homepage = "https://github.com/joblib/threadpoolctl";