From 8dc07ea089faa12233e280b0823e1200ff07a599 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sun, 14 Dec 2025 10:55:35 +0000
Subject: [PATCH] gnu: python-dask-image: Update to 2025.11.0.

* gnu/packages/python-science.scm (python-dask-image): Update to 2025.11.0.
[arguments] <test-flags>: All tests passed.
<phases>: Add 'fix-pytest-config; rework 'set-version to read from envar.
[propagated-inputs]: Remove python-tifffile-for-dask-image; add
python-tifffile.
[native-inputs]: Remove python-setuptools-scm; add
python-setuptools-scm-next.

* gnu/packages/python-xyz.scm (python-tifffile-for-dask-image): Delete variable.

Change-Id: I928c39c848f3a20d5eb51d10e4c8374891b8f0b0
Signed-off-by: Rutherther <rutherther@ditigal.xyz>
---
 gnu/packages/python-science.scm | 31 ++++++++++---------------------
 gnu/packages/python-xyz.scm     | 14 --------------
 2 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index 18ae6157d00787e548aabd14cb775fca887bc8ab..e016684f811e8c358dd992e9c543fcecc5c23eed 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -854,49 +854,38 @@ optimization and generally improved organization.")
 (define-public python-dask-image
   (package
     (name "python-dask-image")
-    (version "2024.5.3")
+    (version "2025.11.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "dask_image" version))
        (sha256
-        (base32 "0g4293n1vjlpyxbvd1xz3pz9an9z4rnsw1m7lynhm00m0bgiz7qc"))))
+        (base32 "1cx07dh09yqq6swyziiy9mb2f27ywja18gylfly1874a7af1mks5"))))
     (build-system pyproject-build-system)
     (arguments
      (list
-      ;; tests: 2152 passed, 177 skipped, 6 deselected, 4037 warnings
-      #:test-flags
-      #~(list "-k" (string-join
-                    ;; KeyError: 'float32
-                    (list "not test_spline_filter_output_dtype[None-float32_1]"
-                          "test_spline_filter_output_dtype[-1-float32_1]"
-                          ;; AttributeError: 'str' object has no attribute
-                          ;; 'start'
-                          "test_find_objects"
-                          "test_3d_find_objects"
-                          ;; assert False
-                          "test_find_objects_with_empty_chunks")
-                    " and not "))
+      ;; tests: 2171 passed, 177 skipped, 3405 warnings
       #:phases
       #~(modify-phases %standard-phases
-          (add-before 'build 'set-version
+          (add-after 'unpack 'fix-pytest-config
             (lambda _
               (substitute* "pyproject.toml"
-                (("^version_file.*") "")
-                (("dynamic = \\[\"version\"\\]")
-                 (string-append "version = \"" #$version "\""))))))))
+                (("--flake8") ""))))
+          (add-before 'build 'set-version
+            (lambda _
+              (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version))))))
     (native-inputs
      (list python-pytest
            python-pytest-timeout
            python-setuptools
-           python-setuptools-scm))
+           python-setuptools-scm-next))
     (propagated-inputs
      (list python-dask
            python-numpy
            python-pandas
            python-pims
            python-scipy
-           python-tifffile-for-dask-image))
+           python-tifffile))
     (home-page "https://github.com/dask/dask-image")
     (synopsis "Distributed image processing")
     (description "This is a package for image processing with Dask arrays.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 957ee66fef7b0e46b3af9c97c7911748766b0f8b..2946f63e693446a1ed7290e5437bdcf96490e8fc 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -37927,20 +37927,6 @@ MicroManager, MD GEL, and FluoView files.  It also lets you write numpy arrays
 to TIFF, BigTIFF, and ImageJ hyperstack compatible files.")
     (license license:bsd-3)))
 
-(define-public python-tifffile-for-dask-image
-  ;; It's for python-dask-image@2024.5.3, remove when no longer required.
-  (hidden-package
-   (package
-     (inherit python-tifffile)
-     (name "python-tifffile")
-     (version "2023.12.9")
-     (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "tifffile" version))
-        (sha256
-         (base32 "1f6d8qdlq0zlksfdhp1mhj9icpwhw4cz47r4i80m6r0a328xmlcx")))))))
-
 (define-public python-tiktoken
   (package
     (name "python-tiktoken")