diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 280c386..b0cbc13 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -102,7 +102,7 @@ jobs: - "3.9" - "3.10" - "3.11" - - "3.12.0-rc.3" + - "3.12" os: [ubuntu-20.04, macos-11] exclude: - os: macos-11 @@ -179,15 +179,7 @@ jobs: python setup.py build_ext -i python setup.py bdist_wheel - - name: Install BTrees and dependencies (3.12.0-rc.3) - if: matrix.python-version == '3.12.0-rc.3' - 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 BTrees and dependencies - if: matrix.python-version != '3.12.0-rc.3' run: | # Install to collect dependencies into the (pip) cache. pip install .[test] @@ -231,7 +223,6 @@ jobs: && startsWith(github.ref, 'refs/tags') && startsWith(runner.os, 'Mac') && !startsWith(matrix.python-version, 'pypy') - && !startsWith(matrix.python-version, '3.12.0-rc.3') env: TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }} run: | @@ -250,7 +241,7 @@ jobs: - "3.9" - "3.10" - "3.11" - - "3.12.0-rc.3" + - "3.12" os: [ubuntu-20.04, macos-11] exclude: - os: macos-11 @@ -287,22 +278,7 @@ jobs: with: name: BTrees-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/ - - name: Install BTrees 3.12.0-rc.3 - if: ${{ startsWith(matrix.python-version, '3.12.0-rc.3') }} - 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/BTrees-*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 BTrees - if: ${{ !startsWith(matrix.python-version, '3.12.0-rc.3') }} run: | pip install -U wheel setuptools pip install -U coverage diff --git a/.manylinux-install.sh b/.manylinux-install.sh index 99655a6..918a08f 100755 --- a/.manylinux-install.sh +++ b/.manylinux-install.sh @@ -40,12 +40,12 @@ yum -y install libffi-devel tox_env_map() { case $1 in - *"cp312"*) echo 'py312';; *"cp37"*) echo 'py37';; *"cp38"*) echo 'py38';; *"cp39"*) echo 'py39';; *"cp310"*) echo 'py310';; *"cp311"*) echo 'py311';; + *"cp312"*) echo 'py312';; *) echo 'py';; esac } @@ -53,19 +53,14 @@ tox_env_map() { # Compile wheels for PYBIN in /opt/python/*/bin; do if \ - [[ "${PYBIN}" == *"cp312"* ]] || \ [[ "${PYBIN}" == *"cp311"* ]] || \ + [[ "${PYBIN}" == *"cp312"* ]] || \ [[ "${PYBIN}" == *"cp37"* ]] || \ [[ "${PYBIN}" == *"cp38"* ]] || \ [[ "${PYBIN}" == *"cp39"* ]] || \ [[ "${PYBIN}" == *"cp310"* ]] ; then - if [[ "${PYBIN}" == *"cp312"* ]] ; 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 # Running the test suite takes forever in # emulation; an early run (using tox, which is also slow) diff --git a/.meta.toml b/.meta.toml index 9c3fdf5..2ebc493 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 = "b21fbbf2" +commit-id = "a361e1fd" [python] with-appveyor = true diff --git a/CHANGES.rst b/CHANGES.rst index 17a5c28..762728e 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,12 +2,12 @@ BTrees Changelog ================== -5.1 (unreleased) +5.1 (2023-10-05) ================ - Drop using ``setup_requires`` due to constant problems on GHA. -- Add preliminary support for Python 3.12rc3. +- Add support for Python 3.12. 5.0 (2023-02-10) diff --git a/appveyor.yml b/appveyor.yml index b8eb4f9..fa2c5ce 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,9 +14,7 @@ environment: - python: 39-x64 - python: 310-x64 - python: 311-x64 - # `multibuild` cannot install non-final versions as they are not on - # ftp.python.org, so we skip Python 3.11 until its final release: - # - python: 312-x64 + - python: 312-x64 install: - "SET PYTHONVERSION=%PYTHON%" diff --git a/setup.py b/setup.py index 750a037..27b3100 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ from setuptools import setup from setuptools.command.build_ext import build_ext -version = '5.1.dev0' +version = '5.1' def _read(fname): here = os.path.abspath(os.path.dirname(__file__)) @@ -169,6 +169,7 @@ def BTreeExtension(family): "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Framework :: ZODB", diff --git a/tox.ini b/tox.ini index c82fa71..7f08a86 100644 --- a/tox.ini +++ b/tox.ini @@ -18,9 +18,7 @@ envlist = [testenv] usedevelop = true -pip_pre = py312: true deps = - Sphinx setenv = pure: PURE_PYTHON=1 !pure-!pypy3: PURE_PYTHON=0