Added support for python 3.13 (closes #37)

igorcoding · Dec 1, 2024 · 7e423e0 · 7e423e0
1 parent 8994fcc
commit 7e423e0
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 9 deletions.
diff --git a/.github/workflows/actions.yaml b/.github/workflows/actions.yaml
@@ -7,7 +7,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, macos-latest ]
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', 'pypy3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 'pypy3.10']
         tarantool: ['1.10', '2', '3']
         exclude:
           - os: macos-latest
@@ -33,7 +33,7 @@ jobs:
       - name: Install Tarantool ${{ matrix.tarantool }} on Ubuntu
         if: matrix.os == 'ubuntu-latest'
         run: |
-          curl -L https://tarantool.io/nTmSHOX/release/${{ matrix.tarantool }}/installer.sh | bash
+          curl -L https://tarantool.io/release/${{ matrix.tarantool }}/installer.sh | bash
           sudo apt-get -y install tarantool
 
       - name: Install Tarantool ${{ matrix.tarantool }} on MacOS
@@ -78,7 +78,7 @@ jobs:
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse
         env:
-          CIBW_BUILD: "cp37-* cp38-* cp39-* cp310-* cp311-* cp312-* pp310-*"
+          CIBW_BUILD: "cp37-* cp38-* cp39-* cp310-* cp311-* cp312-* cp313-* pp310-*"
 
       - uses: actions/upload-artifact@v4
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## v2.3.1
+**New features**
+* Added support for Python 3.13 [#37](https://github.com/igorcoding/asynctnt/issues/37)
+
+**Other changes**
+* Upgraded Cython to 3.0.11
+
 ## v2.3.0
 **New features:**
 * Added support for [interval types](https://www.tarantool.io/en/doc/latest/reference/reference_lua/datetime/interval_object/) [#30](https://github.com/igorcoding/asynctnt/issues/30)

diff --git a/asynctnt/__init__.py b/asynctnt/__init__.py
@@ -18,4 +18,4 @@
     TarantoolTuple,
 )
 
-__version__ = "2.3.0"
+__version__ = "2.3.1"
diff --git a/asynctnt/iproto/tupleobj/tupleobj.c b/asynctnt/iproto/tupleobj/tupleobj.c
@@ -72,7 +72,7 @@ ttuple_dealloc(AtntTupleObject *o)
 
     Py_CLEAR(o->metadata);
 
-    Py_TRASHCAN_SAFE_BEGIN(o)
+    CPy_TRASHCAN_BEGIN(o, ttuple_dealloc)
     if (len > 0) {
         i = len;
         while (--i >= 0) {
@@ -91,7 +91,7 @@ ttuple_dealloc(AtntTupleObject *o)
     }
     Py_TYPE(o)->tp_free((PyObject *)o);
 done:
-    Py_TRASHCAN_SAFE_END(o)
+    CPy_TRASHCAN_END(o)
 }
 
 

diff --git a/asynctnt/iproto/tupleobj/tupleobj.h b/asynctnt/iproto/tupleobj/tupleobj.h
@@ -8,6 +8,21 @@
 extern "C" {
 #endif
 
+#if defined(PYPY_VERSION)
+#  define CPy_TRASHCAN_BEGIN(op, dealloc)
+#  define CPy_TRASHCAN_END(op)
+#else
+
+#if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 8
+#  define CPy_TRASHCAN_BEGIN(op, dealloc) Py_TRASHCAN_BEGIN(op, dealloc)
+#  define CPy_TRASHCAN_END(op) Py_TRASHCAN_END
+#else
+#  define CPy_TRASHCAN_BEGIN(op, dealloc) Py_TRASHCAN_SAFE_BEGIN(op)
+#  define CPy_TRASHCAN_END(op) Py_TRASHCAN_SAFE_END(op)
+#endif
+
+#endif
+
 /* Largest ttuple to save on free list */
 #define AtntTuple_MAXSAVESIZE 20
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -46,7 +46,7 @@ test = [
     'coverage[toml]',
     'pytz',
     'python-dateutil',
-    "Cython==3.0.7",  # for coverage
+    "Cython==3.0.11",  # for coverage
 ]
 
 docs = [
@@ -63,7 +63,7 @@ requires = [
     "setuptools>=60",
     "wheel",
 
-    "Cython==3.0.7",
+    "Cython==3.0.11",
 ]
 build-backend = "setuptools.build_meta"
 

diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@ def find_version():
             return re.match(r"""__version__\s*=\s*(['"])([^'"]+)\1""", line).group(2)
 
 
-CYTHON_VERSION = "3.0.7"
+CYTHON_VERSION = "3.0.11"
 
 
 class build_ext(setuptools_build_ext.build_ext):