diff options
author | V3n3RiX <venerix@koprulu.sector> | 2021-10-20 10:22:14 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2021-10-20 10:22:14 +0100 |
commit | 46eedbedafdb0040c37884982d4c775ce277fb7b (patch) | |
tree | db33a91259730be84999e13a8d8168c799f50ac0 /dev-python/twisted | |
parent | e23a08d0c97a0cc415aaa165da840b056f93c997 (diff) |
gentoo resync : 20.10.2021
Diffstat (limited to 'dev-python/twisted')
-rw-r--r-- | dev-python/twisted/Manifest | 7 | ||||
-rw-r--r-- | dev-python/twisted/files/twisted-21.2.0-force-gtk3.patch | 42 | ||||
-rw-r--r-- | dev-python/twisted/files/twisted-21.2.0-incremental-21.patch | 65 | ||||
-rw-r--r-- | dev-python/twisted/files/twisted-21.2.0-int-from-bytes.patch | 14 | ||||
-rw-r--r-- | dev-python/twisted/twisted-21.2.0-r1.ebuild | 179 | ||||
-rw-r--r-- | dev-python/twisted/twisted-21.7.0.ebuild | 2 |
6 files changed, 2 insertions, 307 deletions
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest index 7df274e3ab17..65ad0c4c51d9 100644 --- a/dev-python/twisted/Manifest +++ b/dev-python/twisted/Manifest @@ -1,12 +1,7 @@ AUX twistd.conf 277 BLAKE2B 78ca35b410a6597c9afe6a9c8d3dfb1de113411634901f936794e8a59c0644233d0673e710bd0870ecf4312d079c46f62f43928605700559134f1fb62490559a SHA512 76d44caebab8404f16937c2515ad9ae8236732a48c7127366f7fa22c6ed3d88ace2d33b832a6d95f775973d41b7caf75344805fe5b01e964c04eb710bf3c89fb AUX twistd.init 563 BLAKE2B 24488118b025bf2068bbf07af900064ff6a7ee99106c3da30f15f2b3f85af7443212afebc6b52a12645488b85656f87b653df9263fc2be6bd09707917899f252 SHA512 7860601beba1efda2b0a045b2a044ec33caff9ee915d45225c05e281760a68da349b4c45080600177aab32aa806714327acf3cf5dda92be0874f781f129bb129 -AUX twisted-21.2.0-force-gtk3.patch 1619 BLAKE2B d167c6e3177a345c03e68d37d596e743af0eb5b7acbc055df032bba26b38acced190baa6b44b3ae8f750fa06d4670a5e85146b95508bfb9acb93980e5a0bdbf4 SHA512 3b359d98c747a3d10e5e16fd3de5f00eb56fa64bef7fdbac07f569ad49033c63092703584ff7127e6af8394fc1b4e94846a0556bd7db38b473a473e4d833f7db -AUX twisted-21.2.0-incremental-21.patch 2303 BLAKE2B 34bd2eef6b7bc9810466bb5daa97736eb8aba88ed6e9e1bec78a9547d7068a330685eacaaf8b5eb16a33733792a0bff8a78b08f5ff5c6766763e687a98e1295e SHA512 0f2aabc82233dd43a418de38d6b46284e5f7c136e27eaecd423d25908c9a652c7725ea0318bcbee906b2d3cdf8b9cdf44e4ee496ed33aad60f609a3980bbb115 -AUX twisted-21.2.0-int-from-bytes.patch 485 BLAKE2B c436bcfdacc124a1f6d24d1a9500940e18efb2136dbd35f86575495ee1b4afb6ae4e0eaf262167c4d4dacdda28c8ec2b951fadd2570e9894d90f0bf09ddeee6a SHA512 3794ea978ebe82103aedf284a57215a69a68804d43f2def9dba58f600f8af190ae2fd6ddcc064ece35dec85661830eb386c1ce799aefb78f60e530fe23cdcb22 AUX twisted-21.7.0-force-gtk3.patch 2759 BLAKE2B 65be4e948865a8de6cda3fbb9e90032d8c90b4db2e6b60d5861868273837c2ce846ab1452ca468f2e65be27882ca17ba842a9010607cc0e3969aeb70490e9ab1 SHA512 f4424f2b1f785c459263b4cdd3f906543e99ad6956130dcf3f6b589386a84637ca52d1346dc3465ef23fc82c701751e6053d145a0ca5225b846d6a7c20991f73 -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 -EBUILD twisted-21.2.0-r1.ebuild 5147 BLAKE2B 5e6b209a28d64fa65300d589ba162045aa9bd4caf72b3a5c887ba10680327900c91583fb4d16333bf38d9e5745ab4f70a4317ceec8d91bf6e5893e615bc0513c SHA512 83194e572d84783471362c29951e0c0f900136cf5b2f049daf3112d6e185a19ec1b8a16d33c9c54ce3e38bfb0ff42864ea4524f899488f3c725e575c201aec09 -EBUILD twisted-21.7.0.ebuild 4956 BLAKE2B 732dca1b98ffab5339c76a4b5ee1950ec027ba21b65c4299ae2e295e9bc4b991c6f9526dcaaa7ed289e62b2922128b95de2ccf8c90802d20b4d13ad62e5217de SHA512 d76eecf1a98de89be9e65fab05c29cd9db350fb3d96f936750db027cff406d5657c935ba9000a6d79762af8bde2f0b8d949b32ba27b5c2064f25a0f635d998fc +EBUILD twisted-21.7.0.ebuild 4955 BLAKE2B 2ddbe9dbed3e910af8fcea03de1002e6948f5f05dc4a2cdfda5fdd256e24a2de43ae708964bc772dfaf73a607228cc58a9de975f6f82d5719f4502b9f73eafb7 SHA512 d0a020dde92f76e52cda1704c5759bef1fc72d82cac6bc80d54c6329198476537d129689ab0153201f9eb5f85978ab426b1d3c39023053e379fb7fbc0ec9326c MISC metadata.xml 1352 BLAKE2B da3eecfbfd73709ff8fb48b985d64fa80d134c38a0c04d8c7b08e0ebd936cb2179f579deb6f91f38fd08b74e9454b693b4a89c9ab194296104c519e6f80ddc8a SHA512 f244db7eb7a13e35f8825e2b16cf3cb953c47e68be234efc9d922462cc7ee66e1748e09bf4735bee59cd1016eb38c64ca23f70a25da5bb7311f869cebbb45569 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 bed31bcf611c..000000000000 --- 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 c726d32cb89d..000000000000 --- 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 <tagrain@gmail.com> -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 ef9bd777ac7c..000000000000 --- 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 89ae1e3b8929..000000000000 --- 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 -} diff --git a/dev-python/twisted/twisted-21.7.0.ebuild b/dev-python/twisted/twisted-21.7.0.ebuild index 3fc0dfad45de..12bb706747a7 100644 --- a/dev-python/twisted/twisted-21.7.0.ebuild +++ b/dev-python/twisted/twisted-21.7.0.ebuild @@ -17,7 +17,7 @@ S=${WORKDIR}/${PN}-${P} LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86" IUSE="conch crypt http2 serial test" RESTRICT="!test? ( test )" |