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/files | |
parent | e23a08d0c97a0cc415aaa165da840b056f93c997 (diff) |
gentoo resync : 20.10.2021
Diffstat (limited to 'dev-python/twisted/files')
3 files changed, 0 insertions, 121 deletions
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 |