diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c5aa12b..4206922 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -94,7 +94,6 @@ jobs: - "3.12" - "3.13" - "3.14" - - "3.15" os: [ubuntu-latest, macos-latest, windows-latest] exclude: - os: macos-latest @@ -146,13 +145,7 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - - name: Install Build Dependencies (3.15) - if: matrix.python-version == '3.15' - run: | - pip install -U pip - pip install -U "setuptools >= 78.1.1,< 81" wheel twine - name: Install Build Dependencies - if: matrix.python-version != '3.15' run: | pip install -U pip pip install -U "setuptools >= 78.1.1,< 81" wheel twine @@ -193,15 +186,7 @@ jobs: python setup.py build_ext -i python setup.py bdist_wheel - - name: Install persistent and dependencies (3.15) - if: matrix.python-version == '3.15' - 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 persistent and dependencies - if: matrix.python-version != '3.15' run: | # Install to collect dependencies into the (pip) cache. pip install -U pip "setuptools >= 78.1.1,< 81" @@ -250,7 +235,6 @@ jobs: - "3.12" - "3.13" - "3.14" - - "3.15" os: [ubuntu-latest, macos-latest, windows-latest] exclude: - os: macos-latest @@ -307,23 +291,7 @@ jobs: with: name: persistent-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/ - - name: Install persistent ${{ matrix.python-version }} - if: matrix.python-version == '3.15' - run: | - pip install -U wheel "setuptools >= 78.1.1,< 81" - # coverage might have 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[toml] - # 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? - ls -l dist/ - unzip -n dist/*.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 -e .[test] - name: Install persistent - if: matrix.python-version != '3.15' run: | pip install -U wheel "setuptools >= 78.1.1,< 81" pip install -U coverage[toml] @@ -596,9 +564,6 @@ jobs: - name: Restore pip cache permissions run: sudo chown -R $(whoami) ${{ steps.pip-cache-default.outputs.dir }} - - name: Prevent publishing wheels for unreleased Python versions - run: VER=$(echo '3.15' | tr -d .) && ls -al wheelhouse && sudo rm -f wheelhouse/*-cp${VER}*.whl && ls -al wheelhouse - publish: name: Publish to PyPI runs-on: ubuntu-latest diff --git a/.manylinux-install.sh b/.manylinux-install.sh index a2260ca..94109ba 100755 --- a/.manylinux-install.sh +++ b/.manylinux-install.sh @@ -33,7 +33,6 @@ tox_env_map() { *"cp312"*) echo 'py312';; *"cp313"*) echo 'py313';; *"cp314"*) echo 'py314';; - *"cp315"*) echo 'py315';; *) echo 'py';; esac } @@ -45,15 +44,9 @@ for PYBIN in /opt/python/*/bin; do [[ "${PYBIN}" == *"cp311/"* ]] || \ [[ "${PYBIN}" == *"cp312/"* ]] || \ [[ "${PYBIN}" == *"cp313/"* ]] || \ - [[ "${PYBIN}" == *"cp314/"* ]] || \ - [[ "${PYBIN}" == *"cp315/"* ]] ; then - if [[ "${PYBIN}" == *"cp315/"* ]] ; 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}" == *"cp314/"* ]] ; then + "${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 c26cf1c..a3bffd8 100644 --- a/.meta.toml +++ b/.meta.toml @@ -2,12 +2,12 @@ # https://github.com/zopefoundation/meta/tree/master/src/zope/meta/c-code [meta] template = "c-code" -commit-id = "f62d8bab" +commit-id = "76e81852" [python] with-windows = true with-pypy = true -with-future-python = true +with-future-python = false with-docs = true with-sphinx-doctests = true with-macos = false diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e120a3d..c1e0027 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,7 +12,7 @@ repos: - id: autopep8 args: [--in-place, --aggressive, --aggressive] - repo: https://github.com/asottile/pyupgrade - rev: v3.21.0 + rev: v3.21.2 hooks: - id: pyupgrade args: [--py310-plus] diff --git a/tox.ini b/tox.ini index 0ec145a..f22a9eb 100644 --- a/tox.ini +++ b/tox.ini @@ -10,16 +10,13 @@ envlist = py312,py312-pure py313,py313-pure py314,py314-pure - py315,py315-pure pypy3 docs coverage [testenv] -pip_pre = py315: true deps = setuptools >= 78.1.1,< 81 - Sphinx setenv = pure: PURE_PYTHON=1 !pure-!pypy3: PURE_PYTHON=0