From 67d548593448cecb97956b8df1cac0ba06ae71c1 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Tue, 28 May 2024 11:25:26 -0400 Subject: [PATCH 1/2] Configuring for c-code: drop support for Python 3.7 --- .github/workflows/tests.yml | 36 ++++++++++-------------------------- .manylinux-install.sh | 2 -- .meta.toml | 2 +- CHANGES.rst | 4 ++-- tox.ini | 1 - 5 files changed, 13 insertions(+), 32 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9cae6bd..4d69ee0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -97,7 +97,6 @@ jobs: matrix: python-version: - "pypy-3.10" - - "3.7" - "3.8" - "3.9" - "3.10" @@ -106,13 +105,8 @@ jobs: - "3.13" os: [ubuntu-latest, macos-latest, windows-latest] exclude: - - os: macos-latest - python-version: "3.7" - os: macos-latest python-version: "pypy-3.10" - include: - - python-version: "3.7" - os: macos-12 steps: - name: checkout @@ -169,11 +163,10 @@ jobs: pip install -U pip pip install -U "setuptools<69" wheel twine - - name: Build zodbpickle (macOS x86_64, Python 3.8+) + - name: Build zodbpickle (macOS x86_64) if: > startsWith(runner.os, 'Mac') - && !(startsWith(matrix.python-version, 'pypy') - || matrix.python-version == '3.7') + && !startsWith(matrix.python-version, 'pypy') env: MACOSX_DEPLOYMENT_TARGET: 10.9 _PYTHON_HOST_PLATFORM: macosx-10.9-x86_64 @@ -183,11 +176,10 @@ jobs: # output (pip install uses a random temporary directory, making this difficult). python setup.py build_ext -i python setup.py bdist_wheel - - name: Build zodbpickle (macOS arm64, Python 3.8+) + - name: Build zodbpickle (macOS arm64) if: > startsWith(runner.os, 'Mac') - && !(startsWith(matrix.python-version, 'pypy') - || matrix.python-version == '3.7') + && !startsWith(matrix.python-version, 'pypy') env: MACOSX_DEPLOYMENT_TARGET: 11.0 _PYTHON_HOST_PLATFORM: macosx-11.0-arm64 @@ -201,7 +193,6 @@ jobs: if: > !startsWith(runner.os, 'Mac') || startsWith(matrix.python-version, 'pypy') - || matrix.python-version == '3.7' run: | # Next, build the wheel *in place*. This helps ccache, and also lets us cache the configure # output (pip install uses a random temporary directory, making this difficult). @@ -230,19 +221,18 @@ jobs: startsWith(runner.os, 'Mac') uses: actions/upload-artifact@v4 with: - name: zodbpickle-${{ runner.os }}-${{ matrix.python-version }}.whl + # The x86_64 wheel is uploaded with a different name just so it can be + # manually downloaded when desired. The wheel itself *cannot* be tested + # on the GHA runner, which uses arm64 architecture. + name: zodbpickle-${{ runner.os }}-${{ matrix.python-version }}-x86_64.whl path: dist/*x86_64.whl - name: Upload zodbpickle wheel (macOS arm64) if: > startsWith(runner.os, 'Mac') - && !(startsWith(matrix.python-version, 'pypy') - || matrix.python-version == '3.7') + && !startsWith(matrix.python-version, 'pypy') 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 - # on the GHA runner, which uses x86_64 architecture. - name: zodbpickle-${{ runner.os }}-${{ matrix.python-version }}-arm64.whl + name: zodbpickle-${{ runner.os }}-${{ matrix.python-version }}.whl path: dist/*arm64.whl - name: Upload zodbpickle wheel (all other platforms) if: > @@ -274,7 +264,6 @@ jobs: matrix: python-version: - "pypy-3.10" - - "3.7" - "3.8" - "3.9" - "3.10" @@ -283,13 +272,8 @@ jobs: - "3.13" os: [ubuntu-latest, macos-latest, windows-latest] exclude: - - os: macos-latest - python-version: "3.7" - os: macos-latest python-version: "pypy-3.10" - include: - - python-version: "3.7" - os: macos-12 steps: - name: checkout diff --git a/.manylinux-install.sh b/.manylinux-install.sh index 6028f54..2f1f43a 100755 --- a/.manylinux-install.sh +++ b/.manylinux-install.sh @@ -29,7 +29,6 @@ yum -y install libffi-devel tox_env_map() { case $1 in *"cp313"*) echo 'py313';; - *"cp37"*) echo 'py37';; *"cp38"*) echo 'py38';; *"cp39"*) echo 'py39';; *"cp310"*) echo 'py310';; @@ -45,7 +44,6 @@ for PYBIN in /opt/python/*/bin; do [[ "${PYBIN}" == *"cp313/"* ]] || \ [[ "${PYBIN}" == *"cp311/"* ]] || \ [[ "${PYBIN}" == *"cp312/"* ]] || \ - [[ "${PYBIN}" == *"cp37/"* ]] || \ [[ "${PYBIN}" == *"cp38/"* ]] || \ [[ "${PYBIN}" == *"cp39/"* ]] || \ [[ "${PYBIN}" == *"cp310/"* ]] ; then diff --git a/.meta.toml b/.meta.toml index 08bc93a..fdd8f4b 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 = "1c0f31f5" +commit-id = "8d837c89" [python] with-appveyor = true diff --git a/CHANGES.rst b/CHANGES.rst index ea983f0..cb2a32c 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,10 +2,10 @@ Changelog =========== -3.4 (unreleased) +4.0 (unreleased) ================ -- Nothing changed yet. +- Drop support for Python 3.7. 3.3 (2024-04-16) diff --git a/tox.ini b/tox.ini index 5e22ccf..5928586 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,6 @@ minversion = 4.0 envlist = lint - py37,py37-pure py38,py38-pure py39,py39-pure py310,py310-pure From 7f50940c3b89f7bb16bff54c33a1a0735e012e53 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Tue, 28 May 2024 13:56:46 -0400 Subject: [PATCH 2/2] chore: fix up Trove / python-requires manually --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 56648c1..41ff5b9 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,6 @@ def read(fname): 'License :: OSI Approved :: Python Software Foundation License', 'Programming Language :: Python', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', @@ -78,7 +77,7 @@ def read(fname): packages=find_packages('src'), package_dir={'': 'src'}, ext_modules=ext_modules, - python_requires='>=3.7', + python_requires='>=3.8', extras_require={ 'test': ['zope.testrunner'], },