commit: 8a435c5b462cd81c98bbc40da85d922305e23782
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 17 06:40:04 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 17 07:14:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a435c5b
dev-python/twisted: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/twisted/Manifest | 1 -
.../twisted/files/twisted-21.2.0-force-gtk3.patch | 42 -----
.../files/twisted-21.2.0-incremental-21.patch | 65 --------
.../files/twisted-21.2.0-int-from-bytes.patch | 14 --
dev-python/twisted/twisted-21.2.0-r1.ebuild | 179 ---------------------
5 files changed, 301 deletions(-)
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 8f648038b16..3c5453df8fd 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -1,3 +1,2 @@
-DIST twisted-21.2.0.tar.gz 3882978 BLAKE2B
ba37572b0f9eadf2962a2730e4c2c0ed65f582b11b3350034660a2c53c5cd0892b19867d19e0201d4808c09fca621dbe540d153dc6c7d5827d45d2423d19d28b
SHA512
fa743dcf22f3c17dfd17f39b7df0cc31fb8ce3e989478ada9a026424ec2de35e6a403ef35acdef5905eed008d42e3c2fee6b7ccdda433e6c250f1feaa83ea8a4
DIST twisted-21.7.0.tar.gz 3895345 BLAKE2B
510165ad2933f07005e508df5a8bdf2863a7988c0f18fcc089e948d190c65aab32fc876d3120e311e91d6989f1ea2d8b3b5f5db4a9dfc63c38da56213f718728
SHA512
a946769a6bc6c72af26e7763b9e0675788f134b4d005ea89d935da1b1d5f60d92c84fdb2615e442e7da2b98291ee8a63d5236ec7ba72ef04ad3f847b092feecb
DIST twisted-regen-cache.gz 911 BLAKE2B
ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305
SHA512
95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
diff --git a/dev-python/twisted/files/twisted-21.2.0-force-gtk3.patch
b/dev-python/twisted/files/twisted-21.2.0-force-gtk3.patch
deleted file mode 100644
index bed31bcf611..00000000000
--- a/dev-python/twisted/files/twisted-21.2.0-force-gtk3.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/src/twisted/internet/gireactor.py
b/src/twisted/internet/gireactor.py
-index 92596db1da2..a577825a87e 100644
---- a/src/twisted/internet/gireactor.py
-+++ b/src/twisted/internet/gireactor.py
-@@ -24,6 +24,7 @@
- from twisted.internet.error import ReactorAlreadyRunning
- from twisted.internet import _glibbase
- from twisted.python import runtime
-+import gi
- import gi.pygtkcompat
- from gi.repository import GLib
-
-@@ -68,6 +69,7 @@ class GIReactor(_glibbase.GlibReactorBase):
- def __init__(self, useGtk=False):
- _gtk = None
- if useGtk is True:
-+ gi.require_version("Gtk", "3.0")
- from gi.repository import Gtk as _gtk
-
- _glibbase.GlibReactorBase.__init__(self, GLib, _gtk, useGtk=useGtk)
-@@ -112,6 +114,7 @@ class PortableGIReactor(_glibbase.PortableGlibReactorBase):
- def __init__(self, useGtk=False):
- _gtk = None
- if useGtk is True:
-+ gi.require_version("Gtk", "3.0")
- from gi.repository import Gtk as _gtk
-
- _glibbase.PortableGlibReactorBase.__init__(self, GLib, _gtk,
useGtk=useGtk)
-diff --git a/src/twisted/internet/test/test_gireactor.py
b/src/twisted/internet/test/test_gireactor.py
-index d15a9262248..af5092a3614 100644
---- a/src/twisted/internet/test/test_gireactor.py
-+++ b/src/twisted/internet/test/test_gireactor.py
-@@ -25,6 +25,9 @@
- gtk3reactor = None
- else:
- gtk3reactor = _gtk3reactor
-+ import gi # type: ignore[import]
-+
-+ gi.require_version("Gtk", "3.0")
- from gi.repository import Gtk
-
- from twisted.internet.error import ReactorAlreadyRunning
diff --git a/dev-python/twisted/files/twisted-21.2.0-incremental-21.patch
b/dev-python/twisted/files/twisted-21.2.0-incremental-21.patch
deleted file mode 100644
index c726d32cb89..00000000000
--- a/dev-python/twisted/files/twisted-21.2.0-incremental-21.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From ab934c065177422a7121e44c792c56c32962c4e4 Mon Sep 17 00:00:00 2001
-From: Thomas Grainger <[email protected]>
-Date: Tue, 2 Mar 2021 11:27:56 +0000
-Subject: [PATCH] update tests for incremental >= 21.3.0
-
----
- pyproject.toml | 2 +-
- setup.cfg | 2 +-
- src/twisted/python/test/test_versions.py | 6 +++---
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index a7d531b003d..ca12b3ef7e0 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -2,7 +2,7 @@
- requires = [
- "setuptools >= 35.0.2",
- "wheel >= 0.29.0",
-- "incremental >= 16.10.1",
-+ "incremental >= 21.3.0",
- ]
- build-backend = "setuptools.build_meta"
-
-diff --git a/setup.cfg b/setup.cfg
-index 17501b91ecf..07094f7ea6b 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -28,7 +28,7 @@ python_requires = >=3.6.7
- install_requires =
- zope.interface >= 4.4.2
- constantly >= 15.1
-- incremental >= 16.10.1
-+ incremental >= 21.3.0
- Automat >= 0.8.0
- hyperlink >= 17.1.1
- attrs >= 19.2.0
-diff --git a/src/twisted/python/test/test_versions.py
b/src/twisted/python/test/test_versions.py
-index 022010a6eec..6707169b1f8 100644
---- a/src/twisted/python/test/test_versions.py
-+++ b/src/twisted/python/test/test_versions.py
-@@ -126,7 +126,7 @@ def test_strWithPrerelease(self):
- Calling C{str} on a version with a prerelease includes the prerelease.
- """
- self.assertEqual(
-- str(Version("dummy", 1, 0, 0, prerelease=1)), "[dummy, version
1.0.0rc1]"
-+ str(Version("dummy", 1, 0, 0, prerelease=1)), "[dummy, version
1.0.0.rc1]"
- )
-
- def testShort(self):
-@@ -145,7 +145,7 @@ def test_getVersionStringWithPrerelease(self):
- """
- self.assertEqual(
- getVersionString(Version("whatever", 8, 0, 0, prerelease=1)),
-- "whatever 8.0.0rc1",
-+ "whatever 8.0.0.rc1",
- )
-
- def test_base(self):
-@@ -158,4 +158,4 @@ def test_baseWithPrerelease(self):
- """
- The base version includes 'preX' for versions with prereleases.
- """
-- self.assertEqual(Version("foo", 1, 0, 0, prerelease=8).base(),
"1.0.0rc8")
-+ self.assertEqual(Version("foo", 1, 0, 0, prerelease=8).base(),
"1.0.0.rc8")
diff --git a/dev-python/twisted/files/twisted-21.2.0-int-from-bytes.patch
b/dev-python/twisted/files/twisted-21.2.0-int-from-bytes.patch
deleted file mode 100644
index ef9bd777ac7..00000000000
--- a/dev-python/twisted/files/twisted-21.2.0-int-from-bytes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/twisted/conch/ssh/common.py b/src/twisted/conch/ssh/common.py
-index 3e4f8cdc7..ee3d63143 100644
---- a/src/twisted/conch/ssh/common.py
-+++ b/src/twisted/conch/ssh/common.py
-@@ -11,7 +11,8 @@ Maintainer: Paul Swartz
-
- import struct
-
--from cryptography.utils import int_from_bytes, int_to_bytes
-+from cryptography.utils import int_to_bytes
-+int_from_bytes = int.from_bytes
-
- from twisted.python.deprecate import deprecated
- from twisted.python.versions import Version
diff --git a/dev-python/twisted/twisted-21.2.0-r1.ebuild
b/dev-python/twisted/twisted-21.2.0-r1.ebuild
deleted file mode 100644
index 89ae1e3b892..00000000000
--- a/dev-python/twisted/twisted-21.2.0-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-HOMEPAGE="https://www.twistedmatrix.com/trac/";
-SRC_URI="
- https://github.com/twisted/twisted/archive/${P}.tar.gz
- https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz";
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="conch crypt http2 serial test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
- >=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
- >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
- >=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
- >=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
- >=dev-python/pyhamcrest-1.9.0[${PYTHON_USEDEP}]
- >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
- conch? (
- >=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
- dev-python/bcrypt[${PYTHON_USEDEP}]
- >=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
- dev-python/pyasn1[${PYTHON_USEDEP}]
- )
- crypt? (
- >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
- dev-python/service_identity[${PYTHON_USEDEP}]
- >=dev-python/idna-0.6[${PYTHON_USEDEP}]
- )
- serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
- http2? (
- >=dev-python/h2-3.0.0[${PYTHON_USEDEP}]
- <dev-python/h2-4.0.0[${PYTHON_USEDEP}]
- >=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
- <dev-python/priority-2.0[${PYTHON_USEDEP}]
- )
- !dev-python/twisted-core
- !dev-python/twisted-conch
- !dev-python/twisted-lore
- !dev-python/twisted-mail
- !dev-python/twisted-names
- !dev-python/twisted-news
- !dev-python/twisted-pair
- !dev-python/twisted-runner
- !dev-python/twisted-words
- !dev-python/twisted-web
-"
-BDEPEND="
- >=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
- test? (
- >=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
- dev-python/bcrypt[${PYTHON_USEDEP}]
- >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
- >=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
- dev-python/cython-test-exception-raiser[${PYTHON_USEDEP}]
- dev-python/gmpy[${PYTHON_USEDEP}]
- dev-python/idna[${PYTHON_USEDEP}]
- dev-python/pyasn1[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
- dev-python/pyserial[${PYTHON_USEDEP}]
- dev-python/service_identity[${PYTHON_USEDEP}]
- net-misc/openssh
- )
-"
-
-PATCHES=(
- # https://twistedmatrix.com/trac/ticket/10200
- "${FILESDIR}/${P}-force-gtk3.patch"
- # int_from_bytes is deprecated
- "${FILESDIR}/${P}-int-from-bytes.patch"
-)
-
-python_prepare_all() {
- eapply "${FILESDIR}"/${P}-incremental-21.patch
-
- # upstream test for making releases; not very useful and requires
- # sphinx (including on py2)
- rm src/twisted/python/test/test_release.py || die
-
- # puts system in EMFILE state, then the exception handler may fail
- # trying to open more files due to some gi magic
- sed -e '/SKIP_EMFILE/s:False:True:' \
- -i src/twisted/internet/test/test_tcp.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
-
- # accesses /dev/net/tun
- sed -e '/class RealDeviceTestsMixin/a\
- skip = "Requires extra permissions"' \
- -i src/twisted/pair/test/test_tuntap.py || die
-
- # These tests rely on warnings which seems work unreliably between
python versions
- sed -e 's:test_currentEUID:_&:' \
- -e 's:test_currentUID:_&:' -i
src/twisted/python/test/test_util.py || die
-
- # relies on the pre-CVE parse_qs() behavior in Python
- sed -e '/d=c;+=f/d' \
- -i src/twisted/web/test/test_http.py || die
-
- distutils-r1_python_prepare_all
-}
-
-src_test() {
- virtx distutils-r1_src_test
-}
-
-python_test() {
- # TODO: upstream seems to override our build paths
- distutils_install_for_testing
-
- "${EPYTHON}" -m twisted.trial twisted ||
- die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
- distutils-r1_python_install
-
- cd "${D}$(python_get_sitedir)" || die
-
- # own the dropin.cache so we don't leave orphans
- touch 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() {
- python_foreach_impl python_postinst
-
- einfo "Install complete"
- if use test ; then
- einfo ""
- einfo "Some tests have been disabled during testing due to"
- einfo "known incompatibilities with the emerge sandboxes and/or"
- einfo "not runnable as the root user."
- einfo "For a complete test suite run on the code."
- einfo "Run the tests as a normal user for each python it is
installed to."
- einfo " ie: $ python3.6 /usr/bin/trial twisted"
- 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
-}
