Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

python3Packages.batchgenerators: 0.20.0 -> 0.20.1 #97993

Merged
merged 2 commits into from
Oct 10, 2020
Merged

python3Packages.batchgenerators: 0.20.0 -> 0.20.1 #97993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a4a655
python3Packages.threadpoolctl: 2.0.0 -> 2.1.0
bcdarwin Sep 12, 2020
1f5f642
python3Packages.batchgenerators: 0.20.0 -> 0.20.1
bcdarwin Sep 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions pkgs/development/python-modules/batchgenerators/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
, isPy27
, fetchFromGitHub
, fetchpatch
, pytest
, pytestCheckHook
, unittest2
, future
, numpy
Expand All @@ -16,19 +16,20 @@

buildPythonPackage rec {
pname = "batchgenerators";
version = "0.20.0";
version = "0.20.1";

disabled = isPy27;

src = fetchFromGitHub {
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";
Expand All @@ -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";
Expand Down
11 changes: 4 additions & 7 deletions pkgs/development/python-modules/threadpoolctl/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
, isPy27
, fetchFromGitHub
, flit
, pytest
, pytestCheckHook
, pytestcov
, numpy
, scipy
}:

buildPythonPackage rec {
pname = "threadpoolctl";
version = "2.0.0";
version = "2.1.0";

disabled = isPy27;
format = "flit";
Expand All @@ -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";
Expand Down