commit: 2e1e093b27d86e2dd5562e698e490a0c2b0b1fa9 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Jul 29 05:37:11 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Jul 29 05:51:26 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e1e093b
dev-python/twisted: Bump to 21.7.0 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/twisted/Manifest | 1 + .../twisted/files/twisted-21.7.0-force-gtk3.patch | 67 ++++++++ dev-python/twisted/twisted-21.7.0.ebuild | 172 +++++++++++++++++++++ 3 files changed, 240 insertions(+) diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest index 2c0ee46f9bf..0ed1eeac5fb 100644 --- a/dev-python/twisted/Manifest +++ b/dev-python/twisted/Manifest @@ -1,4 +1,5 @@ DIST Twisted-19.10.0.tar.bz2 3118485 BLAKE2B a0d532b67177aa017e463bf823d7842d4f6ff694f78cd7600865718ffe861023a53ea6a922f7de232133edba26f5255074d7ef277ce8f3bdf02d556ccf4abf41 SHA512 de8d7fd0b2081cebeff68b060c8469377011648bc563a94a993d3530fb007ed42c3a54925c9a10c465ee7a3065cc9108ace12d10d358223fab13494becb9ac4b DIST Twisted-20.3.0.tar.bz2 3127793 BLAKE2B 2e85fc3ec26d89e563c9e79a5d2adea81ff1745d18f0f92b8d45ae3729fbddf09998664257880372c7a4caeb5977c5cad7c863596b8c27ad7890275cead9f763 SHA512 1b850e5fc21a3630ead4c2cc3622c16e78bb3be38ab11d021779b7ce3d3c30acc4e19d79c7791a5fce6c5c6e09c2baa349901dffe952de67dd98eec419846365 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.7.0-force-gtk3.patch b/dev-python/twisted/files/twisted-21.7.0-force-gtk3.patch new file mode 100644 index 00000000000..a2e40559ec5 --- /dev/null +++ b/dev-python/twisted/files/twisted-21.7.0-force-gtk3.patch @@ -0,0 +1,67 @@ +From eec6b60116e12e015387fe1fa3a729553d3848bf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> +Date: Sat, 22 May 2021 01:11:48 +0200 +Subject: [PATCH] Force using GTK+3 in twisted.internet.gireactor + +Modify twisted.internet.gireactor to explicitly request GTK+ version 3. +Otherwise it uses the newest version installed which could be GTK+4 +that gireactor is currently incompatible with. +--- + src/twisted/internet/gireactor.py | 3 +++ + src/twisted/internet/test/test_gireactor.py | 3 +++ + src/twisted/newsfragments/10200.bugfix | 1 + + 3 files changed, 7 insertions(+) + create mode 100644 src/twisted/newsfragments/10200.bugfix + +diff --git a/src/twisted/internet/gireactor.py b/src/twisted/internet/gireactor.py +index 92596db1d..a577825a8 100644 +--- a/src/twisted/internet/gireactor.py ++++ b/src/twisted/internet/gireactor.py +@@ -24,6 +24,7 @@ On Python 3, pygobject v3.4 or later is required. + from twisted.internet.error import ReactorAlreadyRunning + from twisted.internet import _glibbase + from twisted.python import runtime ++import gi # type: ignore[import] + import gi.pygtkcompat # type: ignore[import] + from gi.repository import GLib # type: ignore[import] + +@@ -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 d15a92622..af5092a36 100644 +--- a/src/twisted/internet/test/test_gireactor.py ++++ b/src/twisted/internet/test/test_gireactor.py +@@ -25,6 +25,9 @@ else: + 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/src/twisted/newsfragments/10200.bugfix b/src/twisted/newsfragments/10200.bugfix +new file mode 100644 +index 000000000..7afb343be +--- /dev/null ++++ b/src/twisted/newsfragments/10200.bugfix +@@ -0,0 +1 @@ ++twisted.internet.gireactor was fixed to force GTK+3 in order to fix use of incompatible GTK+4 API when installed +-- +2.32.0 + diff --git a/dev-python/twisted/twisted-21.7.0.ebuild b/dev-python/twisted/twisted-21.7.0.ebuild new file mode 100644 index 00000000000..68bcdd4ffff --- /dev/null +++ b/dev-python/twisted/twisted-21.7.0.ebuild @@ -0,0 +1,172 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..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-21.3.0[${PYTHON_USEDEP}] + >=dev-python/pyhamcrest-1.9.0[${PYTHON_USEDEP}] + >=dev-python/typing-extensions-3.6.5[${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/hyper-h2-3.0.0[${PYTHON_USEDEP}] + <dev-python/hyper-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" +) + +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 + + # 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 + + 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 +}
