greenlet 3.2.2__tar.gz → 3.2.3__tar.gz

{greenlet-3.2.2 → greenlet-3.2.3}/.github/workflows/tests.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [3.9, "3.10", "3.11", "3.12", "3.13", "3.14.0-beta.1"]
+        python-version: [3.9, "3.10", "3.11", "3.12", "3.13", "3.14.0-beta.2"]
         # Recall the macOS builds upload built wheels so all supported versions
         # need to run on mac.
         os: [ubuntu-latest, macos-latest]

{greenlet-3.2.2 → greenlet-3.2.3}/CHANGES.rst

@@ -2,6 +2,14 @@
  Changes
 =========
 
+3.2.3 (2025-06-05)
+==================
+
+- Make greenlet build and run on Python 3.14 beta 2 on Windows amd64.
+- Potentially fix build on NetBSD/sparc64. See `PR 447
+  <https://github.com/python-greenlet/greenlet/pull/447>`_.
+
+
 3.2.2 (2025-05-09)
 ==================
 

{greenlet-3.2.2 → greenlet-3.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: greenlet
-Version: 3.2.2
+Version: 3.2.3
 Summary: Lightweight in-process concurrent programming
 Home-page: https://greenlet.readthedocs.io/
 Author: Alexey Borzenkov

{greenlet-3.2.2 → greenlet-3.2.3}/appveyor.yml

@@ -39,6 +39,11 @@ environment:
 
     # Fully supported 64-bit versions, with testing. This should be
     # all the current (non EOL) versions.
+    - PYTHON: "C:\\Python314-x64"
+      PYTHON_VERSION: "3.14.0b2"
+      PYTHON_ARCH: "64"
+      PYTHON_EXE: python
+
     - PYTHON: "C:\\Python313-x64"
       PYTHON_VERSION: "3.13.0"
       PYTHON_ARCH: "64"

{greenlet-3.2.2 → greenlet-3.2.3}/make-manylinux

@@ -35,8 +35,8 @@ if [ -d /greenlet -a -d /opt/python ]; then
     which auditwheel
     echo "Installed Python versions"
     ls -l /opt/python
-    for variant in `ls -d /opt/python/cp{313,39,310,311,312}*`; do
-        if [ "$variant" = "/opt/python/cp313-313t" ]; then
+    for variant in `ls -d /opt/python/cp{314,313,39,310,311,312}*`; do
+        if [[ "$variant" == *t ]]; then
             echo "Skipping no-gil build. The GIL is required."
             continue
         fi

{greenlet-3.2.2 → greenlet-3.2.3}/src/greenlet/TGreenlet.hpp

@@ -29,8 +29,12 @@ using greenlet::refs::BorrowedGreenlet;
 
 #if GREENLET_PY314
 #  include "internal/pycore_interpframe_structs.h"
+#if defined(_MSC_VER) || defined(__MINGW64__)
+#   include "greenlet_msvc_compat.hpp"
+#else
 #  include "internal/pycore_interpframe.h"
 #endif
+#endif
 
 // XXX: TODO: Work to remove all virtual functions
 // for speed of calling and size of objects (no vtable).

{greenlet-3.2.2 → greenlet-3.2.3}/src/greenlet/__init__.py

@@ -25,7 +25,7 @@ __all__ = [
 ###
 # Metadata
 ###
-__version__ = '3.2.2'
+__version__ = '3.2.3'
 from ._greenlet import _C_API # pylint:disable=no-name-in-module
 
 ###

greenlet-3.2.3/src/greenlet/greenlet_msvc_compat.hpp

@@ -0,0 +1,91 @@
+#ifndef GREENLET_MSVC_COMPAT_HPP
+#define GREENLET_MSVC_COMPAT_HPP
+/*
+ * Support for MSVC on Windows.
+ *
+ * Beginning with Python 3.14, some of the internal
+ * include files we need are not compatible with MSVC
+ * in C++ mode:
+ *
+ *   internal\pycore_stackref.h(253): error C4576: a parenthesized type
+ *    followed by an initializer list is a non-standard explicit type conversion syntax
+ *
+ * This file is included from ``internal/pycore_interpframe.h``, which
+ * we need for the ``_PyFrame_IsIncomplete`` API.
+ *
+ * Unfortunately, that API is a ``static inline`` function, as are a
+ * bunch of the functions it calls. The only solution seems to be to
+ * copy those definitions and the supporting inline functions here.
+ *
+ * Now, this makes us VERY fragile to changes in those functions. Because
+ * they're internal and static, the CPython devs might feel free to change
+ * them in even minor versions, meaning that we could runtime link and load,
+ * but still crash. We have that problem on all platforms though. It's just worse
+ * here because we have to keep copying the updated definitions.
+ */
+#include <Python.h>
+#include "greenlet_cpython_compat.hpp"
+
+// This file is only included on 3.14+
+
+extern "C" {
+
+// pycore_code.h ----------------
+#define _PyCode_CODE(CO) _Py_RVALUE((_Py_CODEUNIT *)(CO)->co_code_adaptive)
+// End pycore_code.h ----------
+
+// pycore_interpframe.h ----------
+#if !defined(Py_GIL_DISABLED) && defined(Py_STACKREF_DEBUG)
+
+#define Py_TAG_BITS 0
+#else
+#define Py_TAG_BITS     ((uintptr_t)1)
+#define Py_TAG_DEFERRED (1)
+#endif
+
+
+static const _PyStackRef PyStackRef_NULL = { .bits = Py_TAG_DEFERRED};
+#define PyStackRef_IsNull(stackref) ((stackref).bits == PyStackRef_NULL.bits)
+
+static inline PyObject *
+PyStackRef_AsPyObjectBorrow(_PyStackRef stackref)
+{
+    PyObject *cleared = ((PyObject *)((stackref).bits & (~Py_TAG_BITS)));
+    return cleared;
+}
+
+static inline PyCodeObject *_PyFrame_GetCode(_PyInterpreterFrame *f) {
+    assert(!PyStackRef_IsNull(f->f_executable));
+    PyObject *executable = PyStackRef_AsPyObjectBorrow(f->f_executable);
+    assert(PyCode_Check(executable));
+    return (PyCodeObject *)executable;
+}
+
+
+static inline _Py_CODEUNIT *
+_PyFrame_GetBytecode(_PyInterpreterFrame *f)
+{
+#ifdef Py_GIL_DISABLED
+    PyCodeObject *co = _PyFrame_GetCode(f);
+    _PyCodeArray *tlbc = _PyCode_GetTLBCArray(co);
+    assert(f->tlbc_index >= 0 && f->tlbc_index < tlbc->size);
+    return (_Py_CODEUNIT *)tlbc->entries[f->tlbc_index];
+#else
+    return _PyCode_CODE(_PyFrame_GetCode(f));
+#endif
+}
+
+static inline bool //_Py_NO_SANITIZE_THREAD
+_PyFrame_IsIncomplete(_PyInterpreterFrame *frame)
+{
+    if (frame->owner >= FRAME_OWNED_BY_INTERPRETER) {
+        return true;
+    }
+    return frame->owner != FRAME_OWNED_BY_GENERATOR &&
+           frame->instr_ptr < _PyFrame_GetBytecode(frame) +
+                                  _PyFrame_GetCode(frame)->_co_firsttraceable;
+}
+// pycore_interpframe.h ----------
+
+}
+#endif // GREENLET_MSVC_COMPAT_HPP

{greenlet-3.2.2 → greenlet-3.2.3}/src/greenlet/slp_platformselect.h

@@ -31,6 +31,8 @@ extern "C" {
 #include "platform/switch_ppc_unix.h" /* gcc on NetBSD/powerpc */
 #elif defined(__GNUC__) && defined(sparc)
 # include "platform/switch_sparc_sun_gcc.h" /* SunOS sparc with gcc */
+#elif defined(__GNUC__) && defined(__sparc__)
+# include "platform/switch_sparc_sun_gcc.h" /* NetBSD sparc with gcc */
 #elif defined(__SUNPRO_C) && defined(sparc) && defined(sun)
 # include "platform/switch_sparc_sun_gcc.h" /* SunStudio on amd64 */
 #elif defined(__SUNPRO_C) && defined(__amd64__) && defined(sun)

{greenlet-3.2.2 → greenlet-3.2.3}/src/greenlet.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: greenlet
-Version: 3.2.2
+Version: 3.2.3
 Summary: Lightweight in-process concurrent programming
 Home-page: https://greenlet.readthedocs.io/
 Author: Alexey Borzenkov

{greenlet-3.2.2 → greenlet-3.2.3}/src/greenlet.egg-info/SOURCES.txt

@@ -1,5 +1,4 @@
 .clang-format
-.gitignore
 .pylintrc
 .readthedocs.yml
 AUTHORS
@@ -65,6 +64,7 @@ src/greenlet/greenlet_compiler_compat.hpp
 src/greenlet/greenlet_cpython_compat.hpp
 src/greenlet/greenlet_exceptions.hpp
 src/greenlet/greenlet_internal.hpp
+src/greenlet/greenlet_msvc_compat.hpp
 src/greenlet/greenlet_refs.hpp
 src/greenlet/greenlet_slp_switch.hpp
 src/greenlet/greenlet_thread_support.hpp

greenlet-3.2.2/.gitignore

@@ -1,14 +0,0 @@
-*.so
-*.pyd
-*.pyc
-*.pyo
-build/
-dist/
-.tox/
-wheelhouse/
-greenlet.egg-info/
-/docs/_build
-__pycache__/
-/.ropeproject/
-/MANIFEST
-benchmarks/*.json