diff --git a/.gitignore b/.gitignore index b23e289..7e69963 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ gevent-0.13.0.tar.gz /gevent-1.3.3.tar.gz /gevent-1.3.4.tar.gz /gevent-1.3.6.tar.gz +/gevent-1.5a3.zip diff --git a/0001-code-replace.patch b/0001-code-replace.patch deleted file mode 100644 index 8cbbe02..0000000 --- a/0001-code-replace.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit 1b84da94c2aa2d171881482c22298ad189b79764 -Author: Victor Stinner -Date: Tue Jun 11 16:38:52 2019 +0200 - - Use CodeType.replace() if available - - Port _tblib.Traceback to Python 3.8: use code.replace() method if - available. - -diff --git a/src/gevent/_tblib.py b/src/gevent/_tblib.py -index 13364012..b9553a9e 100644 ---- a/src/gevent/_tblib.py -+++ b/src/gevent/_tblib.py -@@ -198,7 +198,11 @@ class Traceback(object): - while current: - f_code = current.tb_frame.f_code - code = compile('\n' * (current.tb_lineno - 1) + 'raise __traceback_maker', current.tb_frame.f_code.co_filename, 'exec') -- if PY3: -+ if hasattr(code, "replace"): -+ # Python 3.8 and newer -+ code = code.replace(co_argcount=0, -+ co_freevars=(), co_cellvars=()) -+ elif PY3: - code = CodeType( - 0, code.co_kwonlyargcount, - code.co_nlocals, code.co_stacksize, code.co_flags, diff --git a/python-gevent.spec b/python-gevent.spec index a6a6a0e..24fd01d 100644 --- a/python-gevent.spec +++ b/python-gevent.spec @@ -1,20 +1,16 @@ %global __provides_exclude_from ^%{python3_sitearch}/.*\\.so$ %global modname gevent %global optflags %(echo %{optflags} -I%{_includedir}/libev) +%global extraver a3 Name: python-%{modname} -Version: 1.3.6 -Release: 7%{?dist} +Version: 1.5 +Release: 0.1.%{extraver}%{?dist} Summary: A coroutine-based Python networking library License: MIT URL: http://www.gevent.org/ -Source0: https://files.pythonhosted.org/packages/source/g/%{modname}/%{modname}-%{version}.tar.gz - -# Python 3.8 compatibility: use code.replace() method -# https://github.com/gevent/gevent/pull/1429 -# https://github.com/gevent/gevent/commit/806713333afa9d490d31c0f9b534031c07467fc7 -Patch1: 0001-code-replace.patch +Source0: %{pypi_source %{modname} %{version}%{extraver} zip} BuildRequires: gcc BuildRequires: c-ares-devel @@ -57,7 +53,7 @@ Features include: Python 3 version. %prep -%autosetup -p1 -n %{modname}-%{version} +%autosetup -p1 -n %{modname}-%{version}%{extraver} # Remove bundled libraries rm -r deps # Upstream intentionally includes C extension sources in the built package, @@ -92,6 +88,9 @@ find %{buildroot} -name '*.so' -exec chmod 755 {} ';' %{python3_sitearch}/%{modname}* %changelog +* Wed Jan 08 2020 Robert-André Mauchin - 1.5-0.1.a3 +- Update to 1.5a3 (#1705661) + * Thu Oct 03 2019 Miro Hrončok - 1.3.6-7 - Rebuilt for Python 3.8.0rc1 (#1748018) diff --git a/sources b/sources index 55a8ed9..5b47c5a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gevent-1.3.6.tar.gz) = 9ad6bf8a939a3cf812fd33c9f55813c0a3ee281ccb38e42ec8c68c3fbb4ba07623d7dfb7104d3e343713ee93b4b4d7e29de06a2992b171166b003985f2b49e2a +SHA512 (gevent-1.5a3.zip) = 8f6785f200d8b405235fd98e3055a8ba2f58df48f5a58adda19b439e3acc09a8552649335ad06930e1aa2a625a6c195c54ff4eb840b6edee3b68d22bbbbf555e