From c0d09375d336ace2a76c8d3664b0ffbc0368bb69 Mon Sep 17 00:00:00 2001 From: Jens Vagelpohl Date: Thu, 5 Oct 2023 13:02:58 +0200 Subject: [PATCH] - finalize Python 3.12 support --- .github/workflows/tests.yml | 28 ++-------------------------- .manylinux-install.sh | 13 ++++--------- .meta.toml | 2 +- CHANGES.rst | 2 +- appveyor.yml | 4 +--- docs/conf.py | 2 +- docs/requirements.txt | 2 ++ setup.py | 2 ++ tox.ini | 2 -- 9 files changed, 14 insertions(+), 43 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4c289bf..7dcaa52 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 zope.security 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 zope.security 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: zope.security-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/ - - name: Install zope.security 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/zope.security-*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 zope.security - 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 94d0419..ba47e27 100755 --- a/.manylinux-install.sh +++ b/.manylinux-install.sh @@ -28,12 +28,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 } @@ -41,19 +41,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 cd /io/ ${PYBIN}/pip install tox diff --git a/.meta.toml b/.meta.toml index 5076a75..c2259a5 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 = "47bae5a7" +commit-id = "a361e1fd" [python] with-appveyor = true diff --git a/CHANGES.rst b/CHANGES.rst index 3fc5f45..7b45b40 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -11,7 +11,7 @@ - Drop using ``setup_requires`` due to constant problems on GHA. -- Add preliminary support for Python 3.12 as of 3.12rc3. +- Add support for Python 3.12. 6.1 (2023-01-18) diff --git a/appveyor.yml b/appveyor.yml index 3d3d47e..753d222 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/docs/conf.py b/docs/conf.py index f6a2968..3ceafa5 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -106,7 +106,7 @@ # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -html_theme = 'default' +html_theme = 'sphinx_rtd_theme' # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the diff --git a/docs/requirements.txt b/docs/requirements.txt index 362596f..e121ba7 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,5 @@ Sphinx repoze.sphinx.autointerface +sphinx_rtd_theme>1 +docutils<0.19 zope.security diff --git a/setup.py b/setup.py index aa0df8a..269bc18 100644 --- a/setup.py +++ b/setup.py @@ -126,6 +126,7 @@ def read(*rnames): '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', 'Natural Language :: English', @@ -173,6 +174,7 @@ def read(*rnames): 'docs': [ 'Sphinx', 'repoze.sphinx.autointerface', + 'sphinx_rtd_theme', 'zope.configuration', 'zope.testing', ], diff --git a/tox.ini b/tox.ini index 7682f86..45dcae5 100644 --- a/tox.ini +++ b/tox.ini @@ -17,10 +17,8 @@ envlist = [testenv] usedevelop = true -pip_pre = py312: true deps = py37: urllib3 < 2 - Sphinx setenv = pure: PURE_PYTHON=1 !pure-!pypy3: PURE_PYTHON=0