Merge pull request #41 from zodb/315-freethread

Add Python 3.15 and free-threaded support

Author: jamadden

.github/workflows/tests.yml

@@ -81,7 +81,16 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [pypy-3.11, '3.10', '3.11', "3.12", "3.13", "3.14.0-rc.3"]
+        python-version:
+          - pypy-3.11
+          - '3.10'
+          - '3.11'
+          - "3.12"
+          - "3.13"
+          - "3.14"
+          - "3.15-dev"
+          - "3.14t"
+          - "3.15t-dev"
         os: [ubuntu-latest, macos-latest]
         exclude:
           - os: macos-latest
@@ -101,8 +110,14 @@ jobs:
         run: |
           pip install -U pip
           pip install -U setuptools wheel twine build
-          pip install -U 'cython>=3.0.10'
+          pip install -U 'cython>=3.2.4'
           pip install -U coverage
+      - name: Disable GIL
+        if: ${{endsWith(matrix.python-version, 't') || endsWith(matrix.python-version, 't-dev')}}
+        # zope.i18nmessageid
+        run: |
+          echo PYTHON_GIL=0 >> $GITHUB_ENV
+
       - name: Install perfmetrics (non-Mac)
         if: ${{ ! startsWith(runner.os, 'Mac') }}
         run: |
@@ -129,12 +144,13 @@ jobs:
           ARCHFLAGS: "-arch x86_64 -arch arm64"
 
       - name: Check perfmetrics build
+        if: matrix.python-version == '3.14' && startsWith(runner.os, 'Linux')
         run: |
           ls -l dist
           twine check dist/*
 
       - name: Upload perfmetrics wheel
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: perfmetrics-${{ runner.os }}-${{ matrix.python-version }}.whl
           path: dist/*whl
@@ -157,8 +173,7 @@ jobs:
           twine upload --skip-existing dist/*
 
       - name: lint
-        if: matrix.python-version == '3.11' && startsWith(runner.os, 'Linux')
-        # At this writing, PyLint 2.17/astroid 2.15 won't work on 3.12
+        if: matrix.python-version == '3.14' && startsWith(runner.os, 'Linux')
         run: |
           pip install -U pylint
           python -m pylint --limit-inference-results=1 --rcfile=.pylintrc perfmetrics -f parseable -r n
@@ -168,12 +183,12 @@ jobs:
     # We use a regular Python matrix entry to share as much code as possible.
     strategy:
       matrix:
-        python-version: [3.11]
+        python-version: [3.14]
         image:
-          - manylinux2014_aarch64
-          - manylinux2014_ppc64le
-          - manylinux2014_s390x
-          - manylinux2014_x86_64
+          - manylinux_2_28_x86_64
+          - manylinux_2_28_aarch64
+          # - manylinux_2_28_ppc64le
+          # - manylinux_2_28_s390x
           - musllinux_1_2_x86_64
           - musllinux_1_2_aarch64
     name: ${{ matrix.image }}
@@ -185,20 +200,20 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v4
         with:
           platforms: all
       - name: Build and test perfmetrics
         env:
           DOCKER_IMAGE: quay.io/pypa/${{ matrix.image }}
         run: bash ./scripts/releases/make-manylinux
       - name: Store perfmetrics wheels
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           path: wheelhouse/*whl
           name: ${{ matrix.image }}_wheels.zip
       - name: Publish package to PyPI
-        uses: pypa/gh-action-pypi-publish@v1.13.0
+        uses: pypa/gh-action-pypi-publish@v1.14.0
         if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
         with:
           user: __token__

.readthedocs.yml

@@ -21,7 +21,7 @@ sphinx:
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.11"
+    python: "3.14"
     # You can also specify other tool versions:
     # nodejs: "19"
     # rust: "1.64"

CHANGES.rst

@@ -2,10 +2,13 @@
  CHANGES
 =========
 
-4.2.1 (unreleased)
+4.3.0 (unreleased)
 ==================
 
-- Nothing changed yet.
+- Add support for Python 3.15. This will be the last major release to
+  support Python 3.10.
+- Add support for free-threaded Python 3.14 and 3.15.
+- Remove dependency on ``setuptools``.
 
 
 4.2.0 (2025-09-19)

docs/conf.py

@@ -32,12 +32,11 @@
 
 import os
 import sys
-import pkg_resources
+import importlib.metadata
 os.environ['PURE_PYTHON'] = '1'
 
 sys.path.append(os.path.abspath('../src'))
-rqmt = pkg_resources.require('perfmetrics')[0]
-
+rqmt = importlib.metadata.version('perfmetrics')
 
 
 extensions = [
@@ -77,9 +76,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '%s.%s' % tuple(map(int, rqmt.version.split('.')[:2]))
+version = '%s.%s' % tuple(map(int, rqmt.split('.')[:2]))
 # The full version, including alpha/beta/rc tags.
-release = rqmt.version
+release = rqmt
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pyproject.toml

@@ -19,5 +19,5 @@ requires = [
      # failing in Python 2 (https://travis-ci.org/github/gevent/gevent/jobs/683782800);
      # This was fixed in 3.0a5 (https://github.com/cython/cython/issues/3578)
      # 3.0a6 fixes an issue cythonizing source on 32-bit platforms
-     "Cython >= 3.0.10; platform_python_implementation == 'CPython'",
+     "Cython >= 3.2.4; platform_python_implementation == 'CPython'",
 ]

scripts/releases/make-manylinux

@@ -10,6 +10,7 @@ export PYTHONDONTWRITEBYTECODE=1
 # know. The env var works for pip 20.
 export PIP_NO_PYTHON_VERSION_WARNING=1
 export PIP_NO_WARN_SCRIPT_LOCATION=1
+export PIP_ROOT_USER_ACTION=ignore
 
 # Build configuration.
 export CFLAGS="-pipe -O3 -DNDEBUG"
@@ -22,12 +23,8 @@ if [ -d /io -a -d /opt/python ]; then
     cd /io
     rm -rf wheelhouse
     mkdir wheelhouse
-    for variant in /opt/python/cp{314,313,312,310,311}*; do
+    for variant in /opt/python/cp{315,314,313,312,310,311}*; do
         echo $SEP
-        if [[ "$variant" == *t ]]; then
-            echo "Skipping no-gil build. The GIL is required."
-            continue
-        fi
         echo "Building $variant"
         mkdir /tmp/build
         cd /tmp/build
@@ -46,5 +43,5 @@ if [ -d /io -a -d /opt/python ]; then
     exit 0
 fi
 
-docker run --rm -e GITHUB_ACTIONS -e DOCKER_IMAGE -v "$(pwd):/io" ${DOCKER_IMAGE:-quay.io/pypa/manylinux2014_x86_64} /io/scripts/releases/$(basename $0)
+docker run --rm -e GITHUB_ACTIONS -e DOCKER_IMAGE -v "$(pwd):/io" ${DOCKER_IMAGE:-quay.io/pypa/manylinux_2_28_x86_64} /io/scripts/releases/$(basename $0)
 ls -l wheelhouse

setup.py

@@ -110,6 +110,7 @@ def _c(m):
                 'language_level': '3str',
                 'always_allow_keywords': False,
                 'nonecheck': False,
+                'freethreading_compatible': True,
             },
         )
     except ValueError:
@@ -124,7 +125,7 @@ def _c(m):
 
 setup(
     name='perfmetrics',
-    version='4.2.1.dev0',
+    version='4.3.0.dev0',
     author='Shane Hathaway',
     author_email='shane@hathawaymix.org',
     maintainer='Jason Madden',
@@ -144,6 +145,7 @@ def _c(m):
         "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: 3.13",
         "Programming Language :: Python :: 3.14",
+        "Programming Language :: Python :: 3.15",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "License :: Repoze Public License",
@@ -163,7 +165,6 @@ def _c(m):
     zip_safe=True,
     tests_require=tests_require,
     install_requires=[
-        'setuptools',
     ],
     extras_require={
         'test': tests_require,

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py37,py38,py39,py310,py311,py312,py313,pypy3,py37,coverage
+envlist = py310,py311,py312,py313,py314,py315,py315t,py314t,pypy3,coverage
 
 [testenv]
 extras =
@@ -20,6 +20,14 @@ deps =
     coverage
 
 
+[testenv:py314t]
+setenv:
+    PYTHON_GIL=0
+
+[testenv:py315t]
+setenv:
+    PYTHON_GIL=0
+
 [testenv:docs]
 commands =
     sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html