From 0d6e54e62917652176e2d874ca57712640473feb Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 7 Jan 2023 09:03:50 +0200 Subject: [PATCH] python3.pkgs.scipy: 1.9.3 -> 1.10.1 --- pkgs/development/python-modules/scipy/default.nix | 13 +++++++++++-- .../scipy/disable-datasets-tests.patch | 9 +++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/scipy/disable-datasets-tests.patch diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 13bc07faed3a..cb2bc210a72b 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -15,24 +15,33 @@ , pytest-xdist , numpy , pybind11 +, pooch , libxcrypt }: buildPythonPackage rec { pname = "scipy"; - version = "1.9.3"; + version = "1.10.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+8XAXIXBoCvnex/1kQh8g7xEV5xtK9n7eYu2TqXhoCc="; + sha256 = "sha256-LPnfuAp7RYm6TEDOdYiYbW1c68VFfK0sKID2vC1C86U="; }; + patches = [ + # These tests require internet connection, currently impossible to disable + # them otherwise, see: + # https://github.com/scipy/scipy/pull/17965 + ./disable-datasets-tests.patch + ]; + nativeBuildInputs = [ cython gfortran meson-python pythran pkg-config wheel ]; buildInputs = [ numpy.blas pybind11 + pooch ] ++ lib.optionals (pythonOlder "3.9") [ libxcrypt ]; diff --git a/pkgs/development/python-modules/scipy/disable-datasets-tests.patch b/pkgs/development/python-modules/scipy/disable-datasets-tests.patch new file mode 100644 index 000000000000..a06d0d50ddf4 --- /dev/null +++ b/pkgs/development/python-modules/scipy/disable-datasets-tests.patch @@ -0,0 +1,9 @@ +diff --git i/scipy/datasets/meson.build w/scipy/datasets/meson.build +index 101377253..eec2feea4 100644 +--- i/scipy/datasets/meson.build ++++ w/scipy/datasets/meson.build +@@ -11,4 +11,3 @@ py3.install_sources( + subdir: 'scipy/datasets' + ) + +-subdir('tests')