Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -9,3 +9,8 @@ greenlet-0.3.1.tar.gz
 /greenlet-0.4.12.tar.gz
 /greenlet-0.4.13.tar.gz
 /greenlet-0.4.14.tar.gz
+/greenlet-0.4.16.tar.gz
+/greenlet-0.4.17.tar.gz
+/greenlet-1.1.0.tar.gz
+/greenlet-1.1.1.tar.gz
+/greenlet-1.1.2.tar.gz

306.patch

@@ -0,0 +1,238 @@
+From 31ccde2be3eeefca06277e20c3a06022e5ab2e62 Mon Sep 17 00:00:00 2001
+From: Victor Stinner <vstinner@python.org>
+Date: Mon, 6 Jun 2022 16:14:52 +0200
+Subject: [PATCH] Closes #305: Add Python 3.11 support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* Add GREENLET_PY311 macro
+* PyGreenlet structure:
+
+  * Add 3 members for the "data stack": 'datastack_chunk',
+    'datastack_top' and 'datastack_limit'.
+  * Add 'current_frame' member.
+
+* Rename CFrame to _PyCFrame
+* tox.ini: Add py311 environment.
+
+Changes partially backport from the master branch:
+commit 63e1099acc3677e614532bea0fa2e1967b69125f.
+
+Co-Authored-By: Miro Hrončok <miro@hroncok.cz>
+---
+ src/greenlet/greenlet.c | 61 ++++++++++++++++++++++++++++++++---------
+ src/greenlet/greenlet.h | 17 +++++++++++-
+ tox.ini                 |  2 +-
+ 3 files changed, 65 insertions(+), 15 deletions(-)
+
+diff --git a/src/greenlet/greenlet.c b/src/greenlet/greenlet.c
+index f47bbf88..2f3ad6e9 100644
+--- a/src/greenlet/greenlet.c
++++ b/src/greenlet/greenlet.c
+@@ -170,9 +170,11 @@ green_clear_exc(PyGreenlet* g)
+ {
+ #if GREENLET_PY37
+     g->exc_info = NULL;
+-    g->exc_state.exc_type = NULL;
+     g->exc_state.exc_value = NULL;
++#if !GREENLET_PY311
++    g->exc_state.exc_type = NULL;
+     g->exc_state.exc_traceback = NULL;
++#endif
+     g->exc_state.previous_item = NULL;
+ #else
+     g->exc_type = NULL;
+@@ -525,8 +527,13 @@ g_switchstack(void)
+     { /* save state */
+         PyGreenlet* current = ts_current;
+         PyThreadState* tstate = PyThreadState_GET();
++#if GREENLET_PY311
++        current->recursion_depth = (tstate->recursion_limit
++                                    - tstate->recursion_remaining);
++#else
+         current->recursion_depth = tstate->recursion_depth;
+         current->top_frame = tstate->frame;
++#endif
+ #if GREENLET_PY37
+         current->context = tstate->context;
+ #endif
+@@ -551,6 +558,15 @@ g_switchstack(void)
+          */
+         current->cframe = tstate->cframe;
+         ts__g_switchstack_use_tracing = tstate->cframe->use_tracing;
++#if GREENLET_PY311
++        current->current_frame = tstate->cframe->current_frame;
++        current->datastack_chunk = tstate->datastack_chunk;
++        current->datastack_top = tstate->datastack_top;
++        current->datastack_limit = tstate->datastack_limit;
++        PyFrameObject *frame = PyThreadState_GetFrame(tstate);
++        Py_XDECREF(frame); /* PyThreadState_GetFrame gives us a new reference. */
++        current->top_frame = frame;
++#endif
+ #endif
+     }
+ 
+@@ -574,9 +590,6 @@ g_switchstack(void)
+         PyGreenlet* target = ts_target;
+         PyGreenlet* origin = ts_current;
+         PyThreadState* tstate = PyThreadState_GET();
+-        tstate->recursion_depth = target->recursion_depth;
+-        tstate->frame = target->top_frame;
+-        target->top_frame = NULL;
+ 
+ #if GREENLET_PY37
+         tstate->context = target->context;
+@@ -607,7 +620,18 @@ g_switchstack(void)
+         */
+         tstate->cframe->use_tracing = ts__g_switchstack_use_tracing;
+ #endif
+-
++#if GREENLET_PY311
++        tstate->recursion_remaining = (tstate->recursion_limit
++                                       - target->recursion_depth);
++        tstate->cframe->current_frame = target->current_frame;
++        tstate->datastack_chunk = target->datastack_chunk;
++        tstate->datastack_top = target->datastack_top;
++        tstate->datastack_limit = target->datastack_limit;
++#else
++        tstate->recursion_depth = target->recursion_depth;
++        tstate->frame = target->top_frame;
++#endif
++        target->top_frame = NULL;
+         assert(ts_origin == NULL);
+         Py_INCREF(target);
+         ts_current = target;
+@@ -810,7 +834,7 @@ static int GREENLET_NOINLINE(g_initialstub)(void* mark)
+       We want to defer copying the state info until we're sure
+       we need it and are in a stable place to do so.
+     */
+-    CFrame trace_info;
++    _PyCFrame trace_info;
+ #endif
+     /* save exception in case getattr clears it */
+     PyErr_Fetch(&exc, &val, &tb);
+@@ -875,7 +899,12 @@ static int GREENLET_NOINLINE(g_initialstub)(void* mark)
+     }
+     self->top_frame = NULL;
+     green_clear_exc(self);
++#if GREENLET_PY311
++    self->recursion_depth = (PyThreadState_GET()->recursion_limit
++                             - PyThreadState_GET()->recursion_remaining);
++#else
+     self->recursion_depth = PyThreadState_GET()->recursion_depth;
++#endif
+ 
+     /* restore arguments in case they are clobbered */
+     ts_target = self;
+@@ -1006,13 +1035,13 @@ green_new(PyTypeObject* type, PyObject* args, PyObject* kwds)
+           it uses the ``root_cframe`` just to have something to put there.
+           However, once the greenlet is actually switched to for the first
+           time, ``g_initialstub`` (which doesn't actually "return" while the
+-          greenlet is running) stores a new CFrame on its local stack, and
++          greenlet is running) stores a new _PyCFrame on its local stack, and
+           copies the appropriate values from the currently running CFrame;
+-          this is then made the CFrame for the newly-minted greenlet.
++          this is then made the _PyCFrame for the newly-minted greenlet.
+           ``g_initialstub`` then proceeds to call ``glet.run()``, which
+-          results in ``PyEval_...`` adding the CFrame to the list. Switches
++          results in ``PyEval_...`` adding the _PyCFrame to the list. Switches
+           continue as normal. Finally, when the greenlet finishes, the call to
+-          ``glet.run()`` returns and the CFrame is taken out of the linked
++          ``glet.run()`` returns and the _PyCFrame is taken out of the linked
+           list and the stack value is now unused and free to expire.
+         */
+         ((PyGreenlet*)o)->cframe = &PyThreadState_GET()->root_cframe;
+@@ -1121,9 +1150,11 @@ green_traverse(PyGreenlet* self, visitproc visit, void* arg)
+     Py_VISIT(self->context);
+ #endif
+ #if GREENLET_PY37
+-    Py_VISIT(self->exc_state.exc_type);
+     Py_VISIT(self->exc_state.exc_value);
++#if !GREENLET_PY311
++    Py_VISIT(self->exc_state.exc_type);
+     Py_VISIT(self->exc_state.exc_traceback);
++#endif
+ #else
+     Py_VISIT(self->exc_type);
+     Py_VISIT(self->exc_value);
+@@ -1159,9 +1190,11 @@ green_clear(PyGreenlet* self)
+     Py_CLEAR(self->context);
+ #endif
+ #if GREENLET_PY37
+-    Py_CLEAR(self->exc_state.exc_type);
+     Py_CLEAR(self->exc_state.exc_value);
++#if !GREENLET_PY311
++    Py_CLEAR(self->exc_state.exc_type);
+     Py_CLEAR(self->exc_state.exc_traceback);
++#endif
+ #else
+     Py_CLEAR(self->exc_type);
+     Py_CLEAR(self->exc_value);
+@@ -1253,9 +1286,11 @@ green_dealloc(PyGreenlet* self)
+     Py_CLEAR(self->context);
+ #endif
+ #if GREENLET_PY37
+-    Py_CLEAR(self->exc_state.exc_type);
+     Py_CLEAR(self->exc_state.exc_value);
++#if !GREENLET_PY311
++    Py_CLEAR(self->exc_state.exc_type);
+     Py_CLEAR(self->exc_state.exc_traceback);
++#endif
+ #else
+     Py_CLEAR(self->exc_type);
+     Py_CLEAR(self->exc_value);
+diff --git a/src/greenlet/greenlet.h b/src/greenlet/greenlet.h
+index 830bef8d..c788b2fe 100644
+--- a/src/greenlet/greenlet.h
++++ b/src/greenlet/greenlet.h
+@@ -14,6 +14,15 @@ extern "C" {
+ /* This is deprecated and undocumented. It does not change. */
+ #define GREENLET_VERSION "1.0.0"
+ 
++#if PY_VERSION_HEX >= 0x30B00A6
++#  define GREENLET_PY311 1
++   /* _PyInterpreterFrame moved to the internal C API in Python 3.11 */
++#  include <internal/pycore_frame.h>
++#else
++#  define GREENLET_PY311 0
++#  define _PyCFrame CFrame
++#endif
++
+ typedef struct _greenlet {
+     PyObject_HEAD
+     char* stack_start;
+@@ -25,6 +34,12 @@ typedef struct _greenlet {
+     PyObject* run_info;
+     struct _frame* top_frame;
+     int recursion_depth;
++#if GREENLET_PY311
++    _PyInterpreterFrame *current_frame;
++    _PyStackChunk *datastack_chunk;
++    PyObject **datastack_top;
++    PyObject **datastack_limit;
++#endif
+     PyObject* weakreflist;
+ #if PY_VERSION_HEX >= 0x030700A3
+     _PyErr_StackItem* exc_info;
+@@ -39,7 +54,7 @@ typedef struct _greenlet {
+     PyObject* context;
+ #endif
+ #if PY_VERSION_HEX >= 0x30A00B1
+-    CFrame* cframe;
++    _PyCFrame* cframe;
+ #endif
+ } PyGreenlet;
+ 
+diff --git a/tox.ini b/tox.ini
+index 21ecbbb2..efec08bc 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -1,6 +1,6 @@
+ [tox]
+ envlist =
+-    py27,py35,py36,py37,py38,py39,py310,docs
++    py27,py35,py36,py37,py38,py39,py310,py311,docs
+ 
+ [testenv]
+ commands =

c644ca6823994b958e004b3e00b587723181b58e.patch

@@ -1,48 +0,0 @@
-From d05b62bb75e6a3e217435a1fe0f15a53e692898c Mon Sep 17 00:00:00 2001
-From: Victor Stinner <vstinner@python.org>
-Date: Wed, 18 Mar 2020 15:09:33 +0100
-Subject: [PATCH] Port to Python 3.9
-
-On Python 3.9, define _Py_DEC_REFTOTAL which has been removed by:
-https://github.com/python/cpython/commit/49932fec62c616ec88da52642339d83ae719e924
-
-Replace also PyEval_CallObjectWithKeywords() with PyObject_Call(),
-since PyEval_CallObjectWithKeywords() has been deprecated in
-Python 3.9 and PyObject_Call() has the same behavior. The only
-difference is that PyEval_CallObjectWithKeywords() can be called with
-args=NULL, but g_initialstub() ensures that args is not NULL.
----
- greenlet.c | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/greenlet.c b/greenlet.c
-index ec738b9..d37fc97 100644
---- a/greenlet.c
-+++ b/greenlet.c
-@@ -109,6 +109,16 @@ extern PyTypeObject PyGreenlet_Type;
- #define GREENLET_USE_TRACING 1
- #endif
- 
-+#ifndef _Py_DEC_REFTOTAL
-+  /* _Py_DEC_REFTOTAL macro has been removed from Python 3.9 by:
-+    https://github.com/python/cpython/commit/49932fec62c616ec88da52642339d83ae719e924 */
-+#  ifdef Py_REF_DEBUG
-+#    define _Py_DEC_REFTOTAL _Py_RefTotal--
-+#  else
-+#    define _Py_DEC_REFTOTAL
-+#  endif
-+#endif
-+
- /* Weak reference to the switching-to greenlet during the slp switch */
- static PyGreenlet* volatile ts_target = NULL;
- /* Strong reference to the switching from greenlet after the switch */
-@@ -820,8 +830,7 @@ static int GREENLET_NOINLINE(g_initialstub)(void* mark)
- 			result = NULL;
- 		} else {
- 			/* call g.run(*args, **kwargs) */
--			result = PyEval_CallObjectWithKeywords(
--				run, args, kwargs);
-+			result = PyObject_Call(run, args, kwargs);
- 			Py_DECREF(args);
- 			Py_XDECREF(kwargs);
- 		}

python-greenlet.spec

@@ -1,14 +1,21 @@
 %global         modname greenlet
 
 Name:           python-%{modname}
-Version:        0.4.14
-Release:        8%{?dist}
+Version:        1.1.2
+Release:        5%{?dist}
 Summary:        Lightweight in-process concurrent programming
 License:        MIT
 URL:            https://github.com/python-greenlet/greenlet
 Source0:        %{url}/archive/%{version}/%{modname}-%{version}.tar.gz
+
+# Python 3.11 support, backported from 2.0.0a2
+# https://github.com/python-greenlet/greenlet/commit/fd0b68ab406a0dfe3d6d0d8c9d17354356f53da0
+# https://github.com/python-greenlet/greenlet/commit/63e1099acc3677e614532bea0fa2e1967b69125f
+# https://github.com/python-greenlet/greenlet/commit/5ed467e5cb34651cc013c286158d0b6d7ff0a26a
+# Proposed upstream via https://github.com/python-greenlet/greenlet/pull/306
+Patch:          https://github.com/python-greenlet/greenlet/pull/306.patch
+
 BuildRequires:  gcc-c++
-Patch1:         %{url}/commit/c644ca6823994b958e004b3e00b587723181b58e.patch
 
 %global _description \
 The greenlet package is a spin-off of Stackless, a version of CPython\
@@ -48,18 +55,59 @@ Python 3 version.
 %py3_install
  
 %check
-%{__python3} setup.py test
+PYTHONPATH="%{buildroot}%{python3_sitearch}" %{python3} -m unittest discover greenlet.tests
 
 %files -n python3-%{modname}
 %license LICENSE LICENSE.PSF
-%doc AUTHORS NEWS README.rst
+%doc AUTHORS README.rst
 %{python3_sitearch}/%{modname}-*.egg-info
-%{python3_sitearch}/%{modname}*.so
+%{python3_sitearch}/%{modname}
 
 %files -n python3-greenlet-devel
 %{_includedir}/python%{python3_version}*/%{modname}/
 
 %changelog
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.1.2-4
+- Rebuilt for Python 3.11
+
+* Wed Jun 01 2022 Miro Hrončok <mhroncok@redhat.com> - 1.1.2-3
+- Python 3.11 support
+- Fixes: rhbz#2040186
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Sep 30 2021 Kevin Fenzi <kevin@scrye.com> - 1.1.2-1
+- Update to 1.1.2. Fixes rhbz#2008848
+
+* Sat Aug 07 2021 Kevin Fenzi <kevin@scrye.com> - 1.1.1-1
+- Update to 1.1.1.
+- Fixes rhbz#1990901
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 1.1.0-2
+- Rebuilt for Python 3.10
+
+* Mon May 10 2021 Nils Philippsen <nils@tiptoe.de> - 1.1.0-1
+- Update to 1.1.0
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Oct 31 2020 Kevin Fenzi <kevin@scrye.com> - 0.4.17-1
+- Update to 0.4.17. Fixes bug #1881455
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.16-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jun 06 2020 Orion Poplawski <orion@nwra.com> - 0.4.16-1
+- Update to 0.4.16
+
 * Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 0.4.14-8
 - Rebuilt for Python 3.9
 

sources

@@ -1 +1 @@
-SHA512 (greenlet-0.4.14.tar.gz) = c86802a0df56b78482b029a0eaf624ca8f14d0e704480b30a8a35e343b3e4a16e80b6f169a970a39935b39d56aafc25bada0738199818b5892ca398a809d54ef
+SHA512 (greenlet-1.1.2.tar.gz) = 9c7b123a0b9a6f22f042416479762777cb70e6dd10bcc92e313c492e4c1a4d831e713f903a369e4c5d65fc285a954aabd3b26c090d47f8eeb1cb522bda6a6e82