dev-python/pillow: Sync with Gentoo

It's from Gentoo commit deb475683f47ced56ed8e673564b8ea39badbf74.

Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
Flatcar Buildbot 2025-11-03 07:07:49 +00:00 committed by Krzesimir Nowak
parent 809528176f
commit 1b07d251e1
3 changed files with 7 additions and 58 deletions

View File

@ -1,4 +1,3 @@
DIST pillow-11.2.1.gh.tar.gz 47086538 BLAKE2B 306c3f4292681caea75835dc972229854e12260190f7e7b63ad5292091fcbb28a16fe102c9b2359fe72b99ad97821fa37715f5934bfe79a983efa81b07abf2a4 SHA512 4b5eee712b6cedf175e251ca29bb6e6dda27491585d343ef71ed416819e91510c4add6be50fe1151ab5f178f4686968de111beff4143a978b7a32519293a5725
DIST pillow-11.3.0.gh.tar.gz 47173056 BLAKE2B 1260c7025e6013c50782024756a0c891d3735bd7d4c1c9d0a89d9eb1c94bd2f762369086f7269d487100e8a0e2678a73012bf29172697c1a1a18e58f9019a9bd SHA512 7d97e623bd41da94dd89a66dc600cea016d0a4f33fbf036175768ea96b2031c1968acf4fc3d9b2835ce93f9533838a9ce68a6579a7397f4aeccafb6032adb3db DIST pillow-11.3.0.gh.tar.gz 47173056 BLAKE2B 1260c7025e6013c50782024756a0c891d3735bd7d4c1c9d0a89d9eb1c94bd2f762369086f7269d487100e8a0e2678a73012bf29172697c1a1a18e58f9019a9bd SHA512 7d97e623bd41da94dd89a66dc600cea016d0a4f33fbf036175768ea96b2031c1968acf4fc3d9b2835ce93f9533838a9ce68a6579a7397f4aeccafb6032adb3db
DIST pillow-12.0.0.gh.tar.gz 47078314 BLAKE2B 14540f6b016004de56e5736f66f23999ebc2683c4be5053631fd6890502d7416d05e9ef858460fec4473d873893303b51f251ed3b50facb11616211b0629e79c SHA512 816237bf65b65a8f7ec941db6ea07814af602efe6f214e2a253b1d0b6b9dbbe9895a9822c6de67af40bd507e658b8c088707440f689d5fd237985f4ee0f7bfc2
DIST pillow-test-images-7077675d2cda485d63de4aefe0fefbf6f655c5a0.gh.tar.gz 57430276 BLAKE2B 6e8dcde60832004f5a0ea0e14024fdcd0b08cf0e225f27e39b7c2058582d6d5efe7fcaccb5bd28754affa6fe4125735fb4beeaa2075e6aceea0a998ebc0747fe SHA512 795f015c9b73a8c941fb5cd880b1ab36b24d38612db53367ab0e6c05dd1cdbfd47034decb7e36d7de940eeea1582d644ca7bee3b131577578692569c2c60c32b DIST pillow-test-images-7077675d2cda485d63de4aefe0fefbf6f655c5a0.gh.tar.gz 57430276 BLAKE2B 6e8dcde60832004f5a0ea0e14024fdcd0b08cf0e225f27e39b7c2058582d6d5efe7fcaccb5bd28754affa6fe4125735fb4beeaa2075e6aceea0a998ebc0747fe SHA512 795f015c9b73a8c941fb5cd880b1ab36b24d38612db53367ab0e6c05dd1cdbfd47034decb7e36d7de940eeea1582d644ca7bee3b131577578692569c2c60c32b
DIST pillow-test-images-716bdc4adaf97601e5b9a31c9be25f8975381ee1.gh.tar.gz 57416881 BLAKE2B 8ea5fff2231567f957fc911120c1b50610722477da99559639317e4513e4bc4e73b8b49368a6d95c6938333f0c48db7672c3713eaef70494f7896dadd07cc42d SHA512 b00009be0f5ca85ec0c761fa780f0e650c1877b456b9a9426a4d2300a0c5654358495299e129ded411fccb641e4add7e460bcb3ca7be055f3b207407ccefb33c

View File

@ -1,49 +0,0 @@
https://github.com/python-pillow/Pillow/pull/8948
https://github.com/python-pillow/Pillow/commit/3c71559804e661a5f727e2007a5be51f26d9af27
From c7193f74fc5ce1a0fe1742a0845165024be45ef5 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Thu, 8 May 2025 20:10:34 +1000
Subject: [PATCH 1/3] Updated error message
---
Tests/test_image_resample.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Tests/test_image_resample.py b/Tests/test_image_resample.py
index ce6209c0da4..73b25ed51b2 100644
--- a/Tests/test_image_resample.py
+++ b/Tests/test_image_resample.py
@@ -462,7 +462,7 @@ def test_wrong_arguments(self, resample: Image.Resampling) -> None:
im.resize((32, 32), resample, (20, 20, 20, 100))
im.resize((32, 32), resample, (20, 20, 100, 20))
- with pytest.raises(TypeError, match="must be sequence of length 4"):
+ with pytest.raises(TypeError, match="must be (sequence|tuple) of length 4"):
im.resize((32, 32), resample, (im.width, im.height)) # type: ignore[arg-type]
with pytest.raises(ValueError, match="can't be negative"):
From 215069af5ddec6f4d3b92b8bc7554a10e2efb669 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Thu, 8 May 2025 22:13:13 +1000
Subject: [PATCH 3/3] Added support for Python 3.14
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index 5ecd6b8160a..5d41e27d981 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@ def get_version() -> str:
ZLIB_ROOT = None
FUZZING_BUILD = "LIB_FUZZING_ENGINE" in os.environ
-if sys.platform == "win32" and sys.version_info >= (3, 14):
+if sys.platform == "win32" and sys.version_info >= (3, 15):
import atexit
atexit.register(

View File

@ -15,7 +15,7 @@ MY_PN=Pillow
MY_P=${MY_PN}-${PV} MY_P=${MY_PN}-${PV}
# upstream always fetches from main # upstream always fetches from main
TEST_IMAGE_COMMIT="716bdc4adaf97601e5b9a31c9be25f8975381ee1" TEST_IMAGE_COMMIT="7077675d2cda485d63de4aefe0fefbf6f655c5a0"
DESCRIPTION="Python Imaging Library (fork)" DESCRIPTION="Python Imaging Library (fork)"
HOMEPAGE=" HOMEPAGE="
@ -35,7 +35,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="HPND" LICENSE="HPND"
SLOT="0" SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
IUSE="avif examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib" IUSE="avif examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )" REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
RESTRICT="!test? ( test )" RESTRICT="!test? ( test )"
@ -60,13 +60,13 @@ RDEPEND="
dev-python/olefile[${PYTHON_USEDEP}] dev-python/olefile[${PYTHON_USEDEP}]
" "
BDEPEND=" BDEPEND="
dev-python/pybind11[${PYTHON_USEDEP}]
>=dev-python/setuptools-77[${PYTHON_USEDEP}] >=dev-python/setuptools-77[${PYTHON_USEDEP}]
dev-python/wheel[${PYTHON_USEDEP}] dev-python/wheel[${PYTHON_USEDEP}]
virtual/pkgconfig virtual/pkgconfig
test? ( test? (
dev-python/defusedxml[${PYTHON_USEDEP}] dev-python/defusedxml[${PYTHON_USEDEP}]
dev-python/packaging[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}]
dev-python/pytest-timeout[${PYTHON_USEDEP}]
|| ( || (
media-gfx/imagemagick[png] media-gfx/imagemagick[png]
media-gfx/graphicsmagick[png] media-gfx/graphicsmagick[png]
@ -74,6 +74,7 @@ BDEPEND="
) )
" "
EPYTEST_PLUGINS=( pytest-timeout )
EPYTEST_XDIST=1 EPYTEST_XDIST=1
distutils_enable_tests pytest distutils_enable_tests pytest
@ -81,8 +82,6 @@ src_prepare() {
local PATCHES=( local PATCHES=(
# https://github.com/python-pillow/pillow/pull/7634 # https://github.com/python-pillow/pillow/pull/7634
"${FILESDIR}/${PN}-10.2.0-cross.patch" "${FILESDIR}/${PN}-10.2.0-cross.patch"
# https://github.com/python-pillow/Pillow/pull/8948
"${FILESDIR}/${PN}-11.2.1-py314.patch"
) )
distutils-r1_src_prepare distutils-r1_src_prepare
@ -150,9 +149,9 @@ python_test() {
esac esac
"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" "${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
# leak tests are fragile and broken under xdist # leak tests are fragile and broken under xdist
epytest -k "not leak" -p timeout || die "Tests failed with ${EPYTHON}" # nonfatal implied by xvfb
nonfatal epytest -k "not leak" || die "Tests failed with ${EPYTHON}"
} }
python_install() { python_install() {