From c7dd47dfbe267c44354398481bbcb0b0444a64d8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 3 Dec 2023 00:02:51 +0100
Subject: [PATCH] python3Packages.scikit-image: 0.21.0 -> 0.22.0

https://github.com/scikit-image/scikit-image/releases/tag/refs/tags/v0.22.0
---
 .../python-modules/scikit-image/default.nix   | 12 ++------
 .../suppress-deprecation-warning.patch        | 30 -------------------
 2 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/development/python-modules/scikit-image/suppress-deprecation-warning.patch

diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix
index 7987f3bba1cb..58b85429efb6 100644
--- a/pkgs/development/python-modules/scikit-image/default.nix
+++ b/pkgs/development/python-modules/scikit-image/default.nix
@@ -34,7 +34,7 @@ let
   installedPackageRoot = "${builtins.placeholder "out"}/${python.sitePackages}";
   self = buildPythonPackage rec {
     pname = "scikit-image";
-    version = "0.21.0";
+    version = "0.22.0";
     format = "pyproject";
 
     disabled = pythonOlder "3.8";
@@ -42,16 +42,10 @@ let
     src = fetchFromGitHub {
       owner = "scikit-image";
       repo = "scikit-image";
-      rev = "v${version}";
-      hash = "sha256-WJ2WNlcFCEtPr+bV/af6MoBBhbXDpOBEsJu4FmudoIo=";
+      rev = "refs/tags/v${version}";
+      hash = "sha256-M18y5JBPf3DR7SlJcCf82nG2MzwILg2w1AhJMzZXslg=";
     };
 
-    patches = [
-      # https://github.com/scikit-image/scikit-image/pull/7052
-      # prepare a patch file because the commit contains additional changes
-      ./suppress-deprecation-warning.patch
-    ];
-
     postPatch = ''
       patchShebangs skimage/_build_utils/{version,cythoner}.py
 
diff --git a/pkgs/development/python-modules/scikit-image/suppress-deprecation-warning.patch b/pkgs/development/python-modules/scikit-image/suppress-deprecation-warning.patch
deleted file mode 100644
index f51f1d9860a4..000000000000
--- a/pkgs/development/python-modules/scikit-image/suppress-deprecation-warning.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/skimage/exposure/tests/test_exposure.py b/skimage/exposure/tests/test_exposure.py
-index ed8dd6bc8..8ec7d13bf 100644
---- a/skimage/exposure/tests/test_exposure.py
-+++ b/skimage/exposure/tests/test_exposure.py
-@@ -368,19 +368,16 @@ def test_rescale_nan_warning(in_range, out_range):
-     )
- 
-     # 2019/11/10 Passing NaN to np.clip raises a DeprecationWarning for
--    # versions above 1.17
--    # TODO: Remove once NumPy removes this DeprecationWarning
-+    # versions above 1.17, "|\A\Z" marks as optional warning
-+    # TODO: Remove once NumPy 1.25.0 is minimal dependency
-     numpy_warning_1_17_plus = (
--        "Passing `np.nan` to mean no clipping in np.clip"
-+        "|\\A\\ZPassing `np.nan` to mean no clipping in np.clip"
-     )
- 
--    if in_range == "image":
--        exp_warn = [msg, numpy_warning_1_17_plus]
--    else:
--        exp_warn = [msg]
-+    with expected_warnings([msg, numpy_warning_1_17_plus]):
-+        result = exposure.rescale_intensity(image, in_range, out_range)
- 
--    with expected_warnings(exp_warn):
--        exposure.rescale_intensity(image, in_range, out_range)
-+    assert np.all(np.isnan(result))
- 
- 
- @pytest.mark.parametrize(