diff options
author | annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2023-11-20 11:17:15 +0000 |
---|---|---|
committer | annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2023-11-20 20:02:23 +0000 |
commit | 21c70852a03f8941d655d43e4a2ec65c2e5e34ad (patch) | |
tree | 483bd8d8ab457c86c5946f3a73c5d42b34724220 | |
parent | 0bf3f5cf6a98b5d077cdcdb00a6d4b3d92bc78b5 (diff) |
python311Packages.scikit-misc: replace ILP64 libs with LP64
scikit-misc was using the openblas package which is ILP64, however, numpy uses LP64 as to most of the other python packages. This change lines up scikit-misc with the same BLAS/LACAK libs numpy is using. Also enable the only test.
-rw-r--r-- | pkgs/development/python-modules/scikit-misc/default.nix | 49 |
1 files changed, 34 insertions, 15 deletions
diff --git a/pkgs/development/python-modules/scikit-misc/default.nix b/pkgs/development/python-modules/scikit-misc/default.nix index c49ffd7bce5d5..cf9d4c84c0bbd 100644 --- a/pkgs/development/python-modules/scikit-misc/default.nix +++ b/pkgs/development/python-modules/scikit-misc/default.nix @@ -7,10 +7,12 @@ , git , meson-python , pkg-config +, blas +, lapack , numpy -, openblas , setuptools , wheel +, pytestCheckHook }: buildPythonPackage rec { @@ -25,22 +27,17 @@ buildPythonPackage rec { hash = "sha256-XV3s+y3JdMr1770S91ek6Y7MqvTg7/2cphLQldUPe5s="; }; - patches = [ - # check for openblas64 pkg-config - # remove when patch merged upstream - # https://github.com/has2k1/scikit-misc/pull/29 - (fetchpatch { - name = "openblas64-pkg-config.patch"; - url = "https://github.com/has2k1/scikit-misc/commit/6a140de18e5e1276c7aa08bf0a047b1023aa9ae4.patch"; - hash = "sha256-HzKiRISOvoDIUIcgiYVvxhx9klwyfAh/1DDKq7inl+A="; - }) - ]; - postPatch = '' patchShebangs . + # unbound numpy and disable coverage testing in pytest substituteInPlace pyproject.toml \ - --replace 'numpy==' 'numpy>=' + --replace 'numpy==' 'numpy>=' \ + --replace 'addopts = "' '#addopts = "' + + # provide a version to use when git fails to get the tag + [[ -f skmisc/_version.py ]] || \ + echo '__version__ = "${version}"' > skmisc/_version.py ''; nativeBuildInputs = [ @@ -54,9 +51,31 @@ buildPythonPackage rec { wheel ]; - buildInputs = [ + propagatedBuildInputs = [ numpy - openblas + ]; + + buildInputs = [ + blas + lapack + ]; + + mesonFlags = [ + "-Dblas=${blas.pname}" + "-Dlapack=${lapack.pname}" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # can not run tests from source directory + preCheck = '' + cd "$(mktemp -d)" + ''; + + pytestFlagsArray = [ + "--pyargs skmisc" ]; pythonImportsCheck = [ |