public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #97993 from bcdarwin/update-batchgenerators

Browse Source 
python3Packages.batchgenerators: 0.20.0 -> 0.20.1
This commit is contained in:
Mario Rodas 2020-10-10 08:21:18 -05:00 committed by GitHub
commit 82b5381414
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/python-modules/batchgenerators/default.nix
View File

@ -3,7 +3,7 @@
, isPy27 , isPy27
, fetchFromGitHub , fetchFromGitHub
, fetchpatch , fetchpatch
, pytest , pytestCheckHook
, unittest2 , unittest2
, future , future
, numpy , numpy
@ -16,7 +16,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "batchgenerators"; pname = "batchgenerators";
version = "0.20.0"; version = "0.20.1";
disabled = isPy27; disabled = isPy27;
@ -24,11 +24,12 @@ buildPythonPackage rec {
owner = "MIC-DKFZ"; owner = "MIC-DKFZ";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0cc3i4wznqb7lk8n6jkprvkpsby6r7khkxqwn75k8f01mxgjfpvf"; sha256 = "1f91yflv9rschyl5bnfn735hp1rxrzcxkx18aajmlzb067h0ip8m";
}; };
patches = [ patches = [
# lift Pillow bound; should be merged in next release
(fetchpatch { (fetchpatch {
url = "https://github.com/MIC-DKFZ/batchgenerators/pull/59.patch"; url = "https://github.com/MIC-DKFZ/batchgenerators/pull/59.patch";
sha256 = "171b3dm40yn0wi91m9s2nq3j565s1w39jpdf1mvc03rn75i8vdp0"; sha256 = "171b3dm40yn0wi91m9s2nq3j565s1w39jpdf1mvc03rn75i8vdp0";
@ -39,9 +40,7 @@ buildPythonPackage rec {
future numpy pillow scipy scikitlearn scikitimage threadpoolctl future numpy pillow scipy scikitlearn scikitimage threadpoolctl
]; ];
checkInputs = [ pytest unittest2 ]; checkInputs = [ pytestCheckHook unittest2 ];
checkPhase = "pytest tests";
meta = { meta = {
description = "2D and 3D image data augmentation for deep learning"; description = "2D and 3D image data augmentation for deep learning";

11
pkgs/development/python-modules/threadpoolctl/default.nix
View File

@ -3,7 +3,7 @@
, isPy27 , isPy27
, fetchFromGitHub , fetchFromGitHub
, flit , flit
, pytest , pytestCheckHook
, pytestcov , pytestcov
, numpy , numpy
, scipy , scipy
@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "threadpoolctl"; pname = "threadpoolctl";
version = "2.0.0"; version = "2.1.0";
disabled = isPy27; disabled = isPy27;
format = "flit"; format = "flit";
@ -20,13 +20,10 @@ buildPythonPackage rec {
owner = "joblib"; owner = "joblib";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "16z4n82f004i4l1jw6qrzazda1m6v2yjnpqlp71ipa8mzy9kw7dw"; sha256 = "0sl6mp3b2gb0dvqkhnkmrp2g3r5c7clyyyxzq44xih6sw1pgx9df";
}; };
checkInputs = [ pytest pytestcov numpy scipy ]; checkInputs = [ pytestCheckHook 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
meta = with lib; { meta = with lib; {
homepage = "https://github.com/joblib/threadpoolctl"; homepage = "https://github.com/joblib/threadpoolctl";