Update to 23.7.0
This commit is contained in:
Orion Poplawski
parent
609d2e91be
commit
105fb59789
1
.gitignore
vendored
1
.gitignore
vendored
@ -27,3 +27,4 @@ gevent-0.13.0.tar.gz
|
||||
/gevent-21.1.2.tar.gz
|
||||
/gevent-21.12.0.tar.gz
|
||||
/gevent-22.10.2.tar.gz
|
||||
/gevent-23.7.0.tar.gz
|
||||
|
||||
69
1944.patch
69
1944.patch
@ -1,69 +0,0 @@
|
||||
From 5718d7f72eab3ac64a207ab6256e2810549f86cf Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
|
||||
Date: Wed, 17 May 2023 09:34:35 +0200
|
||||
Subject: [PATCH] Remove the usage of assertRaisesRegexp unit test alias
|
||||
removed in Python 3.12
|
||||
|
||||
---
|
||||
src/gevent/testing/testcase.py | 3 +--
|
||||
src/gevent/tests/test___config.py | 3 +--
|
||||
src/gevent/tests/test__close_backend_fd.py | 3 +--
|
||||
src/gevent/tests/test__contextvars.py | 3 ---
|
||||
4 files changed, 3 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/src/gevent/testing/testcase.py b/src/gevent/testing/testcase.py
|
||||
index 474840942..c96d57249 100644
|
||||
--- a/src/gevent/testing/testcase.py
|
||||
+++ b/src/gevent/testing/testcase.py
|
||||
@@ -453,8 +453,7 @@ def assertEqualFlakyRaceCondition(self, a, b):
|
||||
except AssertionError:
|
||||
flaky.reraiseFlakyTestRaceCondition()
|
||||
|
||||
- assertRaisesRegex = getattr(BaseTestCase, 'assertRaisesRegex',
|
||||
- getattr(BaseTestCase, 'assertRaisesRegexp'))
|
||||
+ assertRaisesRegex = BaseTestCase.assertRaisesRegex
|
||||
|
||||
def assertStartsWith(self, it, has_prefix):
|
||||
self.assertTrue(it.startswith(has_prefix), (it, has_prefix))
|
||||
diff --git a/src/gevent/tests/test___config.py b/src/gevent/tests/test___config.py
|
||||
index 382ffd4a0..c5f6a9b5d 100644
|
||||
--- a/src/gevent/tests/test___config.py
|
||||
+++ b/src/gevent/tests/test___config.py
|
||||
@@ -121,8 +121,7 @@ def test_set_invalid(self):
|
||||
|
||||
class TestImportableSetting(unittest.TestCase):
|
||||
|
||||
- assertRaisesRegex = getattr(unittest.TestCase, 'assertRaisesRegex',
|
||||
- unittest.TestCase.assertRaisesRegexp)
|
||||
+ assertRaisesRegex = unittest.TestCase.assertRaisesRegex
|
||||
def test_empty_list(self):
|
||||
i = _config.ImportableSetting()
|
||||
with self.assertRaisesRegex(ImportError,
|
||||
diff --git a/src/gevent/tests/test__close_backend_fd.py b/src/gevent/tests/test__close_backend_fd.py
|
||||
index 46406caf7..4fd7f5519 100644
|
||||
--- a/src/gevent/tests/test__close_backend_fd.py
|
||||
+++ b/src/gevent/tests/test__close_backend_fd.py
|
||||
@@ -21,8 +21,7 @@ class Test(unittest.TestCase):
|
||||
# NOTE that we extend unittest.TestCase, not greentest.TestCase
|
||||
# Extending the later causes the wrong hub to get used.
|
||||
|
||||
- assertRaisesRegex = getattr(unittest.TestCase, 'assertRaisesRegex',
|
||||
- getattr(unittest.TestCase, 'assertRaisesRegexp'))
|
||||
+ assertRaisesRegex = unittest.TestCase.assertRaisesRegex
|
||||
|
||||
BACKENDS_THAT_SUCCEED_WHEN_FD_CLOSED = (
|
||||
'kqueue',
|
||||
diff --git a/src/gevent/tests/test__contextvars.py b/src/gevent/tests/test__contextvars.py
|
||||
index 3d6611b9c..10b24968c 100644
|
||||
--- a/src/gevent/tests/test__contextvars.py
|
||||
+++ b/src/gevent/tests/test__contextvars.py
|
||||
@@ -36,9 +36,6 @@ def wrapper(*args, **kwargs):
|
||||
|
||||
class ContextTest(unittest.TestCase):
|
||||
|
||||
- if not hasattr(unittest.TestCase, 'assertRaisesRegex'):
|
||||
- assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
|
||||
-
|
||||
def test_context_var_new_1(self):
|
||||
with self.assertRaises(TypeError):
|
||||
contextvars.ContextVar()
|
||||
@ -1,19 +0,0 @@
|
||||
diff -up gevent-22.10.2/src/gevent/_ssl3.py.py312 gevent-22.10.2/src/gevent/_ssl3.py
|
||||
--- gevent-22.10.2/src/gevent/_ssl3.py.py312 2022-10-31 12:53:52.000000000 -0600
|
||||
+++ gevent-22.10.2/src/gevent/_ssl3.py 2023-06-26 19:07:10.247869058 -0600
|
||||
@@ -50,7 +50,6 @@ from ssl import SSL_ERROR_WANT_READ
|
||||
from ssl import SSL_ERROR_WANT_WRITE
|
||||
from ssl import PROTOCOL_SSLv23
|
||||
from ssl import SSLObject
|
||||
-from ssl import match_hostname
|
||||
from ssl import CHANNEL_BINDING_TYPES
|
||||
from ssl import CERT_REQUIRED
|
||||
from ssl import DER_cert_to_PEM_cert
|
||||
@@ -680,6 +679,7 @@ class SSLSocket(socket):
|
||||
if not self.server_hostname:
|
||||
raise ValueError("check_hostname needs server_hostname "
|
||||
"argument")
|
||||
+ from ssl import match_hostname
|
||||
match_hostname(self.getpeercert(), self.server_hostname) # pylint:disable=deprecated-method
|
||||
|
||||
if hasattr(SSLObject, '_create'):
|
||||
@ -3,20 +3,14 @@
|
||||
%global optflags %(echo %{optflags} -I%{_includedir}/libev)
|
||||
|
||||
Name: python-%{modname}
|
||||
Version: 22.10.2
|
||||
Release: 3%{?dist}
|
||||
Version: 23.7.0
|
||||
Release: 1%{?dist}
|
||||
Summary: A coroutine-based Python networking library
|
||||
|
||||
License: MIT
|
||||
URL: http://www.gevent.org/
|
||||
Source0: %{pypi_source %{modname} %{version} tar.gz}
|
||||
|
||||
# Remove the usage of assertRaisesRegexp unit test alias removed in Python 3.12
|
||||
Patch: https://github.com/gevent/gevent/pull/1944.patch
|
||||
# Remove the import of match_hostname deprecated in 3.7 and removed in Python 3.12
|
||||
# https://github.com/gevent/gevent/pull/1963
|
||||
Patch: python-gevent-py312.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: c-ares-devel
|
||||
BuildRequires: libev-devel
|
||||
@ -83,8 +77,6 @@ export GEVENTSETUP_EMBED=0
|
||||
%install
|
||||
export GEVENTSETUP_EMBED=0
|
||||
%py3_install
|
||||
rm %{buildroot}%{python3_sitearch}/%{modname}/_*2.py
|
||||
rm %{buildroot}%{python3_sitearch}/%{modname}/__pycache__/_*2.*
|
||||
find %{buildroot} -name '.buildinfo' -delete
|
||||
# Correct the permissions.
|
||||
find %{buildroot} -name '*.so' -exec chmod 755 {} ';'
|
||||
@ -100,6 +92,9 @@ cd src/gevent/tests && GEVENT_FILE=thread %__python3 -mgevent.tests test__*subpr
|
||||
%{python3_sitearch}/%{modname}*
|
||||
|
||||
%changelog
|
||||
* Mon Jul 17 2023 Orion Poplawski <orion@nwra.com> - 23.7.0-1
|
||||
- Update to 23.7.0
|
||||
|
||||
* Tue Jun 27 2023 Orion Poplawski <orion@nwra.com> - 22.10.2-3
|
||||
- Add patch to remove match_hostname import
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (gevent-22.10.2.tar.gz) = e4cf1ca94269a7418cd8c1fcc7efaa1b393921ec4d9f50b9a29f1059db102d6a41b6d7f4602b215b877d29696bf235c883ea7e3e52480133366afa839ec4bcd8
|
||||
SHA512 (gevent-23.7.0.tar.gz) = d452e58e96ba5b7f995b9a762fe378cef24a728a5291b3df069ff50815b336c6ad7bdbe0341c6c9c821dea6fc1a6601aec9d8c9c18aea8045bbcddb2f9240198
|
||||
|
||||
Loading…
Reference in New Issue
Block a user