From 46cc4a7a6e1d065261c0465e5141398a520741dd Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Thu, 19 Dec 2024 14:09:36 +0100 Subject: [PATCH] Update to setuptools 75.6.0 + drop support for Python 3.8 (#337) Co-authored-by: Jens Vagelpohl --- .github/workflows/tests.yml | 8 +++----- .manylinux-install.sh | 2 -- .meta.toml | 2 +- .pre-commit-config.yaml | 4 ++-- CHANGES.rst | 2 +- pyproject.toml | 2 +- tox.ini | 5 ++--- 7 files changed, 10 insertions(+), 15 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 120e9b7e..798be526 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -30,7 +30,7 @@ # native support. It works, but is slow. # # Another major downside: You can't just re-run the job for one part -# of the matrix. So if there's a transient test failure that hit, say, 3.8, +# of the matrix. So if there's a transient test failure that hit, say, 3.11, # to get a clean run every version of Python runs again. That's bad. # https://github.community/t/ability-to-rerun-just-a-single-job-in-a-workflow/17234/65 @@ -97,7 +97,6 @@ jobs: matrix: python-version: - "pypy-3.10" - - "3.8" - "3.9" - "3.10" - "3.11" @@ -157,12 +156,12 @@ jobs: if: matrix.python-version == '3.14' run: | pip install -U pip - pip install -U "setuptools < 74" wheel twine + pip install -U "setuptools <= 75.6.0" wheel twine - name: Install Build Dependencies if: matrix.python-version != '3.14' run: | pip install -U pip - pip install -U "setuptools < 74" wheel twine + pip install -U "setuptools <= 75.6.0" wheel twine - name: Build zope.interface (macOS x86_64) if: > @@ -265,7 +264,6 @@ jobs: matrix: python-version: - "pypy-3.10" - - "3.8" - "3.9" - "3.10" - "3.11" diff --git a/.manylinux-install.sh b/.manylinux-install.sh index 7a338397..4499dbad 100755 --- a/.manylinux-install.sh +++ b/.manylinux-install.sh @@ -28,7 +28,6 @@ yum -y install libffi-devel tox_env_map() { case $1 in - *"cp38"*) echo 'py38';; *"cp39"*) echo 'py39';; *"cp310"*) echo 'py310';; *"cp311"*) echo 'py311';; @@ -42,7 +41,6 @@ tox_env_map() { # Compile wheels for PYBIN in /opt/python/*/bin; do if \ - [[ "${PYBIN}" == *"cp38/"* ]] || \ [[ "${PYBIN}" == *"cp39/"* ]] || \ [[ "${PYBIN}" == *"cp310/"* ]] || \ [[ "${PYBIN}" == *"cp311/"* ]] || \ diff --git a/.meta.toml b/.meta.toml index 3fe4302d..f4754416 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 = "baf6089f" +commit-id = "d1a00d25" [python] with-pypy = true diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b5d6386b..57490cff 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,10 +12,10 @@ repos: - id: autopep8 args: [--in-place, --aggressive, --aggressive] - repo: https://github.com/asottile/pyupgrade - rev: v3.17.0 + rev: v3.19.0 hooks: - id: pyupgrade - args: [--py38-plus] + args: [--py39-plus] - repo: https://github.com/isidentical/teyit rev: 0.4.3 hooks: diff --git a/CHANGES.rst b/CHANGES.rst index 695324f6..dd2ec873 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,7 +5,7 @@ 7.3 (unreleased) ================ -- Nothing changed yet. +- Drop support for Python 3.8. 7.2 (2024-11-28) diff --git a/pyproject.toml b/pyproject.toml index c787aa9e..a3c96507 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ # https://github.com/zopefoundation/meta/tree/master/config/c-code [build-system] -requires = ["setuptools < 74"] +requires = ["setuptools <= 75.6.0"] build-backend = "setuptools.build_meta" [tool.coverage.run] diff --git a/tox.ini b/tox.ini index 1a686364..99cd3271 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,6 @@ minversion = 4.0 envlist = lint - py38,py38-pure py39,py39-pure py310,py310-pure py311,py311-pure @@ -18,7 +17,7 @@ envlist = [testenv] pip_pre = py314: true deps = - setuptools < 74 + setuptools <= 75.6.0 Sphinx setenv = pure: PURE_PYTHON=1 @@ -58,7 +57,7 @@ description = ensure that the distribution is ready to release basepython = python3 skip_install = true deps = - setuptools < 74 + setuptools <= 75.6.0 twine build check-manifest