commit: b41af526ac1f2fb16d72915a9172d427a1f4b472 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun May 11 21:02:37 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun May 11 21:08:12 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b41af526
dev-python/pillow: enable py3.14 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-python/pillow/files/pillow-11.2.1-py314.patch | 49 +++++++++++++++++++++++ dev-python/pillow/pillow-11.2.1.ebuild | 4 +- 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/dev-python/pillow/files/pillow-11.2.1-py314.patch b/dev-python/pillow/files/pillow-11.2.1-py314.patch new file mode 100644 index 000000000000..b9fe40d47046 --- /dev/null +++ b/dev-python/pillow/files/pillow-11.2.1-py314.patch @@ -0,0 +1,49 @@ +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 <[email protected]> +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 <[email protected]> +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( + diff --git a/dev-python/pillow/pillow-11.2.1.ebuild b/dev-python/pillow/pillow-11.2.1.ebuild index fc131fa8d8ef..5972d432576b 100644 --- a/dev-python/pillow/pillow-11.2.1.ebuild +++ b/dev-python/pillow/pillow-11.2.1.ebuild @@ -6,7 +6,7 @@ EAPI=8 DISTUTILS_EXT=1 # setuptools wrapper DISTUTILS_USE_PEP517=standalone -PYTHON_COMPAT=( python3_{10..13} pypy3 pypy3_11 ) +PYTHON_COMPAT=( python3_{11..14} pypy3_11 ) PYTHON_REQ_USE='tk?,threads(+)' inherit distutils-r1 toolchain-funcs virtualx @@ -81,6 +81,8 @@ src_prepare() { local PATCHES=( # https://github.com/python-pillow/pillow/pull/7634 "${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
