From 4259684ed24ddaa8eead6018604b6e7d32df238a Mon Sep 17 00:00:00 2001 From: annalee <168274788+annaleeleaves@users.noreply.github.com> Date: Mon, 6 May 2024 09:59:30 +0000 Subject: [PATCH 1/2] python311Packages.astropy-healpix: relax numpy deps numpy>=2.0.0rc1 required for build-system. unfortunately, pythonRelaxDepsHook doesn't seem to prevent the check from failing so remove version manually from pyproject.toml --- pkgs/development/python-modules/astropy-healpix/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/astropy-healpix/default.nix b/pkgs/development/python-modules/astropy-healpix/default.nix index fa04d6595e8b..26be3405964c 100644 --- a/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/pkgs/development/python-modules/astropy-healpix/default.nix @@ -23,8 +23,13 @@ buildPythonPackage rec { hash = "sha256-3l0qfsl7FnBFBmlx8loVDR5AYfBxWb4jZJY02zbnl0Y="; }; + postPatch = '' + substituteInPlace pyproject.toml --replace "numpy>=2.0.0rc1" "numpy" + ''; + nativeBuildInputs = [ astropy-extension-helpers + numpy setuptools setuptools-scm ]; From 70e176b9ce3b9603ffe0a3d1324e1a32ad66dcf6 Mon Sep 17 00:00:00 2001 From: annalee <168274788+annaleeleaves@users.noreply.github.com> Date: Mon, 6 May 2024 19:38:34 +0000 Subject: [PATCH 2/2] python311Packages.reproject: relax numpy deps, fix filterwarnings marker error numpy>=2.0.0rc1 required for build-system. unfortunately, pythonRelaxDepsHook doesn't seem to prevent the check from failing so remove version manually from pyproject.toml --- pkgs/development/python-modules/reproject/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index c5ee96236543..940e2d0daac5 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -9,7 +9,6 @@ , fetchPypi , fsspec , numpy -, oldest-supported-numpy , pytest-astropy , pytestCheckHook , pythonOlder @@ -23,7 +22,7 @@ buildPythonPackage rec { version = "0.13.1"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; @@ -32,14 +31,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "cython==" "cython>=" + --replace "cython==" "cython>=" \ + --replace "numpy>=2.0.0rc1" "numpy" ''; nativeBuildInputs = [ astropy-extension-helpers cython numpy - oldest-supported-numpy setuptools-scm ]; @@ -65,6 +64,8 @@ buildPythonPackage rec { "-p no:warnings" # Uses network "--ignore build/lib*/reproject/interpolation/" + # prevent "'filterwarnings' not found in `markers` configuration option" error + "-o 'markers=filterwarnings'" ]; pythonImportsCheck = [