diff --git a/eventlet-0.30.2.tar.gz b/eventlet-0.30.2.tar.gz deleted file mode 100644 index e72688fa45fae4b42992e1d6d38be79633535a4a..0000000000000000000000000000000000000000 Binary files a/eventlet-0.30.2.tar.gz and /dev/null differ diff --git a/eventlet-0.33.0.tar.gz b/eventlet-0.33.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8ed9c3d0d7ae79b300c3df424b7585e4914baa11 Binary files /dev/null and b/eventlet-0.33.0.tar.gz differ diff --git a/python-eventlet.spec b/python-eventlet.spec index cb5812909b084d493c1a4ecac01fc61d97b79398..862250b41ca3b546ae7426bcfb5f24472b84cfff 100644 --- a/python-eventlet.spec +++ b/python-eventlet.spec @@ -1,13 +1,12 @@ %global _empty_manifest_terminate_build 0 Name: python-eventlet -Version: 0.30.2 +Version: 0.33.0 Release: 1 Summary: Highly concurrent networking library -License: MIT License +License: MIT URL: http://eventlet.net -Source0: https://files.pythonhosted.org/packages/23/db/8ff5a9dec5ff016d5836254b676d507c2180d8838d7e545277d938896913/eventlet-0.30.2.tar.gz +Source0: https://files.pythonhosted.org/packages/12/c9/898ab514f82fb8f9a5a37a36c44a798c023fc42d6de863ad940861222ad4/eventlet-0.33.0.tar.gz BuildArch: noarch - %description Eventlet is a concurrent networking library for Python that allows you to change how you run your code, not how you write it. @@ -28,19 +27,17 @@ BuildRequires: python3-six Requires: python3-dns Requires: python3-greenlet Requires: python3-six - %description -n python3-eventlet Eventlet is a concurrent networking library for Python that allows you to change how you run your code, not how you write it. %package help Summary: Highly concurrent networking library Provides: python3-eventlet-doc - %description help Eventlet is a concurrent networking library for Python that allows you to change how you run your code, not how you write it. %prep -%autosetup -n eventlet-0.30.2 -S git +%autosetup -n eventlet-%{version} %build %py3_build @@ -76,13 +73,15 @@ mv %{buildroot}/doclist.lst . %files -n python3-eventlet -f filelist.lst - %dir %{python3_sitelib}/* %files help -f doclist.lst %{_docdir}/* %changelog +* Wed May 18 2022 OpenStack_SIG - 0.33.0-1 +- Upgrade package python3-eventlet to version 0.33.0 + * Mon Jul 26 2021 OpenStack_SIG - 0.30.2-1 - update to 0.30.2 diff --git a/python37.patch b/python37.patch deleted file mode 100644 index 62816babd721b1f353b0fdd28fb0b2ca10a5bdb1..0000000000000000000000000000000000000000 --- a/python37.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 0d4e7bcb90800d6700b2c81c41c9770ee5f94358 Mon Sep 17 00:00:00 2001 -From: Marcel Plch -Date: Mon, 9 Jul 2018 16:45:45 +0200 -Subject: [PATCH] Fix for Python 3.7 - ---- - eventlet/green/ssl.py | 46 ++++++++++++++++++++++++++++++++++++++++------ - tests/debug_test.py | 14 ++++++++++++-- - tests/hub_test.py | 4 +++- - 3 files changed, 55 insertions(+), 9 deletions(-) - -diff --git a/eventlet/green/ssl.py b/eventlet/green/ssl.py -index 53ee9a3c..df72869e 100644 ---- a/eventlet/green/ssl.py -+++ b/eventlet/green/ssl.py -@@ -24,6 +24,7 @@ - 'create_default_context', '_create_default_https_context'] - - _original_sslsocket = __ssl.SSLSocket -+_original_wrap_socket = __ssl.wrap_socket - - - class GreenSSLSocket(_original_sslsocket): -@@ -57,11 +58,41 @@ def __init__(self, sock, keyfile=None, certfile=None, - # this assignment - self._timeout = sock.gettimeout() - -- # nonblocking socket handshaking on connect got disabled so let's pretend it's disabled -- # even when it's on -- super(GreenSSLSocket, self).__init__( -- sock.fd, keyfile, certfile, server_side, cert_reqs, ssl_version, -- ca_certs, do_handshake_on_connect and six.PY2, *args, **kw) -+ if sys.version_info >= (3, 7): -+ # Monkey-patch the sslsocket so our modified self gets -+ # injected into its _create method. -+ def fake_new(self, cls, *args, **kwargs): -+ return self -+ -+ orig_new = _original_sslsocket.__new__ -+ try: -+ _original_sslsocket.__new__ = fake_new.__get__(self, GreenSSLSocket) -+ -+ self = _original_wrap_socket( -+ sock=sock.fd, -+ keyfile=keyfile, -+ certfile=certfile, -+ server_side=server_side, -+ cert_reqs=cert_reqs, -+ ssl_version=ssl_version, -+ ca_certs=ca_certs, -+ do_handshake_on_connect=do_handshake_on_connect and six.PY2, -+ *args, **kw -+ ) -+ self.keyfile = keyfile -+ self.certfile = certfile -+ self.cert_reqs = cert_reqs -+ self.ssl_version = ssl_version -+ self.ca_certs = ca_certs -+ finally: -+ # Unpatch -+ _original_sslsocket.__new__ = orig_new -+ else: -+ # nonblocking socket handshaking on connect got disabled so let's pretend it's disabled -+ # even when it's on -+ super(GreenSSLSocket, self).__init__( -+ sock.fd, keyfile, certfile, server_side, cert_reqs, ssl_version, -+ ca_certs, do_handshake_on_connect and six.PY2, *args, **kw) - - # the superclass initializer trashes the methods so we remove - # the local-object versions of them and let the actual class -@@ -323,7 +354,10 @@ def connect(self, addr): - except NameError: - self._sslobj = sslobj - else: -- self._sslobj = SSLObject(sslobj, owner=self) -+ if sys.version_info < (3, 7): -+ self._sslobj = SSLObject(sslobj, owner=self) -+ else: -+ self._sslobj = sslobj - - if self.do_handshake_on_connect: - self.do_handshake() -diff --git a/tests/debug_test.py b/tests/debug_test.py -index 8299dede..82b3a834 100644 ---- a/tests/debug_test.py -+++ b/tests/debug_test.py -@@ -29,6 +29,11 @@ def test_unspew(self): - assert self.tracer is None - - def test_line(self): -+ if sys.version_info >= (3, 7): -+ frame_str = "f== (3, 7): -+ frame_str = "f=