diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 57d98ee..189b928 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -103,7 +103,6 @@ jobs: - "3.10" - "3.11" - "3.12" - - "3.13.0-alpha - 3.13.0" os: [ubuntu-20.04, macos-11] exclude: - os: macos-11 @@ -135,19 +134,7 @@ 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=cffi_constraint.txt pip install cffi - # 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 @@ -191,18 +178,7 @@ jobs: python setup.py build_ext -i python setup.py bdist_wheel - - name: Install zope.index 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=cffi_constraint.txt pip install --pre .[test] - name: Install zope.index 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] @@ -246,7 +222,6 @@ 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: | @@ -266,7 +241,6 @@ jobs: - "3.10" - "3.11" - "3.12" - - "3.13.0-alpha - 3.13.0" os: [ubuntu-20.04, macos-11] exclude: - os: macos-11 @@ -303,25 +277,7 @@ jobs: with: name: zope.index-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/ - - name: Install zope.index 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/zope.index-*whl -d src - # Use "--pre" here because dependencies with support for this future - # Python release may only be available as pre-releases - PIP_CONSTRAINT=cffi_constraint.txt pip install --pre -U -e .[test] - name: Install zope.index - 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 725b49c..614917e 100755 --- a/.manylinux-install.sh +++ b/.manylinux-install.sh @@ -28,7 +28,6 @@ yum -y install libffi-devel tox_env_map() { case $1 in - *"cp313"*) echo 'py313';; *"cp37"*) echo 'py37';; *"cp38"*) echo 'py38';; *"cp39"*) echo 'py39';; @@ -42,20 +41,14 @@ 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 - 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 + "${PYBIN}/pip" install -e /io/ + "${PYBIN}/pip" wheel /io/ -w wheelhouse/ if [ `uname -m` == 'aarch64' ]; then cd /io/ ${PYBIN}/pip install tox diff --git a/.meta.toml b/.meta.toml index 4a9e2f9..6a5618f 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 = "08a3cc69" +commit-id = "1351c95d" [python] with-appveyor = true @@ -10,7 +10,7 @@ with-windows = false with-pypy = true with-docs = true with-sphinx-doctests = true -with-future-python = true +with-future-python = false with-macos = false [tox] diff --git a/CHANGES.rst b/CHANGES.rst index 1791eb1..e93f4db 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,7 +5,7 @@ 6.2 (unreleased) ================ -- Nothing changed yet. +- Remove premature support for Python 3.13. 6.1 (2024-02-02) diff --git a/appveyor.yml b/appveyor.yml index 5a7afc3..90ddfcb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,9 +16,6 @@ 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/setup.cfg b/setup.cfg index ee24756..4c5567e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,5 @@ # Generated from: # https://github.com/zopefoundation/meta/tree/master/config/c-code -[bdist_wheel] -universal = 0 [zest.releaser] create-wheel = no diff --git a/tox.ini b/tox.ini index e884ae3..66aaf50 100644 --- a/tox.ini +++ b/tox.ini @@ -10,17 +10,14 @@ 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 @@ -60,7 +57,7 @@ deps = commands_pre = commands = check-manifest - check-python-versions + check-python-versions --only setup.py,tox.ini,.github/workflows/tests.yml python -m build --sdist --no-isolation twine check dist/*