tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

gnu: python-scikit-image: Fix build with python-pillow 12.1.1.

Browse Source 
Followup to 017903d435f987c50c085bf415a07a551684412b.

* gnu/packages/python-science.scm (python-scikit-image): Fix build.
[source]: Add patch.
* gnu/packages/patchen/python-scikit-image-fix-python-pillow.patch: Add.
* gnu/local.mk (dist_patch_DATA): Register patch.

Merges: https://codeberg.org/guix/guix/pulls/7261
Change-Id: I7eee2e1f397f1f1ce0757f588da921687296ad41
Modified-by: Sharlatan Hellseher <sharlatanus@gmail.com>
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
This commit is contained in:
Hugo Buddelmeijer
2026-03-18 07:57:18 +01:00
committed by Sharlatan Hellseher
parent cd127b2418
commit 1d1fcaf4e9
3 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gnu/local.mk
View File

@@ -2116,6 +2116,7 @@ dist_patch_DATA = \
%D%/packages/patches/python-pyreadstat-link-libiconv.patch \
%D%/packages/patches/python-sip-include-dirs.patch \
%D%/packages/patches/python-scikit-build-setuptools-compat.patch \
%D%/packages/patches/python-scikit-image-fix-python-pillow.patch \
%D%/packages/patches/python-sgmllib3k-assertions.patch \
%D%/packages/patches/python-sphobjinv-defer-ssl-import.patch \
%D%/packages/patches/python-sphinx-prompt-docutils-0.19.patch \

20
gnu/packages/patches/python-scikit-image-fix-python-pillow.patch Normal file
View File

@@ -0,0 +1,20 @@
From 9d8daba419249f9d3327fe85177d79b18adb6032 Mon Sep 17 00:00:00 2001
From: Stefan van der Walt <stefanv@berkeley.edu>
Date: Thu, 8 Jan 2026 03:39:36 -0800
Subject: [PATCH] Handle PIL Image.getdata deprecation (#8010)
diff --git a/src/skimage/io/_plugins/pil_plugin.py b/src/skimage/io/_plugins/pil_plugin.py
index 7a75c5fc0af..098d22a148e 100644
--- a/src/skimage/io/_plugins/pil_plugin.py
+++ b/src/skimage/io/_plugins/pil_plugin.py
@@ -47,6 +47,10 @@ def pil_to_ndarray(image, dtype=None, img_num=None):
Refer to ``imread``.
"""
+ # PIL 12.1.0 renames getdata
+ if hasattr(image, "get_flattened_data"):
+ image.getdata = image.get_flattened_data
+
try:
# this will raise an IOError if the file is not readable
image.getdata()[0]

4
gnu/packages/python-science.scm
View File

@@ -3090,6 +3090,10 @@ logic, also known as grey logic.")
(url "https://github.com/scikit-image/scikit-image")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
;; TODO: Remove patch when refreshing python-scikit-image.
;; Prevent deprecation warning from python-pillow 12.1.1.
(patches
(search-patches "python-scikit-image-fix-python-pillow.patch"))
(sha256
(base32 "1x90jad3jqin8ws1j1i89zrajpcbn1h87nl5yxxf5cs3b7ha13rf"))))
(build-system pyproject-build-system)