diff options
Diffstat (limited to 'dev-python/greenlet')
| -rw-r--r-- | dev-python/greenlet/Manifest | 2 | ||||
| -rw-r--r-- | dev-python/greenlet/files/greenlet-3.2.3-py312-assert.patch | 71 | ||||
| -rw-r--r-- | dev-python/greenlet/files/greenlet-3.2.3-skip-leak-tests.patch | 51 | ||||
| -rw-r--r-- | dev-python/greenlet/greenlet-3.3.0.ebuild (renamed from dev-python/greenlet/greenlet-3.2.3.ebuild) | 9 |
4 files changed, 2 insertions, 131 deletions
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest index 37cc4f11d7ec..7b1cc38b1f67 100644 --- a/dev-python/greenlet/Manifest +++ b/dev-python/greenlet/Manifest @@ -1,2 +1,2 @@ -DIST greenlet-3.2.3.tar.gz 185752 BLAKE2B 4e5ea7c83622a954d9cab3da524c88970cc8a22759c3cdfdca1a718c5e630d895d844679292b48a4ebda93bcbbad1da0665c78bbf132cf1215456d742190a3ac SHA512 3153123855b4900387454fa1d4223b321980e3462e1e139b9f90b4eb2d0772102e06375055c6eb612530d7037169ff6e28166f95efe09073ea331db76284d39d DIST greenlet-3.2.4.tar.gz 188260 BLAKE2B b4ac8d493fe2fa471d61a11d7f5aa8cdec5e94d00f902c44204838d1e049cd289e52ac959dda3967a8b2b1b0d157f42225db0ff1665cd799070e230f834d53c2 SHA512 59a2df6248ba8830d0d92cf26cde97fef87fd6d3b5ebd2661d1a8762e622b98b502ab8531f613830c6645b0249c084f326c38c34824da37b717ff6cfbb105e4c +DIST greenlet-3.3.0.tar.gz 190651 BLAKE2B 32405286c0b8a7b1170936c419a4c40856b7e4605eac95ff733c0603ba54031fe2510cc47cdecfe33ce97e5e6de0995a9c174fb52dfd637bd351c0782d787929 SHA512 633d207f9fe749074760e31302ca6b2f2a6c72f0161d9676c8c1047928a4108106653f3914430cee62b125d99d449f80566282d089a09f9bb6eb3589b43e9817 diff --git a/dev-python/greenlet/files/greenlet-3.2.3-py312-assert.patch b/dev-python/greenlet/files/greenlet-3.2.3-py312-assert.patch deleted file mode 100644 index 21737aaf0362..000000000000 --- a/dev-python/greenlet/files/greenlet-3.2.3-py312-assert.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 739cc559ac42f41f6ccbc7d556d730fd424f3be8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Wed, 30 Jul 2025 12:17:47 +0200 -Subject: [PATCH] Fix py312+ crash test skips to correctly check for assertions -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fix the skips for `test_trace_events_multiple_greenlets_switching*` -to correctly detect assertions being enabled independently of -`--with-pydebug`. Gentoo builds Python `--without-pydebug` but -`--with-assertions`, in order to benefit from assertion-implied safety -checks without the full cost of PyDEBUG. For the purpose of detecting -it, check for `-DNDEBUG` in optimization flags, as implied by disabling -assertions. Leave the existing code as a fallback for when build flags -are unavailable, e.g. in Windows packages. - -Signed-off-by: Michał Górny <mgorny@gentoo.org> ---- - src/greenlet/tests/test_tracing.py | 18 +++++++++++++----- - 1 file changed, 13 insertions(+), 5 deletions(-) - -diff --git a/src/greenlet/tests/test_tracing.py b/src/greenlet/tests/test_tracing.py -index c044d4b6..235fbcd6 100644 ---- a/src/greenlet/tests/test_tracing.py -+++ b/src/greenlet/tests/test_tracing.py -@@ -1,5 +1,6 @@ - from __future__ import print_function - import sys -+import sysconfig - import greenlet - import unittest - -@@ -7,9 +8,16 @@ - from . import PY312 - - # https://discuss.python.org/t/cpython-3-12-greenlet-and-tracing-profiling-how-to-not-crash-and-get-correct-results/33144/2 --DEBUG_BUILD_PY312 = ( -- PY312 and hasattr(sys, 'gettotalrefcount'), -- "Broken on debug builds of Python 3.12" -+# When build variables are available, OPT is the best way of detecting -+# the build with assertions enabled. Otherwise, fallback to detecting PyDEBUG -+# build. -+ASSERTION_BUILD_PY312 = ( -+ PY312 and ( -+ "-DNDEBUG" not in sysconfig.get_config_var("OPT").split() -+ if sysconfig.get_config_var("OPT") is not None -+ else hasattr(sys, 'gettotalrefcount') -+ ), -+ "Broken on assertion-enabled builds of Python 3.12" - ) - - class SomeError(Exception): -@@ -198,7 +206,7 @@ def run(self): - - self._check_trace_events_from_greenlet_sets_profiler(X(), tracer) - -- @unittest.skipIf(*DEBUG_BUILD_PY312) -+ @unittest.skipIf(*ASSERTION_BUILD_PY312) - def test_trace_events_multiple_greenlets_switching(self): - tracer = PythonTracer() - -@@ -236,7 +244,7 @@ def g2_run(): - ('c_call', '__exit__'), - ]) - -- @unittest.skipIf(*DEBUG_BUILD_PY312) -+ @unittest.skipIf(*ASSERTION_BUILD_PY312) - def test_trace_events_multiple_greenlets_switching_siblings(self): - # Like the first version, but get both greenlets running first - # as "siblings" and then establish the tracing. diff --git a/dev-python/greenlet/files/greenlet-3.2.3-skip-leak-tests.patch b/dev-python/greenlet/files/greenlet-3.2.3-skip-leak-tests.patch deleted file mode 100644 index 3e7ea3a55f27..000000000000 --- a/dev-python/greenlet/files/greenlet-3.2.3-skip-leak-tests.patch +++ /dev/null @@ -1,51 +0,0 @@ -From cfb846272ab94a79c2f936da13dc3f5213f48912 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Thu, 31 Jul 2025 18:16:00 +0200 -Subject: [PATCH] Skip `TestLeaks` when `GREENLET_SKIP_LEAKCHECKS` is used - -When `GREENLET_SKIP_LEAKCHECKS` is used, we do not want to check for -leaks, and therefore it makes no sense to run tests explicitly checking -for leaks. Since the conditional is also true for MANYLINUX builds, -remove the redundant condition. ---- - src/greenlet/tests/test_leaks.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/greenlet/tests/test_leaks.py b/src/greenlet/tests/test_leaks.py -index 99da4eb..fe60fa2 100644 ---- a/src/greenlet/tests/test_leaks.py -+++ b/src/greenlet/tests/test_leaks.py -@@ -10,6 +10,7 @@ - import time - import weakref - import threading -+import unittest - - - import greenlet -@@ -17,7 +18,7 @@ - from . import PY314 - from .leakcheck import fails_leakcheck - from .leakcheck import ignores_leakcheck --from .leakcheck import RUNNING_ON_MANYLINUX -+from .leakcheck import SKIP_LEAKCHECKS - - # pylint:disable=protected-access - -@@ -39,6 +40,7 @@ def reset(cls): - cls.EXTANT_INSTANCES.clear() - - -+@unittest.skipIf(SKIP_LEAKCHECKS, "Leak checks disabled") - class TestLeaks(TestCase): - - def test_arg_refs(self): -@@ -313,8 +315,6 @@ def _only_test_some_versions(self): - assert sys.version_info[0] >= 3 - if sys.version_info[:2] < (3, 8): - self.skipTest('Only observed on 3.11') -- if RUNNING_ON_MANYLINUX: -- self.skipTest("Slow and not worth repeating here") - - @ignores_leakcheck - # Because we're just trying to track raw memory, not objects, and running diff --git a/dev-python/greenlet/greenlet-3.2.3.ebuild b/dev-python/greenlet/greenlet-3.3.0.ebuild index f10686082fb4..b3701bf1b18d 100644 --- a/dev-python/greenlet/greenlet-3.2.3.ebuild +++ b/dev-python/greenlet/greenlet-3.3.0.ebuild @@ -19,7 +19,7 @@ HOMEPAGE=" LICENSE="MIT PSF-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 -hppa ~m68k ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~m68k ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="test" RESTRICT="!test? ( test )" @@ -35,13 +35,6 @@ distutils_enable_sphinx docs \ distutils_enable_tests unittest src_prepare() { - local PATCHES=( - # https://github.com/python-greenlet/greenlet/pull/457 - "${FILESDIR}/${P}-py312-assert.patch" - # https://github.com/python-greenlet/greenlet/pull/461 - "${FILESDIR}/${P}-skip-leak-tests.patch" - ) - distutils-r1_src_prepare # patch cflag manipulations out |