From 79282883ce8d2a4d58ccfcce416b155b90900d9f Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Mon, 29 Jan 2024 13:31:25 +0100 Subject: [PATCH] Official support for Python 3.12 (#49) --- .github/workflows/tests.yml | 52 ++++++++++++++++++------------------- .meta.toml | 4 +-- CHANGES.rst | 2 +- setup.py | 1 + tox.ini | 1 + 5 files changed, 31 insertions(+), 29 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7a3d9f8..189b928 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -96,7 +96,7 @@ jobs: fail-fast: false matrix: python-version: - - "pypy-3.9" + - "pypy-3.10" - "3.7" - "3.8" - "3.9" @@ -106,13 +106,13 @@ jobs: os: [ubuntu-20.04, macos-11] exclude: - os: macos-11 - python-version: "pypy-3.9" + python-version: "pypy-3.10" steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} ### @@ -127,7 +127,7 @@ jobs: echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT - name: pip cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-pip-${{ matrix.python-version }} @@ -190,7 +190,7 @@ jobs: - name: Upload zope.index wheel (macOS x86_64) if: > startsWith(runner.os, 'Mac') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: zope.index-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/*x86_64.whl @@ -199,7 +199,7 @@ jobs: startsWith(runner.os, 'Mac') && !(startsWith(matrix.python-version, 'pypy') || matrix.python-version == '3.7') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: # The arm64 wheel is uploaded with a different name just so it can be # manually downloaded when desired. The wheel itself *cannot* be tested @@ -209,7 +209,7 @@ jobs: - name: Upload zope.index wheel (all other platforms) if: > !startsWith(runner.os, 'Mac') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: zope.index-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/*whl @@ -234,7 +234,7 @@ jobs: fail-fast: false matrix: python-version: - - "pypy-3.9" + - "pypy-3.10" - "3.7" - "3.8" - "3.9" @@ -244,13 +244,13 @@ jobs: os: [ubuntu-20.04, macos-11] exclude: - os: macos-11 - python-version: "pypy-3.9" + python-version: "pypy-3.10" steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} ### @@ -265,7 +265,7 @@ jobs: echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT - name: pip cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-pip-${{ matrix.python-version }} @@ -273,7 +273,7 @@ jobs: ${{ runner.os }}-pip- - name: Download zope.index wheel - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: zope.index-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/ @@ -325,9 +325,9 @@ jobs: steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} ### @@ -342,7 +342,7 @@ jobs: echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT - name: pip cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-pip-${{ matrix.python-version }} @@ -350,7 +350,7 @@ jobs: ${{ runner.os }}-pip- - name: Download zope.index wheel - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: zope.index-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/ @@ -376,9 +376,9 @@ jobs: steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} ### @@ -393,7 +393,7 @@ jobs: echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT - name: pip cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-pip-${{ matrix.python-version }} @@ -401,7 +401,7 @@ jobs: ${{ runner.os }}-pip- - name: Download zope.index wheel - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: zope.index-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/ @@ -429,9 +429,9 @@ jobs: steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} ### @@ -446,7 +446,7 @@ jobs: echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT - name: pip cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-pip_manylinux-${{ matrix.image }}-${{ matrix.python-version }} @@ -481,7 +481,7 @@ jobs: bash .manylinux.sh - name: Upload zope.index wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: wheelhouse/*whl name: manylinux_${{ matrix.image }}_wheels.zip diff --git a/.meta.toml b/.meta.toml index e38f0ab..002a010 100644 --- a/.meta.toml +++ b/.meta.toml @@ -2,7 +2,7 @@ # https://github.com/zopefoundation/meta/tree/master/config/c-code [meta] template = "c-code" -commit-id = "978a8a28" +commit-id = "08a3cc69" [python] with-appveyor = true @@ -10,7 +10,7 @@ with-windows = false with-pypy = true with-docs = true with-sphinx-doctests = true -with-future-python = true +with-future-python = false with-macos = false [tox] diff --git a/CHANGES.rst b/CHANGES.rst index 616380d..9f03ea7 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,7 +5,7 @@ 6.1 (unreleased) ================ -- Add preliminary support for Python 3.12b4. +- Add support for Python 3.12. 6.0 (2023-03-24) diff --git a/setup.py b/setup.py index 5a1e939..48b474c 100644 --- a/setup.py +++ b/setup.py @@ -92,6 +92,7 @@ def _unavailable(self, e): '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', 'Natural Language :: English', diff --git a/tox.ini b/tox.ini index 2ab6e04..02e85e0 100644 --- a/tox.ini +++ b/tox.ini @@ -54,6 +54,7 @@ deps = check-manifest check-python-versions >= 0.20.0 wheel +commands_pre = commands = check-manifest check-python-versions