- finalize Python 3.12 support

zopefoundation · Oct 5, 2023 · 12b1593 · 12b1593
1 parent 002fa32
commit 12b1593
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 43 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -101,7 +101,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
-          - "3.12.0-alpha.7"
+          - "3.12"
         os: [ubuntu-20.04, macos-11]
 
     steps:
@@ -174,15 +174,7 @@ jobs:
           python setup.py build_ext -i
           python setup.py bdist_wheel
 
-      - name: Install AccessControl and dependencies (3.12.0-alpha.7)
-        if: matrix.python-version == '3.12.0-alpha.7'
-        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 AccessControl and dependencies
-        if: matrix.python-version != '3.12.0-alpha.7'
         run: |
           # Install to collect dependencies into the (pip) cache.
           pip install .[test]
@@ -226,7 +218,6 @@ jobs:
           && startsWith(github.ref, 'refs/tags')
           && startsWith(runner.os, 'Mac')
           && !startsWith(matrix.python-version, 'pypy')
-          && !startsWith(matrix.python-version, '3.12.0-alpha.7')
         env:
           TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
         run: |
@@ -244,7 +235,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
-          - "3.12.0-alpha.7"
+          - "3.12"
         os: [ubuntu-20.04, macos-11]
 
     steps:
@@ -278,22 +269,7 @@ jobs:
         with:
           name: AccessControl-${{ runner.os }}-${{ matrix.python-version }}.whl
           path: dist/
-      - name: Install AccessControl 3.12.0-alpha.7
-        if: ${{ startsWith(matrix.python-version, '3.12.0-alpha.7') }}
-        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/AccessControl-*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 AccessControl
-        if: ${{ !startsWith(matrix.python-version, '3.12.0-alpha.7') }}
         run: |
           pip install -U wheel setuptools
           pip install -U coverage

diff --git a/.manylinux-install.sh b/.manylinux-install.sh
@@ -28,32 +28,27 @@ 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
 }
 
 # 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
@@ -2,7 +2,7 @@
 # https://github.com/zopefoundation/meta/tree/master/config/c-code
 [meta]
 template = "c-code"
-commit-id = "fe63cb4c"
+commit-id = "a361e1fd"
 
 [python]
 with-appveyor = true

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -3,10 +3,10 @@ Changelog
 
 For changes before version 3.0, see ``HISTORY.rst``.
 
-6.3 (unreleased)
+6.3 (2023-10-05)
 ----------------
 
-- Nothing changed yet.
+- Add support for Python 3.12.
 
 
 6.2 (2023-09-04)

diff --git a/appveyor.yml b/appveyor.yml
@@ -15,9 +15,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
@@ -32,7 +32,7 @@
                  join('include', 'Acquisition', 'Acquisition.h')]),
 ]
 
-version = '6.3.dev0'
+version = '6.3'
 
 
 setup(name='AccessControl',
@@ -65,6 +65,7 @@
           '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',
       ],
       ext_modules=ext_modules,

diff --git a/tox.ini b/tox.ini
@@ -14,11 +14,12 @@ envlist =
 
 [testenv]
 usedevelop = true
-pip_pre = py312: true
 deps =
 setenv =
     pure: PURE_PYTHON=1
     !pure-!pypy3: PURE_PYTHON=0
+    py312: VIRTUALENV_PIP=23.1.2
+    py312: PIP_REQUIRE_VIRTUALENV=0
 commands =
     zope-testrunner --test-path=src {posargs:-vc}
 extras =