Merge pull request #277 from zopefoundation/config-with-c-code-templa…

…te-a361e1fd

Config with c code template a361e1fd

.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
@@ -178,15 +178,7 @@ jobs:
           python setup.py build_ext -i
           python setup.py bdist_wheel
 
-      - name: Install zope.interface 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.interface and dependencies
-        if: matrix.python-version != '3.12.0-rc.3'
         run: |
           # Install to collect dependencies into the (pip) cache.
           pip install .[test]
@@ -230,7 +222,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: |
@@ -249,7 +240,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

.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

.meta.toml

@@ -2,7 +2,7 @@
 # https://github.com/zopefoundation/meta/tree/master/config/c-code
 [meta]
 template = "c-code"
-commit-id = "8f22a5de"
+commit-id = "a361e1fd"
 
 [python]
 with-appveyor = true

CHANGES.rst

@@ -5,7 +5,9 @@
 6.1 (unreleased)
 ================
 
-- Add preliminary support for Python 3.12 as of 3.12rc3.
+- Build Linux binary wheels for Python 3.12.
+
+- Add support for Python 3.12.
 
 - Fix building of the docs for non-final versions.
 

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%"

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

docs/requirements.txt

@@ -0,0 +1,3 @@
+Sphinx
+sphinx_rtd_theme>1
+docutils<0.19

setup.py

@@ -119,6 +119,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",
           "Framework :: Zope :: 3",

tox.ini

@@ -16,10 +16,8 @@ envlist =
 
 [testenv]
 usedevelop = true
-pip_pre = py312: true
 deps =
     py37: urllib3 < 2
-    Sphinx
 setenv =
     pure: PURE_PYTHON=1
     !pure-!pypy3: PURE_PYTHON=0