From aa6209243971eae7954077723761d44a17a26c00 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Wed, 28 Feb 2024 08:27:27 +0100 Subject: [PATCH] Add preliminary support for Python 3.13 --- .github/workflows/tests.yml | 42 +++++++++++++++++++++++++++++++++++++ .manylinux-install.sh | 11 ++++++++-- .meta.toml | 2 +- appveyor.yml | 3 +++ tox.ini | 2 ++ 5 files changed, 57 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8629b93..cc8be31 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -102,6 +102,7 @@ jobs: - "3.10" - "3.11" - "3.12" + - "3.13.0-alpha - 3.13.0" os: [ubuntu-20.04, macos-11] steps: @@ -130,7 +131,17 @@ jobs: restore-keys: | ${{ runner.os }}-pip- + - name: Install Build Dependencies (3.13.0-alpha - 3.13.0) + if: matrix.python-version == '3.13.0-alpha - 3.13.0' + run: | + pip install -U pip + pip install -U setuptools wheel twine + # cffi will probably have no public release until a Python 3.13 beta + # or even RC release, see https://github.com/python-cffi/cffi/issues/23 + echo "cffi @ git+https://github.com/python-cffi/cffi.git@954cab4f889fb019a7f90df153ee1be501495f58" > cffi_constraint.txt + PIP_CONSTRAINT=$PWD/cffi_constraint.txt pip install cffi - name: Install Build Dependencies + if: matrix.python-version != '3.13.0-alpha - 3.13.0' run: | pip install -U pip pip install -U setuptools wheel twine cffi @@ -174,7 +185,18 @@ jobs: python setup.py build_ext -i python setup.py bdist_wheel + - name: Install AccessControl and dependencies (3.13.0-alpha - 3.13.0) + if: matrix.python-version == '3.13.0-alpha - 3.13.0' + run: | + # Install to collect dependencies into the (pip) cache. + # cffi will probably have no public release until a Python 3.13 beta + # or even RC release, see https://github.com/python-cffi/cffi/issues/23 + echo "cffi @ git+https://github.com/python-cffi/cffi.git@954cab4f889fb019a7f90df153ee1be501495f58" > cffi_constraint.txt + # Use "--pre" here because dependencies with support for this future + # Python release may only be available as pre-releases + PIP_CONSTRAINT=$PWD/cffi_constraint.txt pip install --pre .[test] - name: Install AccessControl and dependencies + if: matrix.python-version != '3.13.0-alpha - 3.13.0' run: | # Install to collect dependencies into the (pip) cache. pip install .[test] @@ -218,6 +240,7 @@ jobs: && startsWith(github.ref, 'refs/tags') && startsWith(runner.os, 'Mac') && !startsWith(matrix.python-version, 'pypy') + && !startsWith(matrix.python-version, '3.13.0-alpha - 3.13.0') env: TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }} run: | @@ -236,6 +259,7 @@ jobs: - "3.10" - "3.11" - "3.12" + - "3.13.0-alpha - 3.13.0" os: [ubuntu-20.04, macos-11] steps: @@ -269,7 +293,25 @@ jobs: with: name: AccessControl-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/ + - name: Install AccessControl 3.13.0-alpha - 3.13.0 + if: ${{ startsWith(matrix.python-version, '3.13.0-alpha - 3.13.0') }} + run: | + pip install -U wheel setuptools + # cffi will probably have no public release until a beta or even RC + # version of Python 3.13, see https://github.com/python-cffi/cffi/issues/23 + echo 'cffi @ git+https://github.com/python-cffi/cffi.git@954cab4f889fb019a7f90df153ee1be501495f58 ; platform_python_implementation == "CPython"' > cffi_constraint.txt + # coverage has a wheel on PyPI for a future python version which is + # not ABI compatible with the current one, so build it from sdist: + pip install -U --no-binary :all: coverage + # Unzip into src/ so that testrunner can find the .so files + # when we ask it to load tests from that directory. This + # might also save some build time? + unzip -n dist/AccessControl-*whl -d src + # Use "--pre" here because dependencies with support for this future + # Python release may only be available as pre-releases + PIP_CONSTRAINT=$PWD/cffi_constraint.txt pip install --pre -U -e .[test] - name: Install AccessControl + if: ${{ !startsWith(matrix.python-version, '3.13.0-alpha - 3.13.0') }} run: | pip install -U wheel setuptools pip install -U coverage diff --git a/.manylinux-install.sh b/.manylinux-install.sh index c2fbd1f..6eadd25 100755 --- a/.manylinux-install.sh +++ b/.manylinux-install.sh @@ -28,6 +28,7 @@ yum -y install libffi-devel tox_env_map() { case $1 in + *"cp313"*) echo 'py313';; *"cp37"*) echo 'py37';; *"cp38"*) echo 'py38';; *"cp39"*) echo 'py39';; @@ -41,14 +42,20 @@ tox_env_map() { # Compile wheels for PYBIN in /opt/python/*/bin; do if \ + [[ "${PYBIN}" == *"cp313"* ]] || \ [[ "${PYBIN}" == *"cp311"* ]] || \ [[ "${PYBIN}" == *"cp312"* ]] || \ [[ "${PYBIN}" == *"cp37"* ]] || \ [[ "${PYBIN}" == *"cp38"* ]] || \ [[ "${PYBIN}" == *"cp39"* ]] || \ [[ "${PYBIN}" == *"cp310"* ]] ; then - "${PYBIN}/pip" install -e /io/ - "${PYBIN}/pip" wheel /io/ -w wheelhouse/ + if [[ "${PYBIN}" == *"cp313"* ]] ; then + "${PYBIN}/pip" install --pre -e /io/ + "${PYBIN}/pip" wheel /io/ --pre -w wheelhouse/ + else + "${PYBIN}/pip" install -e /io/ + "${PYBIN}/pip" wheel /io/ -w wheelhouse/ + fi if [ `uname -m` == 'aarch64' ]; then cd /io/ ${PYBIN}/pip install tox diff --git a/.meta.toml b/.meta.toml index 988b4d8..4b96921 100644 --- a/.meta.toml +++ b/.meta.toml @@ -8,7 +8,7 @@ commit-id = "1351c95d" with-appveyor = true with-windows = false with-pypy = false -with-future-python = false +with-future-python = true with-sphinx-doctests = false with-macos = false diff --git a/appveyor.yml b/appveyor.yml index c52887a..b866ab6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,6 +16,9 @@ environment: - python: 310-x64 - python: 311-x64 - python: 312-x64 + # `multibuild` cannot install non-final versions as they are not on + # ftp.python.org, so we skip Python 3.13 until its final release: + # - python: 313-x64 install: - "SET PYTHONVERSION=%PYTHON%" diff --git a/tox.ini b/tox.ini index b6e7d09..05ba95c 100644 --- a/tox.ini +++ b/tox.ini @@ -10,10 +10,12 @@ envlist = py310,py310-pure py311,py311-pure py312,py312-pure + py313,py313-pure coverage [testenv] usedevelop = true +pip_pre = py313: true deps = setenv = pure: PURE_PYTHON=1