commit: 4a2dd1e2c3236ba3534752ce62a5f07d5f9d9220 Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org> AuthorDate: Tue Mar 18 07:51:44 2025 +0000 Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org> CommitDate: Tue Mar 18 08:03:47 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a2dd1e2
dev-python/twisted: drop 24.7.0 Closes: https://bugs.gentoo.org/937733 Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org> dev-python/twisted/Manifest | 1 - .../files/twisted-24.3.0-skip-dsa-tests.patch | 75 --------- .../twisted-24.3.0_p20240628-skip-py313-test.patch | 35 ----- .../twisted-24.7.0_rc1-skip-py313-tests.patch | 54 ------- dev-python/twisted/twisted-24.7.0.ebuild | 167 --------------------- 5 files changed, 332 deletions(-) diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest index 2552f2335940..9385862cabcd 100644 --- a/dev-python/twisted/Manifest +++ b/dev-python/twisted/Manifest @@ -1,4 +1,3 @@ DIST twisted-24.10.0.tar.gz 3525999 BLAKE2B 4d274a4b5989597c2789e05774bad3595ac5284f5da25fb488d46b87a4bb0e0ab311fcab228eaf070530451a28098bbefc326f6d4806378b2fe076adf5b07199 SHA512 dad7c1301c3b31f096db8c4796e064e864c2c28107c46c202b4f4b123c99a0e69f9b43afbf582997dd2c15a08e95b41213e4bc67ea1fe9fd8137c76656a20162 DIST twisted-24.11.0.tar.gz 3526722 BLAKE2B cd874da038e3cbc369283de5d598b99680e3122ed9bdd0bbb8e541793b739b88281708c618c8f0cf9b4bf13684188b0b893ec5f744ae510c1af446822652a866 SHA512 cfd17cad9573b47b43761625ab529a1a0b27ce75545d9bc277622a7ce138b5dccf554d3c8764de1baafc07192e1172e50f4c6d19dc65590b5318a603a808efb9 -DIST twisted-24.7.0.tar.gz 3516844 BLAKE2B 169347260b473ea1c50806ce50324ebd51388186098886ccaad1f94e55f6b14eb7a7fc42728dbeaf4b5649d0e6dc1e4624cd5ab6d79feeaa733e18d09cfd689f SHA512 cd5a993c8f1dfdc82597bdc095e07c1016a2a86d1ce5b011b27f9f760db428fcba4579dda5733244979827f9c772c2480d1d419d2d24ae7af8697e2b8e852f62 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03 diff --git a/dev-python/twisted/files/twisted-24.3.0-skip-dsa-tests.patch b/dev-python/twisted/files/twisted-24.3.0-skip-dsa-tests.patch deleted file mode 100644 index 9dabba43391a..000000000000 --- a/dev-python/twisted/files/twisted-24.3.0-skip-dsa-tests.patch +++ /dev/null @@ -1,75 +0,0 @@ -From b948467c3f01cc46b5dcda8802b913295b7c8999 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arka...@atlas.cz> -Date: Wed, 31 Jul 2024 18:05:01 +0200 -Subject: [PATCH] Skip tests requiring DSA if SSH does not support DSS - -Modern OpenSSH no longer supports DSA/DSS. We need to skip tests that -use DSA if it is not supported by the installed SSH. The availability of -DSA can be checked by querying `ssh -Q key`, which includes `ssh-dss` in -the output if DSS is available, as suggested in [1]. - -[1] https://github.com/twisted/twisted/issues/12273#issuecomment-2260799255 - -Issue: https://github.com/twisted/twisted/issues/12273 - -Based on upstream PR https://github.com/twisted/twisted/pull/12274 - -diff --git a/src/twisted/conch/test/test_cftp.py b/src/twisted/conch/test/test_cftp.py -index 40b2deaedb..51a978de4b 100644 ---- a/src/twisted/conch/test/test_cftp.py -+++ b/src/twisted/conch/test/test_cftp.py -@@ -20,6 +20,7 @@ from zope.interface import implementer - - from twisted.conch import ls - from twisted.conch.interfaces import ISFTPFile -+from twisted.conch.test.test_conch import HAS_DSA - from twisted.conch.test.test_filetransfer import FileTransferTestAvatar, SFTPTestBase - from twisted.cred import portal - from twisted.internet import defer, error, interfaces, protocol, reactor -@@ -1436,6 +1437,7 @@ exit - @skipIf(skipTests, "don't run w/o spawnProcess or cryptography") - @skipIf(not which("ssh"), "no ssh command-line client available") - @skipIf(not which("sftp"), "no sftp command-line client available") -+@skipIf(not HAS_DSA, "needs ssh supporting dsa") - class OurServerSftpClientTests(CFTPClientTestBase): - """ - Test the sftp server against sftp command line client. -diff --git a/src/twisted/conch/test/test_conch.py b/src/twisted/conch/test/test_conch.py -index 45b357c995..9e77c9b2e9 100644 ---- a/src/twisted/conch/test/test_conch.py -+++ b/src/twisted/conch/test/test_conch.py -@@ -59,6 +59,21 @@ except ImportError as e: - else: - StdioInteractingSession = _StdioInteractingSession - -+def _has_dsa(): -+ has_dsa = False -+ try: -+ output = subprocess.check_output( -+ [which("ssh")[0], "-Q", "key"], stderr=subprocess.STDOUT, text=True -+ ) -+ keys = output.split() -+ if "ssh-dss" in keys: -+ has_dsa = True -+ except BaseException: -+ pass -+ return has_dsa -+ -+HAS_DSA = _has_dsa() -+ - - def _has_ipv6(): - """Returns True if the system can bind an IPv6 address.""" -@@ -551,6 +566,9 @@ class OpenSSHClientMixin: - if not which("ssh"): - skip = "no ssh command-line client available" - -+ if not HAS_DSA: -+ skip = "needs ssh supporting dsa" -+ - def execute(self, remoteCommand, process, sshArgs=""): - """ - Connects to the SSH server started in L{ConchServerSetupMixin.setUp} by --- -2.44.2 - diff --git a/dev-python/twisted/files/twisted-24.3.0_p20240628-skip-py313-test.patch b/dev-python/twisted/files/twisted-24.3.0_p20240628-skip-py313-test.patch deleted file mode 100644 index c469f7883f71..000000000000 --- a/dev-python/twisted/files/twisted-24.3.0_p20240628-skip-py313-test.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2f14c47947206d7f2e53af85567938601728abbd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arka...@gentoo.org> -Date: Fri, 28 Jun 2024 06:48:23 +0000 -Subject: [PATCH] skip failing test in py3.13 - -Let's skip failing test for now, Fedora does it as well [1]. - -[1] https://src.fedoraproject.org/rpms/python-twisted/blob/c8c63fe475594326f50fd748b40ae65f925c1325/f/0010-Skip-failing-tests.patch - -Upstream-Issue: https://github.com/twisted/twisted/issues/12099 - -diff --git a/src/twisted/test/test_failure.py b/src/twisted/test/test_failure.py -index 9a3daae306..a7a3ce29bd 100644 ---- a/src/twisted/test/test_failure.py -+++ b/src/twisted/test/test_failure.py -@@ -17,7 +17,7 @@ from io import StringIO - from traceback import FrameSummary - from types import TracebackType - from typing import Any, Generator, cast --from unittest import skipIf -+from unittest import skipIf, skip - - from cython_test_exception_raiser import raiser - -@@ -990,6 +990,7 @@ class ExtendedGeneratorTests(SynchronousTestCase): - - self.assertEqual(traceback.extract_tb(stuff[0][2])[-1][-1], "1 / 0") - -+ @skip("Fails with Python 3.13") - def test_findFailureInGenerator(self) -> None: - """ - Within an exception handler, it should be possible to find the --- -2.45.2 - diff --git a/dev-python/twisted/files/twisted-24.7.0_rc1-skip-py313-tests.patch b/dev-python/twisted/files/twisted-24.7.0_rc1-skip-py313-tests.patch deleted file mode 100644 index 9be4283567ec..000000000000 --- a/dev-python/twisted/files/twisted-24.7.0_rc1-skip-py313-tests.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 314fb5e18cbcaa11040a129d6ffaee3c376f55e7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arka...@gentoo.org> -Date: Wed, 31 Jul 2024 15:08:20 +0200 -Subject: [PATCH] skip py3.13 incompatible tests - -Based on upstream changes in PR https://github.com/twisted/twisted/pull/12092 - -diff --git a/src/twisted/internet/test/test_inlinecb.py b/src/twisted/internet/test/test_inlinecb.py -index 355572b566..11c09c6996 100644 ---- a/src/twisted/internet/test/test_inlinecb.py -+++ b/src/twisted/internet/test/test_inlinecb.py -@@ -6,11 +6,13 @@ - Tests for L{twisted.internet.inlineCallbacks}. - """ - -+import sys - import traceback - import unittest as pyunit - import weakref - from enum import Enum - from typing import Any, Generator, List, Set, Union -+from unittest import skipIf - - from twisted.internet import reactor, task - from twisted.internet.defer import ( -@@ -1122,6 +1124,9 @@ class NonLocalExitTests(TestCase): - - - class ForwardTraceBackTests(SynchronousTestCase): -+ HAVE_PY3_12_OR_OLDER = sys.version_info < (3, 13) -+ -+ @skipIf(not HAVE_PY3_12_OR_OLDER, "Needs Python 3.12 or older") - def test_forwardTracebacks(self): - """ - Chained inlineCallbacks are forwarding the traceback information -@@ -1171,6 +1176,7 @@ class ForwardTraceBackTests(SynchronousTestCase): - - return d - -+ @skipIf(not HAVE_PY3_12_OR_OLDER, "Needs Python 3.12 or older") - def test_forwardLotsOfTracebacks(self): - """ - Several Chained inlineCallbacks gives information about all generators. -@@ -1218,6 +1224,7 @@ class ForwardTraceBackTests(SynchronousTestCase): - self.assertIn("Error Marker", tb) - self.assertIn("in erroring", f.getTraceback()) - -+ @skipIf(not HAVE_PY3_12_OR_OLDER, "Needs Python 3.12 or older") - def test_forwardLotsOfTracebacksCoro(self): - """ - Several chained inlineCallbacks mixed with coroutines gives information --- -2.44.2 - diff --git a/dev-python/twisted/twisted-24.7.0.ebuild b/dev-python/twisted/twisted-24.7.0.ebuild deleted file mode 100644 index 0e23e33e40a0..000000000000 --- a/dev-python/twisted/twisted-24.7.0.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=hatchling -PYTHON_TESTED=( python3_{10..13} pypy3 ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 multiprocessing pypi virtualx - -DESCRIPTION="An asynchronous networking framework written in Python" -HOMEPAGE=" - https://twisted.org/ - https://github.com/twisted/twisted/ - https://pypi.org/project/Twisted/ -" -SRC_URI+=" - https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" -IUSE="conch http2 serial ssl test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}] - >=dev-python/automat-0.8.0[${PYTHON_USEDEP}] - >=dev-python/constantly-15.1[${PYTHON_USEDEP}] - >=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}] - >=dev-python/incremental-22.10.0[${PYTHON_USEDEP}] - >=dev-python/typing-extensions-4.2.0[${PYTHON_USEDEP}] - >=dev-python/zope-interface-5[${PYTHON_USEDEP}] - conch? ( - >=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}] - >=dev-python/bcrypt-3.0.0[${PYTHON_USEDEP}] - >=dev-python/cryptography-3.3[${PYTHON_USEDEP}] - dev-python/pyasn1[${PYTHON_USEDEP}] - ) - http2? ( - <dev-python/h2-5.0[${PYTHON_USEDEP}] - >=dev-python/h2-3.0.0[${PYTHON_USEDEP}] - <dev-python/priority-2.0[${PYTHON_USEDEP}] - >=dev-python/priority-1.1.0[${PYTHON_USEDEP}] - ) - serial? ( - >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] - ) - ssl? ( - >=dev-python/pyopenssl-21.0.0[${PYTHON_USEDEP}] - >=dev-python/service-identity-18.1.0[${PYTHON_USEDEP}] - >=dev-python/idna-2.4[${PYTHON_USEDEP}] - ) -" -IDEPEND=" - >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}] - >=dev-python/constantly-15.1[${PYTHON_USEDEP}] - >=dev-python/typing-extensions-4.2.0[${PYTHON_USEDEP}] - >=dev-python/zope-interface-5[${PYTHON_USEDEP}] -" -BDEPEND=" - >=dev-python/hatch-fancy-pypi-readme-22.5.0[${PYTHON_USEDEP}] - >=dev-python/incremental-22.10.0[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - $(python_gen_cond_dep ' - >=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}] - >=dev-python/bcrypt-3.0.0[${PYTHON_USEDEP}] - >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}] - <dev-python/cython-test-exception-raiser-2[${PYTHON_USEDEP}] - >=dev-python/cython-test-exception-raiser-1.0.2[${PYTHON_USEDEP}] - >=dev-python/idna-2.4[${PYTHON_USEDEP}] - >=dev-python/hypothesis-6.56[${PYTHON_USEDEP}] - dev-python/pyasn1[${PYTHON_USEDEP}] - >=dev-python/pyhamcrest-2[${PYTHON_USEDEP}] - >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] - virtual/openssh - ssl? ( - >=dev-python/pyopenssl-21.0.0[${PYTHON_USEDEP}] - >=dev-python/service-identity-18.1.0[${PYTHON_USEDEP}] - ) - ' "${PYTHON_TESTED[@]}") - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-24.3.0-skip-dsa-tests.patch" - "${FILESDIR}/${PN}-24.3.0_p20240628-skip-py313-test.patch" - "${FILESDIR}/${PN}-24.7.0_rc1-skip-py313-tests.patch" -) - -python_prepare_all() { - # upstream test for making releases; not very useful and requires - # sphinx (including on py2) - rm src/twisted/python/test/test_release.py || die - - # multicast tests fail within network-sandbox - sed -e 's:test_joinLeave:_&:' \ - -e 's:test_loopback:_&:' \ - -e 's:test_multiListen:_&:' \ - -e 's:test_multicast:_&:' \ - -i src/twisted/test/test_udp.py || die - - distutils-r1_python_prepare_all -} - -src_test() { - # the test suite handles missing file & failing ioctl()s gracefully - # but not permission errors from sandbox - addwrite /dev/net/tun - virtx distutils-r1_src_test -} - -python_test() { - if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then - einfo "Skipping tests on ${EPYTHON} (xfail)" - return - fi - - # breaks some tests by overriding empty environment - local -x SANDBOX_ON=0 - # for py3.13, see - # https://github.com/twisted/twisted/pull/12092#issuecomment-2194326096 - local -x LINES=25 COLUMNS=80 - "${EPYTHON}" -m twisted.trial -j "$(makeopts_jobs)" twisted || - die "Tests failed with ${EPYTHON}" -} - -python_install() { - distutils-r1_python_install - - # own the dropin.cache so we don't leave orphans - > "${D}$(python_get_sitedir)"/twisted/plugins/dropin.cache || die - - python_doscript "${WORKDIR}"/twisted-regen-cache -} - -python_install_all() { - distutils-r1_python_install_all - - newconfd "${FILESDIR}/twistd.conf" twistd - newinitd "${FILESDIR}/twistd.init" twistd -} - -python_postinst() { - twisted-regen-cache || die -} - -pkg_postinst() { - if [[ -z ${ROOT} ]]; then - python_foreach_impl python_postinst - fi -} - -python_postrm() { - rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die -} - -pkg_postrm() { - # if we're removing the last version, remove the cache file - if [[ ! ${REPLACING_VERSIONS} ]]; then - python_foreach_impl python_postrm - fi -}
