- prepare release 5.7

zopefoundation · Nov 17, 2022 · 94094c3 · 94094c3
1 parent 7465632
commit 94094c3
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 43 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -106,7 +106,6 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
-          - "3.12.0-alpha.1"
         os: [ubuntu-20.04, macos-latest]
         exclude:
           - os: macos-latest
@@ -203,13 +202,7 @@ jobs:
           python setup.py build_ext -i
           python setup.py bdist_wheel
 
-      - name: Install ExtensionClass and dependencies (3.12.0-alpha.1)
-        if: matrix.python-version == '3.12.0-alpha.1'
-        run: |
-          # Install to collect dependencies into the (pip) cache.
-          pip install --pre .[test]
       - name: Install ExtensionClass and dependencies
-        if: matrix.python-version != '3.12.0-alpha.1'
         run: |
           # Install to collect dependencies into the (pip) cache.
           pip install -U 'faulthandler; python_version == "2.7" and platform_python_implementation == "CPython"'
@@ -257,7 +250,6 @@ jobs:
           && startsWith(github.ref, 'refs/tags')
           && startsWith(runner.os, 'Mac')
           && !startsWith(matrix.python-version, 'pypy')
-          && !startsWith(matrix.python-version, '3.12.0-alpha.1')
         env:
           TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
         run: |
@@ -280,7 +272,6 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
-          - "3.12.0-alpha.1"
         os: [ubuntu-20.04, macos-latest]
         exclude:
           - os: macos-latest
@@ -321,25 +312,12 @@ jobs:
         with:
           name: ExtensionClass-${{ runner.os }}-${{ matrix.python-version }}.whl
           path: dist/
-      - name: Install ExtensionClass 3.12.0-alpha.1
-        if: ${{ startsWith(matrix.python-version, '3.12.0-alpha.1') }}
-        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
-          pip install -U 'faulthandler; python_version == "2.7" and platform_python_implementation == "CPython"'
-          # 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/ExtensionClass-*whl -d src
-          pip install --pre -U -e .[test]
       - name: Install ExtensionClass
-        if: ${{ !startsWith(matrix.python-version, '3.12.0-alpha.1') }}
         run: |
           pip install -U wheel setuptools
           pip install -U coverage
           pip install -U 'faulthandler; python_version == "2.7" and platform_python_implementation == "CPython"'
+          pip install -U 'cffi; platform_python_implementation == "CPython"'
           # 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?

diff --git a/.manylinux-install.sh b/.manylinux-install.sh
@@ -30,7 +30,6 @@ tox_env_map() {
     case $1 in
         *"cp27"*) echo 'py27';;
         *"cp35"*) echo 'py35';;
-        *"cp312"*) echo 'py312';;
         *"cp36"*) echo 'py36';;
         *"cp37"*) echo 'py37';;
         *"cp38"*) echo 'py38';;
@@ -46,20 +45,14 @@ for PYBIN in /opt/python/*/bin; do
     if \
        [[ "${PYBIN}" == *"cp27"* ]] || \
        [[ "${PYBIN}" == *"cp35"* ]] || \
-       [[ "${PYBIN}" == *"cp312"* ]] || \
        [[ "${PYBIN}" == *"cp311"* ]] || \
        [[ "${PYBIN}" == *"cp36"* ]] || \
        [[ "${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,15 +2,16 @@
 # https://github.com/zopefoundation/meta/tree/master/config/c-code
 [meta]
 template = "c-code"
-commit-id = "a6a0b3d5c83b07baef36cfa9c298bfa2a906039e"
+commit-id = "342271a70d886e753e5cc629e8a81b3cfab692ac"
 
 [python]
 with-appveyor = true
 with-windows = false
 with-pypy = true
 with-legacy-python = true
 with-sphinx-doctests = false
-with-future-python = true
+with-future-python = false
+with-macos = false
 
 [tox]
 use-flake8 = true

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,11 +2,9 @@
  Changelog
 ===========
 
-4.9 (unreleased)
+4.9 (2022-11-17)
 ================
 
-- Start supporting Python 3.12 as of 3.12.0-alpha.1.
-
 - Add support for building arm64 wheels on macOS.
 
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -18,9 +18,6 @@ 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.py b/setup.py
@@ -49,7 +49,7 @@
                   include_dirs=['src']),
     ]
 
-version = '4.9.dev0'
+version = '4.9'
 
 setup(
     name='ExtensionClass',

diff --git a/tox.ini b/tox.ini
@@ -12,14 +12,12 @@ envlist =
     py39,py39-pure
     py310,py310-pure
     py311,py311-pure
-    py312,py312-pure
     pypy
     pypy3
     coverage
 
 [testenv]
 usedevelop = true
-pip_pre = py312: true
 deps =
 setenv =
     pure: PURE_PYTHON=1