Add preliminary support for Python 3.12a5. (#65)

zopefoundation · Mar 24, 2023 · 53fed55 · 53fed55
1 parent f0c7d3e
commit 53fed55
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 10 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -96,16 +96,17 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - "pypy-3.7"
+          - "pypy-3.9"
           - "3.7"
           - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12.0-alpha.5"
         os: [ubuntu-20.04, macos-11]
         exclude:
           - os: macos-11
-            python-version: "pypy-3.7"
+            python-version: "pypy-3.9"
 
     steps:
       - name: checkout
@@ -177,7 +178,15 @@ jobs:
           python setup.py build_ext -i
           python setup.py bdist_wheel
 
+      - name: Install Acquisition and dependencies (3.12.0-alpha.5)
+        if: matrix.python-version == '3.12.0-alpha.5'
+        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 Acquisition and dependencies
+        if: matrix.python-version != '3.12.0-alpha.5'
         run: |
           # Install to collect dependencies into the (pip) cache.
           pip install .[test]
@@ -221,6 +230,7 @@ jobs:
           && startsWith(github.ref, 'refs/tags')
           && startsWith(runner.os, 'Mac')
           && !startsWith(matrix.python-version, 'pypy')
+          && !startsWith(matrix.python-version, '3.12.0-alpha.5')
         env:
           TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
         run: |
@@ -233,16 +243,17 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - "pypy-3.7"
+          - "pypy-3.9"
           - "3.7"
           - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12.0-alpha.5"
         os: [ubuntu-20.04, macos-11]
         exclude:
           - os: macos-11
-            python-version: "pypy-3.7"
+            python-version: "pypy-3.9"
 
     steps:
       - name: checkout
@@ -275,7 +286,22 @@ jobs:
         with:
           name: Acquisition-${{ runner.os }}-${{ matrix.python-version }}.whl
           path: dist/
+      - name: Install Acquisition 3.12.0-alpha.5
+        if: ${{ startsWith(matrix.python-version, '3.12.0-alpha.5') }}
+        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/Acquisition-*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 Acquisition
+        if: ${{ !startsWith(matrix.python-version, '3.12.0-alpha.5') }}
         run: |
           pip install -U wheel setuptools
           pip install -U coverage

diff --git a/.manylinux-install.sh b/.manylinux-install.sh
@@ -28,6 +28,7 @@ yum -y install libffi-devel
 
 tox_env_map() {
     case $1 in
+        *"cp312"*) echo 'py312';;
         *"cp37"*) echo 'py37';;
         *"cp38"*) echo 'py38';;
         *"cp39"*) echo 'py39';;
@@ -40,13 +41,19 @@ tox_env_map() {
 # Compile wheels
 for PYBIN in /opt/python/*/bin; do
     if \
+       [[ "${PYBIN}" == *"cp312"* ]] || \
        [[ "${PYBIN}" == *"cp311"* ]] || \
        [[ "${PYBIN}" == *"cp37"* ]] || \
        [[ "${PYBIN}" == *"cp38"* ]] || \
        [[ "${PYBIN}" == *"cp39"* ]] || \
        [[ "${PYBIN}" == *"cp310"* ]] ; then
-        "${PYBIN}/pip" install -e /io/
-        "${PYBIN}/pip" wheel /io/ -w wheelhouse/
+        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
         if [ `uname -m` == 'aarch64' ]; then
           cd /io/
           ${PYBIN}/pip install tox

diff --git a/.meta.toml b/.meta.toml
@@ -2,14 +2,14 @@
 # https://github.com/zopefoundation/meta/tree/master/config/c-code
 [meta]
 template = "c-code"
-commit-id = "dfad17d8"
+commit-id = "1514f236"
 
 [python]
 with-windows = true
 with-pypy = true
 with-sphinx-doctests = false
 with-appveyor = true
-with-future-python = false
+with-future-python = true
 with-macos = false
 
 [tox]

diff --git a/appveyor.yml b/appveyor.yml
@@ -14,6 +14,9 @@ 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
 
 install:
   - "SET PYTHONVERSION=%PYTHON%"

diff --git a/setup.cfg b/setup.cfg
@@ -18,7 +18,7 @@ ignore =
 force_single_line = True
 combine_as_imports = True
 sections = FUTURE,STDLIB,THIRDPARTY,ZOPE,FIRSTPARTY,LOCALFOLDER
-known_third_party = six, docutils, pkg_resources
+known_third_party = six, docutils, pkg_resources, pytz
 known_zope =
 known_first_party =
 default_section = ZOPE

diff --git a/tox.ini b/tox.ini
@@ -1,19 +1,21 @@
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/c-code
 [tox]
-minversion = 3.18
+minversion = 4.0
 envlist =
     lint
     py37,py37-pure
     py38,py38-pure
     py39,py39-pure
     py310,py310-pure
     py311,py311-pure
+    py312,py312-pure
     pypy3
     coverage
 
 [testenv]
 usedevelop = true
+pip_pre = py312: true
 deps =
 setenv =
     pure: PURE_PYTHON=1