mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-15 22:36:23 +01:00
Merge pull request #193095 from risicle/ris-joblib-1.2.0
This commit is contained in:
commit
efbcfc6759
2 changed files with 14 additions and 9 deletions
|
@ -14,18 +14,22 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hdbscan";
|
||||
version = "0.8.27";
|
||||
version = "0.8.28";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e3a418d0d36874f7b6a1bf0b7461f3857fc13a525fd48ba34caed2fe8973aa26";
|
||||
sha256 = "sha256-7tr3Hy87vt/Ew42hrUiXRUzl69R5LhponJecKFPtwFo=";
|
||||
};
|
||||
patches = [
|
||||
# This patch fixes compatibility with numpy 1.20. It will be in the next release
|
||||
# after 0.8.27
|
||||
# should be included in next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scikit-learn-contrib/hdbscan/commit/5b67a4fba39c5aebe8187a6a418da677f89a63e0.patch";
|
||||
sha256 = "07d7jdwk0b8kgaqkifd529sarji01j1jiih7cfccc5kxmlb5py9h";
|
||||
name = "joblib-1.2.0-compat.patch";
|
||||
url = "https://github.com/scikit-learn-contrib/hdbscan/commit/d829c639923f6866e1917e46ddbde45b513913f3.patch";
|
||||
excludes = [
|
||||
"docs/basic_hdbscan.rst"
|
||||
"docs/how_hdbscan_works.rst"
|
||||
];
|
||||
sha256 = "sha256-t0D4OsHEcMwmBZM8Mk1N0uAKi6ra+TOzEks9/efsvWI=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
|
@ -9,20 +9,21 @@
|
|||
, lz4
|
||||
, setuptools
|
||||
, sphinx
|
||||
, psutil
|
||||
}:
|
||||
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "joblib";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4158fcecd13733f8be669be0683b96ebdbbd38d23559f54dca7205aea1bf1e35";
|
||||
sha256 = "sha256-4c7kp55K8iiBFk8hjUMR9gB0GX+3B+CC6AO2H20TcBg=";
|
||||
};
|
||||
|
||||
checkInputs = [ sphinx numpydoc pytestCheckHook ];
|
||||
checkInputs = [ sphinx numpydoc pytestCheckHook psutil ];
|
||||
propagatedBuildInputs = [ lz4 setuptools ];
|
||||
|
||||
pytestFlagsArray = [ "joblib/test" ];
|
||||
|
|
Loading…
Reference in a new issue