diff --git a/pkgs/development/libraries/xsimd/default.nix b/pkgs/development/libraries/xsimd/default.nix index 87da2c546b866..d775cef4d6734 100644 --- a/pkgs/development/libraries/xsimd/default.nix +++ b/pkgs/development/libraries/xsimd/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { description = "C++ wrappers for SIMD intrinsics"; homepage = "https://github.com/xtensor-stack/xsimd"; license = licenses.bsd3; - maintainers = with maintainers; [ tobim ]; + maintainers = with maintainers; [ tobim doronbehar ]; platforms = platforms.all; }; }) diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix index 9d34cb27c8cdc..deaab05a6574e 100644 --- a/pkgs/development/python-modules/meson-python/default.nix +++ b/pkgs/development/python-modules/meson-python/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Meson Python build backend (PEP 517)"; homepage = "https://github.com/mesonbuild/meson-python"; license = [ lib.licenses.mit ]; - maintainers = [ lib.maintainers.fridh ]; + maintainers = with lib.maintainers; [ fridh doronbehar ]; }; } diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index 1851eb3bbf23c..3e62fa882cc9b 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -79,5 +79,6 @@ in buildPythonPackage rec { description = "Ahead of Time compiler for numeric kernels"; homepage = "https://github.com/serge-sans-paille/pythran"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; }; } diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index caca48153b72b..ec6e966d79bf4 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -13,6 +13,9 @@ , pkg-config , pythran , wheel +, nose +, setuptools +, hypothesis , pytestCheckHook , pytest-xdist , numpy @@ -31,8 +34,8 @@ let # nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy # # The update script uses sed regexes to replace them with the updated hashes. - version = "1.11.4"; - srcHash = "sha256-hNAZOMDFYqZpb67Pzg/WALWagFYvqYO1jOmcipDDRbE="; + version = "1.12.0"; + srcHash = "sha256-PuiyYTgSegDTV9Kae5N68FOXT1jyJrNv9p2aFP70Z20="; datasetsHashes = { ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3"; ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj"; @@ -75,13 +78,11 @@ in buildPythonPackage { }) ]; - # Relax deps a bit + # Upstream complicated numpy version pinning is causing issues in the + # configurePhase, so we pass on it. postPatch = '' substituteInPlace pyproject.toml \ - --replace 'meson-python>=0.12.1,<0.15.0' 'meson-python' \ - --replace 'numpy==' 'numpy>=' \ - --replace "pybind11>=2.10.4,<2.11.1" "pybind11>=2.10.4,<2.12.0" \ - --replace 'wheel<0.41.0' 'wheel' + --replace-fail 'numpy==' 'numpy>=' \ ''; nativeBuildInputs = [ @@ -91,6 +92,7 @@ in buildPythonPackage { pythran pkg-config wheel + setuptools ]; buildInputs = [ @@ -108,6 +110,8 @@ in buildPythonPackage { __darwinAllowLocalNetworking = true; nativeCheckInputs = [ + nose + hypothesis pytestCheckHook pytest-xdist ]; @@ -157,42 +161,9 @@ in buildPythonPackage { # hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; - checkPhase = '' - runHook preCheck - - # Adapted from pytestCheckHook because scipy uses a custom check phase. - # It needs to pass `$args` as a Python list to `scipy.test` rather than as - # arguments to pytest on the command-line. - args="" - if [ -n "$disabledTests" ]; then - disabledTestsString=$(_pytestComputeDisabledTestsString "''${disabledTests[@]}") - args+="'-k','$disabledTestsString'" - fi - - if [ -n "''${disabledTestPaths-}" ]; then - eval "disabledTestPaths=($disabledTestPaths)" - fi - - for path in ''${disabledTestPaths[@]}; do - if [ ! -e "$path" ]; then - echo "Disabled tests path \"$path\" does not exist. Aborting" - exit 1 - fi - args+="''${args:+,}'--ignore=\"$path\"'" - done - args+="''${args:+,}$(printf \'%s\', "''${pytestFlagsArray[@]}")" - args=''${args%,} - - pushd "$out" + preCheck = '' export OMP_NUM_THREADS=$(( $NIX_BUILD_CORES / 4 )) - ${python.interpreter} -c "import scipy, sys; sys.exit(scipy.test( - 'fast', - verbose=10, - extra_argv=[$args], - parallel=$NIX_BUILD_CORES - ) != True)" - popd - runHook postCheck + cd $out ''; requiredSystemFeatures = [ "big-parallel" ]; # the tests need lots of CPU time