Merge pull request #181972 from yl3dy/scikit-image_0_19_1
This commit is contained in:
commit
2bd7266a48
|
@ -77,5 +77,8 @@ buildPythonPackage rec {
|
|||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ cmcdragonkai rakesh4g ];
|
||||
platforms = platforms.linux;
|
||||
# Scikit-image 0.19 update broke API, see https://github.com/scikit-image/scikit-image/releases/tag/v0.19.0
|
||||
# and https://github.com/scikit-image/scikit-image/issues/6093
|
||||
broken = lib.versionAtLeast scikitimage.version "0.19";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
, buildPythonPackage
|
||||
, python
|
||||
, cython
|
||||
, pythran
|
||||
, numpy
|
||||
, scipy
|
||||
, matplotlib
|
||||
|
@ -16,25 +17,24 @@
|
|||
, imageio
|
||||
, tifffile
|
||||
, pytestCheckHook
|
||||
, doCheck ? false
|
||||
}:
|
||||
|
||||
let
|
||||
installedPackageRoot = "${builtins.placeholder "out"}/${python.sitePackages}";
|
||||
self = buildPythonPackage rec {
|
||||
pname = "scikit-image";
|
||||
version = "0.18.3";
|
||||
version = "0.19.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0a2h3bw5rkk23k4r04qc9maccg00nddssd7lfsps8nhp5agk1vyh";
|
||||
sha256 = "sha256-zvXgZdvYycFbbMsBFSqMDzLanEtF9+JuVSQ3AM8/LQk=";
|
||||
};
|
||||
|
||||
patches = [ ./add-testing-data.patch ];
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
nativeBuildInputs = [ cython pythran ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cloudpickle
|
||||
|
@ -51,7 +51,7 @@ let
|
|||
];
|
||||
|
||||
# test suite is very cpu intensive, move to passthru.tests
|
||||
inherit doCheck;
|
||||
doCheck = false;
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
# (1) The package has cythonized modules, whose .so libs will appear only in the wheel, i.e. in nix store;
|
||||
|
|
Loading…
Reference in a new issue