Unverified Commit 5ca6e2c7 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #309523 from annaleeleaves/astropy-healpix 

python311Packages.{astropy-healpix,reproject}: relax numpy deps, fix filterwarnings marker error
parents 390f1c2c 70e176b9

pkgs/development/python-modules/astropy-healpix/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -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

  ];

pkgs/development/python-modules/reproject/default.nix

+5 −4
Original line number Diff line number Diff line
@@ -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 = [