From 691229c5a894cebd48c2d53229108722daf92476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maret?= <sebastien.maret@icloud.com>
Date: Tue, 27 Sep 2022 13:10:11 +0200
Subject: [PATCH 1/4] python3Packages.pytest-astropy-header: 0.1.2 -> 0.2.2

 - Update the the latest upstream
 - Add missing dependency in nativeBuildInputs
 - Remove unnecessary dependencies in checkInputs
---
 .../pytest-astropy-header/default.nix         | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-astropy-header/default.nix b/pkgs/development/python-modules/pytest-astropy-header/default.nix
index acc555035822..3aa079b72b2d 100644
--- a/pkgs/development/python-modules/pytest-astropy-header/default.nix
+++ b/pkgs/development/python-modules/pytest-astropy-header/default.nix
@@ -8,27 +8,23 @@
 , numpy
 , astropy
 , scipy
+, setuptools-scm
 , h5py
 , scikitimage
 }:
 
 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 +33,7 @@ buildPythonPackage rec {
 
   checkInputs = [
     pytestCheckHook
-    pytest-cov
     numpy
-    scipy
-    h5py
-    scikitimage
-    astropy
   ];
 
   meta = with lib; {

From 5f07258cac1a2046b23074d70bd631f38d0ede90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maret?= <sebastien.maret@icloud.com>
Date: Tue, 27 Sep 2022 19:58:20 +0200
Subject: [PATCH 2/4] python3Packages.pytest-astropy: add missing dependencies

---
 pkgs/development/python-modules/pytest-astropy/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

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

From 4de34f80ce957282489f489e27ad9176c360e2e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maret?= <sebastien.maret@icloud.com>
Date: Tue, 27 Sep 2022 20:07:16 +0200
Subject: [PATCH 3/4] python3Packages.radio_beam: 0.3.3 -> 0.3.4

 - Upgrade to the latest upstream
 - Fix checkInputs
 - Include tests that were skipped previously
---
 .../python-modules/radio_beam/default.nix         | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

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";

From bf012b5f48753331f6ee31023299451395215761 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maret?= <sebastien.maret@icloud.com>
Date: Thu, 29 Sep 2022 16:47:27 +0200
Subject: [PATCH 4/4] python3Packages.pytest-astropy-header: remove extra
 arguments

---
 .../python-modules/pytest-astropy-header/default.nix          | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-astropy-header/default.nix b/pkgs/development/python-modules/pytest-astropy-header/default.nix
index 3aa079b72b2d..4d95058b9354 100644
--- a/pkgs/development/python-modules/pytest-astropy-header/default.nix
+++ b/pkgs/development/python-modules/pytest-astropy-header/default.nix
@@ -6,11 +6,7 @@
 , pytest-cov
 , pytestCheckHook
 , numpy
-, astropy
-, scipy
 , setuptools-scm
-, h5py
-, scikitimage
 }:
 
 buildPythonPackage rec {