diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a2c1743..ff3565d 100644 --- 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 @@ -178,7 +179,15 @@ jobs: python setup.py build_ext -i python setup.py bdist_wheel + - name: Install zope.security 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 zope.security and dependencies + if: matrix.python-version != '3.12.0-alpha.5' run: | # Install to collect dependencies into the (pip) cache. pip install .[test] @@ -222,6 +231,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: | @@ -234,16 +244,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 @@ -276,7 +287,22 @@ jobs: with: name: zope.security-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/ + - name: Install zope.security 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/zope.security-*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 zope.security + 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 index 8f736da..94d0419 100755 --- 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 index 2145952..f70b396 100644 --- a/.meta.toml +++ b/.meta.toml @@ -2,13 +2,13 @@ # https://github.com/zopefoundation/meta/tree/master/config/c-code [meta] template = "c-code" -commit-id = "4f0f7596" +commit-id = "f0962ac8" [python] with-appveyor = true with-windows = false with-pypy = true -with-future-python = false +with-future-python = true with-docs = true with-sphinx-doctests = true with-macos = false diff --git a/CHANGES.rst b/CHANGES.rst index 7d9d8b3..21a78f3 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -9,6 +9,8 @@ PEP 3114), and drop support for the Python 2 ``next`` method name from pure-Python proxies. +- Add preliminary support for Python 3.12 as of 3.12a5. + 6.1 (2023-01-18) ================ diff --git a/appveyor.yml b/appveyor.yml index 6344764..3d3d47e 100644 --- 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 index 916fb60..6a8093d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -24,7 +24,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 index ed8ebef..e34172a 100644 --- a/tox.ini +++ b/tox.ini @@ -9,6 +9,7 @@ envlist = py39,py39-pure py310,py310-pure py311,py311-pure + py312,py312-pure pypy3 docs coverage @@ -16,7 +17,9 @@ envlist = [testenv] usedevelop = true +pip_pre = py312: true deps = + Sphinx setenv = pure: PURE_PYTHON=1 !pure-!pypy3: PURE_PYTHON=0