From b2b8283e982dcd4b1bac243f137c8a1d5a6399e3 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Tue, 23 Jan 2024 17:06:20 +0100 Subject: [PATCH] Preliminary support for Python 3.13a3 --- .github/workflows/tests.yml | 64 +++++++++++++++++++++++++------------ .manylinux-install.sh | 11 +++++-- .meta.toml | 2 +- CHANGES.rst | 1 + appveyor.yml | 3 ++ tox.ini | 35 +++++++++++++++++--- 6 files changed, 87 insertions(+), 29 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 93235287..f520ec2b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -96,23 +96,24 @@ jobs: fail-fast: false matrix: python-version: - - "pypy-3.9" + - "pypy-3.10" - "3.7" - "3.8" - "3.9" - "3.10" - "3.11" - "3.12" + - "3.13.0-alpha - 3.13.0" os: [ubuntu-20.04, macos-11] exclude: - os: macos-11 - python-version: "pypy-3.9" + python-version: "pypy-3.10" steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} ### @@ -134,7 +135,18 @@ 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 + pip install -U "cffi @ https://github.com/python-cffi/cffi/archive/refs/heads/main.zip" + # twine has no release for 3.13, yet, see https://github.com/pypa/twine/issues/1030 + pip install -U "git+https://github.com/pypa/twine.git#egg=twine" - 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 @@ -178,7 +190,15 @@ jobs: python setup.py build_ext -i python setup.py bdist_wheel + - name: Install zope.interface 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. + # Use "--pre" here because dependencies with support for this future + # Python release may only be available as pre-releases + pip install --pre .[test] - name: Install zope.interface 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] @@ -190,7 +210,7 @@ jobs: - name: Upload zope.interface wheel (macOS x86_64) if: > startsWith(runner.os, 'Mac') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: zope.interface-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/*x86_64.whl @@ -199,7 +219,7 @@ jobs: startsWith(runner.os, 'Mac') && !(startsWith(matrix.python-version, 'pypy') || matrix.python-version == '3.7') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: # The arm64 wheel is uploaded with a different name just so it can be # manually downloaded when desired. The wheel itself *cannot* be tested @@ -209,7 +229,7 @@ jobs: - name: Upload zope.interface wheel (all other platforms) if: > !startsWith(runner.os, 'Mac') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: zope.interface-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/*whl @@ -222,6 +242,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: | @@ -234,23 +255,24 @@ jobs: fail-fast: false matrix: python-version: - - "pypy-3.9" + - "pypy-3.10" - "3.7" - "3.8" - "3.9" - "3.10" - "3.11" - "3.12" + - "3.13.0-alpha - 3.13.0" os: [ubuntu-20.04, macos-11] exclude: - os: macos-11 - python-version: "pypy-3.9" + python-version: "pypy-3.10" steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} ### @@ -273,7 +295,7 @@ jobs: ${{ runner.os }}-pip- - name: Download zope.interface wheel - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: zope.interface-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/ @@ -324,9 +346,9 @@ jobs: steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} ### @@ -349,7 +371,7 @@ jobs: ${{ runner.os }}-pip- - name: Download zope.interface wheel - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: zope.interface-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/ @@ -375,9 +397,9 @@ jobs: steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} ### @@ -400,7 +422,7 @@ jobs: ${{ runner.os }}-pip- - name: Download zope.interface wheel - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: zope.interface-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/ @@ -428,9 +450,9 @@ jobs: steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} ### @@ -480,7 +502,7 @@ jobs: bash .manylinux.sh - name: Upload zope.interface wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: wheelhouse/*whl name: manylinux_${{ matrix.image }}_wheels.zip diff --git a/.manylinux-install.sh b/.manylinux-install.sh index deb3e9db..b12ac83e 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 6d755e34..b63d882e 100644 --- a/.meta.toml +++ b/.meta.toml @@ -2,7 +2,7 @@ # https://github.com/zopefoundation/meta/tree/master/config/c-code [meta] template = "c-code" -commit-id = "a361e1fd" +commit-id = "e45966cd" [python] with-appveyor = true diff --git a/CHANGES.rst b/CHANGES.rst index 8086dc03..90e1309a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,7 @@ 6.2 (unreleased) ================ +- Add preliminary support for Python 3.13 as of 3.13a3. 6.1 (2023-10-05) ================ diff --git a/appveyor.yml b/appveyor.yml index 993b03c7..d4ac3865 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 c144f1dd..116118b3 100644 --- a/tox.ini +++ b/tox.ini @@ -10,14 +10,17 @@ envlist = py310,py310-pure py311,py311-pure py312,py312-pure + py313,py313-pure pypy3 docs coverage [testenv] usedevelop = true +pip_pre = py313: true deps = py37: urllib3 < 2 + Sphinx setenv = pure: PURE_PYTHON=1 !pure-!pypy3: PURE_PYTHON=0 @@ -47,17 +50,39 @@ commands = coverage report -i -m --fail-under=99 depends = py37,py37-pure,py38,py38-pure,py39,py39-pure,py310,py310-pure,py311,py311-pure,pypy,pypy3,docs parallel_show_output = true - -[testenv:lint] +[testenv:release-check] +description = ensure that the distribution is ready to release basepython = python3 skip_install = true +deps = + twine + build + check-manifest + check-python-versions >= 0.20.0 + wheel +commands_pre = commands = check-manifest check-python-versions + python -m build --sdist --no-isolation + twine check dist/* + +[testenv:lint] +basepython = python3 +skip_install = true deps = - check-manifest - check-python-versions >= 0.19.1 - wheel + isort +commands = + isort --check-only --diff {toxinidir}/src {toxinidir}/setup.py + +[testenv:isort-apply] +basepython = python3 +skip_install = true +commands_pre = +deps = + isort +commands = + isort {toxinidir}/src {toxinidir}/setup.py [] [testenv:docs] basepython = python3