Version 0.13.0: Python 3.13 compatibility

Python 3.13 removed _PyArg_ParseStack and _PyDict_SetItem_KnownHash from the C API

Unfortunately this means that the code has to resort to the old (not as optimized)
approaches again.

CI:
- Update pypy build
- Update python 3.12 build
- Add python 3.13 rc2 build
- update cibuildwheel

Author: MSeifert04

.github/workflows/cpython.yml

@@ -45,19 +45,19 @@ jobs:
       uses: actions/checkout@v4
       with:
         fetch-depth: 1
-    - name: Download Python 3.12
+    - name: Download Python
       run: |
-        wget https://www.python.org/ftp/python/3.12.2/Python-3.12.2.tgz -q
-        python3 ci/verify_checksum.py Python-3.12.2.tgz 4e64a004f8ad9af1a75607cfd0d5a8c8
-    - name: Install Python 3.12
+        wget https://www.python.org/ftp/python/3.12.6/Python-3.12.6.tgz -q
+        python3 ci/verify_checksum.py Python-3.12.6.tgz c2f1dd5c8807ee50b778684b7958ee28
+    - name: Install Python
       run: |
-        tar xzf Python-3.12.2.tgz
-        cd Python-3.12.2
+        tar xzf Python-3.12.6.tgz
+        cd Python-3.12.6
         ./configure --with-pydebug
         sudo make altinstall -s -j2
     - name: Remove download
       run: |
-        sudo python3.12 -c "import os; os.remove('./Python-3.12.2.tgz'); import shutil; shutil.rmtree('./Python-3.12.2/')"
+        sudo python3.12 -c "import os; os.remove('./Python-3.12.6.tgz'); import shutil; shutil.rmtree('./Python-3.12.6/')"
     - name: Install dependencies
       run: |
         python3.12 -m pip install pip setuptools wheel --upgrade --user --no-warn-script-location
@@ -77,6 +77,46 @@ jobs:
       run: |
         python3.12 -m pytest tests/
 
+  build-python3-13-with-debug:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+    - name: Check out source
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 1
+    - name: Download Python
+      run: |
+        wget https://www.python.org/ftp/python/3.13.0/Python-3.13.0rc2.tgz -q
+        python3 ci/verify_checksum.py Python-3.13.0rc2.tgz ad7f44153649e27ec385e7633e853e03
+    - name: Install Python
+      run: |
+        tar xzf Python-3.13.0rc2.tgz
+        cd Python-3.13.0rc2
+        ./configure --with-pydebug
+        sudo make altinstall -s -j2
+    - name: Remove download
+      run: |
+        sudo python3.13 -c "import os; os.remove('./Python-3.13.0rc2.tgz'); import shutil; shutil.rmtree('./Python-3.13.0rc2/')"
+    - name: Install dependencies
+      run: |
+        python3.13 -m pip install pip setuptools wheel --upgrade --user --no-warn-script-location
+    - name: Create wheel
+      run: |
+        python3.13 -m pip wheel . --no-deps --wheel-dir=./wheelhouse/ -vv
+    - name: Install package
+      run: |
+        python3.13 -m pip install iteration_utilities --no-index --find-links=./wheelhouse/ --user -vv
+    - name: Import package
+      run: |
+        python3.13 -c "import iteration_utilities"
+    - name: Install test dependencies
+      run: |
+        python3.13 -m pip install pytest --user --no-warn-script-location
+    - name: Run tests
+      run: |
+        python3.13 -m pytest tests/
+
   build-sdist:
     runs-on: ubuntu-latest
     timeout-minutes: 10
@@ -100,7 +140,7 @@ jobs:
         rm ./dist/*.whl
     - name: Install package
       run: |
-        python -m pip install ./dist/iteration_utilities-0.12.1.tar.gz -vv
+        python -m pip install ./dist/iteration_utilities-0.13.0.tar.gz -vv
     - name: Import package
       run: |
         python -c "import iteration_utilities"
@@ -132,7 +172,7 @@ jobs:
           python-version: '3.12'
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.16.5
+        run: python -m pip install cibuildwheel==2.21.1
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse

.github/workflows/pypy.yml

@@ -23,11 +23,11 @@ jobs:
     - name: Test installation (Ubuntu)
       if: matrix.os == 'ubuntu-20.04'
       run: |
-        python3 -c "import urllib.request; urllib.request.urlretrieve ('hhttps://downloads.python.org/pypy/pypy3.10-v7.3.15-linux64.tar.bz2', './pypy.tar.bz2')"
+        python3 -c "import urllib.request; urllib.request.urlretrieve ('hhttps://downloads.python.org/pypy/pypy3.10-v7.3.17-linux64.tar.bz2', './pypy.tar.bz2')"
         python3 -c "import tarfile; tar = tarfile.open('./pypy.tar.bz2', 'r:bz2');tar.extractall('.'); tar.close()"
-        ./pypy3.10-v7.3.15-linux64/bin/pypy3 -m ensurepip
-        ./pypy3.10-v7.3.15-linux64/bin/pypy3 -m pip install pip setuptools --upgrade
-        ./pypy3.10-v7.3.15-linux64/bin/pypy3 -m pip install . --no-deps -vv
-        ./pypy3.10-v7.3.15-linux64/bin/pypy3 -c "import iteration_utilities"
-        ./pypy3.10-v7.3.15-linux64/bin/pypy3 -m pip install pytest
-        ./pypy3.10-v7.3.15-linux64/bin/pypy3 -m pytest tests
+        ./pypy3.10-v7.3.17-linux64/bin/pypy3 -m ensurepip
+        ./pypy3.10-v7.3.17-linux64/bin/pypy3 -m pip install pip setuptools --upgrade
+        ./pypy3.10-v7.3.17-linux64/bin/pypy3 -m pip install . --no-deps -vv
+        ./pypy3.10-v7.3.17-linux64/bin/pypy3 -c "import iteration_utilities"
+        ./pypy3.10-v7.3.17-linux64/bin/pypy3 -m pip install pytest
+        ./pypy3.10-v7.3.17-linux64/bin/pypy3 -m pytest tests

docs/CHANGES.rst

@@ -1,6 +1,14 @@
 Changelog for "iteration_utilities"
 -----------------------------------
 
+Version 0.13.0 (unreleased)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+- Python 3.13 compatibility: A few optimizations are not possible anymore in Python 3.13.
+  This means the performance of some functions (most notably ``groupedby``) will be slightly
+  slower.
+
+
 Version 0.12.1 (2024-03-03)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "iteration_utilities"
-version = "0.12.1"
+version = "0.13.0"
 description = "Utilities based on Pythons iterators and generators."
 readme = "README.rst"
 requires-python = ">=3.7"

src/iteration_utilities/_iteration_utilities/_iteration_utilities.c

@@ -156,7 +156,7 @@ static PyMethodDef PyIU_methods[] = {
     /* Helper */
     {
         "_parse_args", /* ml_name */
-#if PyIU_USE_VECTORCALL
+#if PyIU_USE_ARG_PARSE_STACK
         (PyCFunction)(void (*)(void))PyIU_TupleToList_and_InsertItemAtIndex, /* ml_meth */
         METH_FASTCALL,                                                       /* ml_flags */
 #else
@@ -167,7 +167,7 @@ static PyMethodDef PyIU_methods[] = {
     },
     {
         "_parse_kwargs", /* ml_name */
-#if PyIU_USE_VECTORCALL
+#if PyIU_USE_ARG_PARSE_STACK
         (PyCFunction)(void (*)(void))PyIU_RemoveFromDictWhereValueIs, /* ml_meth */
         METH_FASTCALL,                                                /* ml_flags */
 #else

src/iteration_utilities/_iteration_utilities/exported_helper.c

@@ -101,7 +101,7 @@ PyIU_parse_kwargs(PyObject *dct, PyObject *remvalue) {
     Py_RETURN_NONE;
 }
 
-#if PyIU_USE_VECTORCALL
+#if PyIU_USE_ARG_PARSE_STACK
 PyObject *
 PyIU_TupleToList_and_InsertItemAtIndex(PyObject *Py_UNUSED(m), PyObject *const *args, size_t nargs) {
     PyObject *tup;

src/iteration_utilities/_iteration_utilities/exported_helper.h

@@ -9,7 +9,7 @@ extern "C" {
 #include <Python.h>
 #include "helpercompat.h"
 
-#if PyIU_USE_VECTORCALL
+#if PyIU_USE_ARG_PARSE_STACK
 PyObject * PyIU_TupleToList_and_InsertItemAtIndex(PyObject *Py_UNUSED(m), PyObject *const *args, size_t nargs);
 PyObject * PyIU_RemoveFromDictWhereValueIs(PyObject *Py_UNUSED(m), PyObject *const *args, size_t nargs);
 #else

src/iteration_utilities/_iteration_utilities/groupedby.c

@@ -5,8 +5,6 @@
 #include "groupedby.h"
 #include "helper.h"
 
-#define PyIU_USE_DICT_INTERNALS PYIU_CPYTHON
-
 PyObject *
 PyIU_Groupby(PyObject *Py_UNUSED(m), PyObject *args, PyObject *kwargs) {
     static char *kwlist[] = {"iterable", "key", "keep", "reduce", "reducestart", NULL};

src/iteration_utilities/_iteration_utilities/helpercompat.h

@@ -41,8 +41,11 @@ extern "C" {
 #define PyIU_USE_FASTCALL (PYIU_CPYTHON && PY_MAJOR_VERSION == 3 && (PY_MINOR_VERSION == 6 || PY_MINOR_VERSION == 7))
 #define PyIU_USE_UNDERSCORE_VECTORCALL (PYIU_CPYTHON && PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION == 8)
 #define PyIU_USE_VECTORCALL (PYIU_CPYTHON && ((PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 8) || PY_MAJOR_VERSION >= 4))
+#define PyIU_USE_ARG_PARSE_STACK (PYIU_CPYTHON && (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 8 && PY_MINOR_VERSION < 13))  // https://github.com/python/cpython/issues/110964
 #define PyIU_USE_BUILTIN_MODULE_ADDTYPE ((PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 9) || PY_MAJOR_VERSION >= 4)
 
+#define PyIU_USE_DICT_INTERNALS (PYIU_CPYTHON && (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 13))  // https://github.com/python/cpython/pull/108449 and https://github.com/python/cpython/pull/112115
+
 #ifdef Py_IS_TYPE
   #define PyIU_USE_BUILTIN_IS_TYPE 1
 #else