From 5f7ed9cf3b60a1fcfb4e72e5e7183dbdc89bd171 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Fri, 24 Nov 2023 08:32:29 +0100 Subject: [PATCH 1/3] Add preliminary support for Python 3.13a2 --- .github/workflows/tests.yml | 26 ++++++++++++++++++++++++++ .manylinux-install.sh | 11 +++++++++-- .meta.toml | 2 +- appveyor.yml | 3 +++ tox.ini | 28 ++++++++++++++++++++-------- 5 files changed, 59 insertions(+), 11 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0453ac4..5537de8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -103,6 +103,7 @@ jobs: - "3.10" - "3.11" - "3.12" + - "3.13.0-alpha - 3.13.0" os: [ubuntu-20.04, macos-11] exclude: - os: macos-11 @@ -178,7 +179,15 @@ jobs: python setup.py build_ext -i python setup.py bdist_wheel + - name: Install ExtensionClass 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 ExtensionClass 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] @@ -222,6 +231,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: | @@ -241,6 +251,7 @@ jobs: - "3.10" - "3.11" - "3.12" + - "3.13.0-alpha - 3.13.0" os: [ubuntu-20.04, macos-11] exclude: - os: macos-11 @@ -277,7 +288,22 @@ jobs: with: name: ExtensionClass-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/ + - name: Install ExtensionClass 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 + # 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/ExtensionClass-*whl -d src + # Use "--pre" here because dependencies with support for this future + # Python release may only be available as pre-releases + pip install --pre -U -e .[test] - name: Install ExtensionClass + 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 d74f6e0..fd62ab3 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 1e6ae6e..bfd5af9 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 = "cb0568c7" [python] with-appveyor = true diff --git a/appveyor.yml b/appveyor.yml index 83717a0..d68cc80 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 0a8282c..0346d7a 100644 --- a/tox.ini +++ b/tox.ini @@ -10,11 +10,13 @@ envlist = py310,py310-pure py311,py311-pure py312,py312-pure + py313,py313-pure pypy3 coverage [testenv] usedevelop = true +pip_pre = py313: true deps = setenv = pure: PURE_PYTHON=1 @@ -39,21 +41,31 @@ commands = coverage run -m zope.testrunner --test-path=src {posargs:-vc} coverage html -i coverage report -i -m --fail-under=100 - -[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 = - isort --check-only --diff {toxinidir}/src {toxinidir}/setup.py - flake8 src setup.py 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 - flake8 isort + flake8 +commands = + isort --check-only --diff {toxinidir}/src {toxinidir}/setup.py + flake8 src setup.py [testenv:isort-apply] basepython = python3 From 6e8318ae961512a151e4afe8a62d2dcb02443f5e Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Fri, 24 Nov 2023 08:33:25 +0100 Subject: [PATCH 2/3] Add change log. --- CHANGES.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index a86c872..32b0e75 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,8 @@ 5.2 (unreleased) ================ +- Add preliminary support for Python 3.13a2. + 5.1 (2023-10-05) ================ From 7616aa42148eaca0f8296518f1b47c19f4457f4f Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Tue, 23 Jan 2024 08:29:40 +0100 Subject: [PATCH 3/3] Add preliminary support for Python 3.13a3 (#70) --- .github/workflows/tests.yml | 50 ++++++++++++++++++++++++------------- .meta.toml | 2 +- CHANGES.rst | 2 +- tox.ini | 1 + 4 files changed, 35 insertions(+), 20 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5537de8..229153b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -96,7 +96,7 @@ jobs: fail-fast: false matrix: python-version: - - "pypy-3.9" + - "pypy-3.10" - "3.7" - "3.8" - "3.9" @@ -107,13 +107,13 @@ jobs: 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 }} ### @@ -135,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 @@ -199,7 +210,7 @@ jobs: - name: Upload ExtensionClass wheel (macOS x86_64) if: > startsWith(runner.os, 'Mac') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ExtensionClass-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/*x86_64.whl @@ -208,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 @@ -218,7 +229,7 @@ jobs: - name: Upload ExtensionClass wheel (all other platforms) if: > !startsWith(runner.os, 'Mac') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ExtensionClass-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/*whl @@ -244,7 +255,7 @@ jobs: fail-fast: false matrix: python-version: - - "pypy-3.9" + - "pypy-3.10" - "3.7" - "3.8" - "3.9" @@ -255,13 +266,13 @@ jobs: 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 }} ### @@ -284,7 +295,7 @@ jobs: ${{ runner.os }}-pip- - name: Download ExtensionClass wheel - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ExtensionClass-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/ @@ -292,6 +303,9 @@ jobs: 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 + pip install -U 'cffi @ https://github.com/python-cffi/cffi/archive/refs/heads/main.zip ; platform_python_implementation == "CPython"' # 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 @@ -351,9 +365,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 }} ### @@ -376,7 +390,7 @@ jobs: ${{ runner.os }}-pip- - name: Download ExtensionClass wheel - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ExtensionClass-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/ @@ -404,9 +418,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 }} ### @@ -456,7 +470,7 @@ jobs: bash .manylinux.sh - name: Upload ExtensionClass wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: wheelhouse/*whl name: manylinux_${{ matrix.image }}_wheels.zip diff --git a/.meta.toml b/.meta.toml index bfd5af9..4c46ea7 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 = "cb0568c7" +commit-id = "43bd5905" [python] with-appveyor = true diff --git a/CHANGES.rst b/CHANGES.rst index 32b0e75..1ce71f1 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,7 +5,7 @@ 5.2 (unreleased) ================ -- Add preliminary support for Python 3.13a2. +- Add preliminary support for Python 3.13a3. 5.1 (2023-10-05) diff --git a/tox.ini b/tox.ini index 0346d7a..b041329 100644 --- a/tox.ini +++ b/tox.ini @@ -51,6 +51,7 @@ deps = check-manifest check-python-versions >= 0.20.0 wheel +commands_pre = commands = check-manifest check-python-versions