diff --git a/pkgs/development/python-modules/pytest-astropy-header/default.nix b/pkgs/development/python-modules/pytest-astropy-header/default.nix index acc555035822..4d95058b9354 100644 --- a/pkgs/development/python-modules/pytest-astropy-header/default.nix +++ b/pkgs/development/python-modules/pytest-astropy-header/default.nix @@ -6,29 +6,21 @@ , pytest-cov , pytestCheckHook , numpy -, astropy -, scipy -, h5py -, scikitimage +, setuptools-scm }: buildPythonPackage rec { pname = "pytest-astropy-header"; - version = "0.1.2"; + version = "0.2.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "1y87agr324p6x5gvhziymxjlw54pyn4gqnd49papbl941djpkp5g"; + sha256 = "77891101c94b75a8ca305453b879b318ab6001b370df02be2c0b6d1bb322db10"; }; - patches = [ (fetchpatch { - url = "https://github.com/astropy/pytest-astropy-header/pull/16.patch"; - sha256 = "11ln63zq0kgsdx1jw3prlzpcdbxmc99p9cwr18s0x6apy0k6df31"; - }) - (fetchpatch { - url = "https://github.com/astropy/pytest-astropy-header/pull/29.patch"; - sha256 = "18l434c926r5z1iq3b6lpnp0lrssszars9y1y9hs6216r60jgjpl"; - }) + + nativeBuildInputs = [ + setuptools-scm ]; buildInputs = [ @@ -37,12 +29,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytest-cov numpy - scipy - h5py - scikitimage - astropy ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest-astropy/default.nix b/pkgs/development/python-modules/pytest-astropy/default.nix index 45ad26ab279e..1e1f386eef44 100644 --- a/pkgs/development/python-modules/pytest-astropy/default.nix +++ b/pkgs/development/python-modules/pytest-astropy/default.nix @@ -1,10 +1,12 @@ { lib , buildPythonPackage , fetchPypi +, attrs , hypothesis , pytest , pytest-arraydiff , pytest-astropy-header +, pytest-cov , pytest-doctestplus , pytest-filter-subpackage , pytest-mock @@ -33,9 +35,11 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + attrs hypothesis pytest-arraydiff pytest-astropy-header + pytest-cov pytest-doctestplus pytest-filter-subpackage pytest-mock diff --git a/pkgs/development/python-modules/radio_beam/default.nix b/pkgs/development/python-modules/radio_beam/default.nix index bcb099887695..aa56e223237b 100644 --- a/pkgs/development/python-modules/radio_beam/default.nix +++ b/pkgs/development/python-modules/radio_beam/default.nix @@ -4,21 +4,22 @@ , setuptools-scm , astropy , numpy +, matplotlib , scipy , six , pytestCheckHook -, pytest-doctestplus +, pytest-astropy }: buildPythonPackage rec { pname = "radio_beam"; - version = "0.3.3"; + version = "0.3.4"; format = "pyproject"; src = fetchPypi { inherit version; pname = "radio-beam"; - sha256 = "e34902d91713ccab9f450b9d3e82317e292cf46a30bd42f9ad3c9a0519fcddcd"; + sha256 = "e032257f1501303873f251c00c74b1188180785c79677fb4443098d517852309"; }; nativeBuildInputs = [ @@ -34,14 +35,10 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytest-doctestplus + matplotlib + pytest-astropy ]; - # Tests must be run in the build directory - preCheck = '' - cd build/lib - ''; - meta = { description = "Tools for Beam IO and Manipulation"; homepage = "http://radio-astro-tools.github.io";