Merge pull request #55 from zopefoundation/config-with-c-code-templat…

…e-8d837c89 Configuring for c-code: drop support for Python 3.7
zopefoundation · May 28, 2024 · 532b967 · 532b967
2 parents 6116d35 + 1eb0a93
commit 532b967
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 33 deletions.
diff --git 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 zope.i18nmessageid (macOS x86_64, Python 3.8+)
+      - name: Build zope.i18nmessageid (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 zope.i18nmessageid (macOS arm64, Python 3.8+)
+      - name: Build zope.i18nmessageid (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: zope.i18nmessageid-${{ 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: zope.i18nmessageid-${{ runner.os }}-${{ matrix.python-version }}-x86_64.whl
           path: dist/*x86_64.whl
       - name: Upload zope.i18nmessageid 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: zope.i18nmessageid-${{ runner.os }}-${{ matrix.python-version }}-arm64.whl
+          name: zope.i18nmessageid-${{ runner.os }}-${{ matrix.python-version }}.whl
           path: dist/*arm64.whl
       - name: Upload zope.i18nmessageid 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
@@ -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
@@ -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 = false

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,9 +2,11 @@
  Changes
 =========
 
-6.2 (unreleased)
+7.0 (unreleased)
 ================
 
+- Drop support for Python 3.7.
+
 - Build Windows wheels on GHA.
 
 - Add preliminary support for Python 3.13 as of 3.13a5.

diff --git a/setup.py b/setup.py
@@ -112,7 +112,6 @@ def _unavailable(self, e):
         'License :: OSI Approved :: Zope Public 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',
@@ -131,7 +130,7 @@ def _unavailable(self, e):
     package_dir={'': 'src'},
     namespace_packages=['zope'],
     install_requires=['setuptools'],
-    python_requires='>=3.7',
+    python_requires='>=3.8',
     include_package_data=True,
     test_suite='zope.i18nmessageid.tests.test_suite',
     zip_safe=False,

diff --git 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