commit: 1e489fd0f8ab8180105e85a00bf2f4e57260b381 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Jan 5 02:28:05 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Jan 5 02:28:05 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e489fd0
dev-python/wrapt: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/wrapt/Manifest | 1 - dev-python/wrapt/files/wrapt-1.16.0-py313.patch | 113 ------------------------ dev-python/wrapt/wrapt-1.16.0.ebuild | 45 ---------- 3 files changed, 159 deletions(-) diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest index 3f5bcd58fc44..dc97755e67c4 100644 --- a/dev-python/wrapt/Manifest +++ b/dev-python/wrapt/Manifest @@ -1,2 +1 @@ -DIST wrapt-1.16.0.gh.tar.gz 138520 BLAKE2B 6317f2fa58aaa017b510f60fb20e8b3bc4721977806f4b8e7a3f316bfa4da2a8d24156f8ab670d96f5bab6fcc29437d5d18c28ce91618f5a7093cc85d6c5b578 SHA512 65bdda3b6580748ceb720e8fc1a6b05832a355d541aa650bc87052f3aa8793d03d29a080b79eceb16392e297aed8f11a283e36f5f40a0db614b409b1dc2b6c9c DIST wrapt-1.17.0.gh.tar.gz 140517 BLAKE2B 0aa883d31cac6a72c18b48a03e3ba18326d2b6f71ab241a9c772a58662011c706db2526d3459b4d5c7017f911cdc9e2518b52abefae7239cc38ee635d47a46ba SHA512 b552676a9c41c2feadf9eeab78c011bcc068f6b160d5d91aa6afc8b880abaaf8f170071e8eb03811959d3510cb19cb8fcc0db41a3c4e7eb6c92cf04882d9c0d2 diff --git a/dev-python/wrapt/files/wrapt-1.16.0-py313.patch b/dev-python/wrapt/files/wrapt-1.16.0-py313.patch deleted file mode 100644 index b404bc0762b9..000000000000 --- a/dev-python/wrapt/files/wrapt-1.16.0-py313.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 185f1f2692a64f7b908b98a25d890b951a12c3c7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <[email protected]> -Date: Fri, 8 Mar 2024 00:40:11 +0100 -Subject: [PATCH] Fix classmethod tests with Python 3.13+ - -Fixes https://github.com/GrahamDumpleton/wrapt/issues/259 - ---- - tests/test_outer_classmethod.py | 18 ++++++++++-------- - tests/test_synchronized_lock.py | 26 ++++++++++++++------------ - 2 files changed, 24 insertions(+), 20 deletions(-) - -diff --git a/tests/test_outer_classmethod.py b/tests/test_outer_classmethod.py -index ab807646..c08d34a5 100644 ---- a/tests/test_outer_classmethod.py -+++ b/tests/test_outer_classmethod.py -@@ -128,18 +128,20 @@ def test_class_call_function(self): - # first argument with the actual arguments following that. This - # was only finally fixed in Python 3.9. For more details see: - # https://bugs.python.org/issue19072 -+ # Starting with Python 3.13 the old behavior is back. -+ # For more details see https://github.com/python/cpython/issues/89519 - - _args = (1, 2) - _kwargs = {'one': 1, 'two': 2} - - @wrapt.decorator - def _decorator(wrapped, instance, args, kwargs): -- if PYXY < (3, 9): -- self.assertEqual(instance, None) -- self.assertEqual(args, (Class,)+_args) -- else: -+ if (3, 9) <= PYXY < (3, 13): - self.assertEqual(instance, Class) - self.assertEqual(args, _args) -+ else: -+ self.assertEqual(instance, None) -+ self.assertEqual(args, (Class,)+_args) - - self.assertEqual(kwargs, _kwargs) - self.assertEqual(wrapped.__module__, _function.__module__) -@@ -176,12 +178,12 @@ def test_instance_call_function(self): - - @wrapt.decorator - def _decorator(wrapped, instance, args, kwargs): -- if PYXY < (3, 9): -- self.assertEqual(instance, None) -- self.assertEqual(args, (Class,)+_args) -- else: -+ if (3, 9) <= PYXY < (3, 13): - self.assertEqual(instance, Class) - self.assertEqual(args, _args) -+ else: -+ self.assertEqual(instance, None) -+ self.assertEqual(args, (Class,)+_args) - - self.assertEqual(kwargs, _kwargs) - self.assertEqual(wrapped.__module__, _function.__module__) -diff --git a/tests/test_synchronized_lock.py b/tests/test_synchronized_lock.py -index 0e43f7af..7c41aa5a 100644 ---- a/tests/test_synchronized_lock.py -+++ b/tests/test_synchronized_lock.py -@@ -165,36 +165,38 @@ def test_synchronized_outer_classmethod(self): - # function to the class before calling and just calls it direct, - # explicitly passing the class as first argument. For more - # details see: https://bugs.python.org/issue19072 -+ # Starting with Python 3.13 the old behavior is back. -+ # For more details see https://github.com/python/cpython/issues/89519 - -- if PYXY < (3, 9): -- _lock0 = getattr(C4.function2, '_synchronized_lock', None) -- else: -+ if (3, 9) <= PYXY < (3, 13): - _lock0 = getattr(C4, '_synchronized_lock', None) -+ else: -+ _lock0 = getattr(C4.function2, '_synchronized_lock', None) - self.assertEqual(_lock0, None) - - c4.function2() - -- if PYXY < (3, 9): -- _lock1 = getattr(C4.function2, '_synchronized_lock', None) -- else: -+ if (3, 9) <= PYXY < (3, 13): - _lock1 = getattr(C4, '_synchronized_lock', None) -+ else: -+ _lock1 = getattr(C4.function2, '_synchronized_lock', None) - self.assertNotEqual(_lock1, None) - - C4.function2() - -- if PYXY < (3, 9): -- _lock2 = getattr(C4.function2, '_synchronized_lock', None) -- else: -+ if (3, 9) <= PYXY < (3, 13): - _lock2 = getattr(C4, '_synchronized_lock', None) -+ else: -+ _lock2 = getattr(C4.function2, '_synchronized_lock', None) - self.assertNotEqual(_lock2, None) - self.assertEqual(_lock2, _lock1) - - C4.function2() - -- if PYXY < (3, 9): -- _lock3 = getattr(C4.function2, '_synchronized_lock', None) -- else: -+ if (3, 9) <= PYXY < (3, 13): - _lock3 = getattr(C4, '_synchronized_lock', None) -+ else: -+ _lock3 = getattr(C4.function2, '_synchronized_lock', None) - self.assertNotEqual(_lock3, None) - self.assertEqual(_lock3, _lock2) - diff --git a/dev-python/wrapt/wrapt-1.16.0.ebuild b/dev-python/wrapt/wrapt-1.16.0.ebuild deleted file mode 100644 index 8679d9cc6028..000000000000 --- a/dev-python/wrapt/wrapt-1.16.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} pypy3 ) - -inherit distutils-r1 - -MY_P=${P/_} -DESCRIPTION="Module for decorators, wrappers and monkey patching" -HOMEPAGE=" - https://github.com/GrahamDumpleton/wrapt/ - https://pypi.org/project/wrapt/ -" -SRC_URI=" - https://github.com/GrahamDumpleton/wrapt/archive/${PV/_}.tar.gz - -> ${MY_P}.gh.tar.gz -" -S=${WORKDIR}/${MY_P} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="+native-extensions" - -distutils_enable_tests pytest -distutils_enable_sphinx docs dev-python/sphinx-rtd-theme - -PATCHES=( - # https://github.com/GrahamDumpleton/wrapt/pull/260 - "${FILESDIR}/${P}-py313.patch" -) - -python_compile() { - local -x WRAPT_INSTALL_EXTENSIONS=$(usex native-extensions true false) - distutils-r1_python_compile -} - -python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -}
