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

…te-a361e1fd

FInalize Python 3.12 support

.github/workflows/tests.yml

@@ -102,7 +102,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
-          - "3.12.0-beta.4"
+          - "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 persistent and dependencies (3.12.0-beta.4)
-        if: matrix.python-version == '3.12.0-beta.4'
-        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 persistent and dependencies
-        if: matrix.python-version != '3.12.0-beta.4'
         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-beta.4')
         env:
           TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
         run: |
@@ -249,7 +240,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
-          - "3.12.0-beta.4"
+          - "3.12"
         os: [ubuntu-20.04, macos-11]
         exclude:
           - os: macos-11
@@ -286,22 +277,7 @@ jobs:
         with:
           name: persistent-${{ runner.os }}-${{ matrix.python-version }}.whl
           path: dist/
-      - name: Install persistent 3.12.0-beta.4
-        if: ${{ startsWith(matrix.python-version, '3.12.0-beta.4') }}
-        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/persistent-*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 persistent
-        if: ${{ !startsWith(matrix.python-version, '3.12.0-beta.4') }}
         run: |
           pip install -U wheel setuptools
           pip install -U coverage

.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 = "b99ba750"
+commit-id = "a361e1fd"
 
 [python]
 with-appveyor = true
@@ -20,6 +20,9 @@ coverage-command = [
     "python -c 'import os, subprocess; subprocess.check_call(\"coverage run -a -m zope.testrunner --test-path=src\", env=dict(os.environ, PURE_PYTHON=\"1\"), shell=True)'",
     "python -c 'import os, subprocess; subprocess.check_call(\"coverage run -a -m zope.testrunner --test-path=src\", env=dict(os.environ, PURE_PYTHON=\"0\"), shell=True)'",
     ]
+testenv-deps = [
+    "py37: urllib3 < 2",
+    ]
 
 [coverage]
 fail-under = 99.8
@@ -32,6 +35,7 @@ additional-config = [
 
 [manifest]
 additional-rules = [
+    "include *.yaml",
     "include *.sh",
     "recursive-include docs *.bat",
     "recursive-include src *.h",

.readthedocs.yaml

@@ -0,0 +1,25 @@
+# Generated from:
+# https://github.com/zopefoundation/meta/tree/master/config/c-code
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+
+# We recommend specifying your dependencies to enable reproducible builds:
+# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+python:
+  install:
+  - requirements: docs/requirements.txt
+  - method: pip
+    path: .

CHANGES.rst

@@ -2,10 +2,10 @@
  ``persistent`` Changelog
 ==========================
 
-5.1 (unreleased)
+5.1 (2023-10-05)
 ================
 
-- Add preliminary support for Python 3.12b4.
+- Add support for Python 3.12.
 
 
 5.0 (2023-01-09)

MANIFEST.in

@@ -14,6 +14,7 @@ recursive-include docs *.txt
 recursive-include docs Makefile
 
 recursive-include src *.py
+include *.yaml
 include *.sh
 recursive-include docs *.bat
 recursive-include src *.h

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

@@ -100,7 +100,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,4 @@
+Sphinx
+repoze.sphinx.autointerface
+sphinx_rtd_theme>1
+docutils<0.19

setup.py

@@ -19,7 +19,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '5.1.dev0'
+version = '5.1'
 
 here = os.path.abspath(os.path.dirname(__file__))
 
@@ -99,6 +99,7 @@ def _read_file(filename):
           "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",
@@ -132,6 +133,7 @@ def _read_file(filename):
           'docs': [
               'Sphinx',
               'repoze.sphinx.autointerface',
+              'sphinx_rtd_theme',
           ],
       },
       python_requires='>=3.7',

tox.ini

@@ -16,9 +16,8 @@ envlist =
 
 [testenv]
 usedevelop = true
-pip_pre = py312: true
 deps =
-    Sphinx
+    py37: urllib3 < 2
 setenv =
     pure: PURE_PYTHON=1
     !pure-!pypy3: PURE_PYTHON=0
@@ -37,6 +36,7 @@ allowlist_externals =
     mkdir
 deps =
     coverage
+    py37: urllib3 < 2
 setenv =
     PURE_PYTHON=1
 commands =