- update to latest meta/config, fix macOS/Python 3.7 issues

zopefoundation · May 16, 2024 · 9fc969a · 9fc969a
1 parent b36eeef
commit 9fc969a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 13 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -103,11 +103,16 @@ jobs:
           - "3.10"
           - "3.11"
           - "3.12"
-          - "3.13.0-alpha - 3.13.0"
+          - "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
@@ -116,6 +121,7 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
+          allow-prereleases: true
       ###
       # Caching.
       # This actually *restores* a cache and schedules a cleanup action
@@ -152,15 +158,15 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
 
-      - name: Install Build Dependencies (3.13.0-alpha - 3.13.0)
-        if: matrix.python-version == '3.13.0-alpha - 3.13.0'
+      - name: Install Build Dependencies (3.13)
+        if: matrix.python-version == '3.13'
         run: |
           pip install -U pip
           pip install -U setuptools wheel twine
           # Remove this hack once 'cffi' has a release supporting Python 3.13.
           pip install -e "git+https://github.com/python-cffi/cffi.git#egg=cffi"
       - name: Install Build Dependencies
-        if: matrix.python-version != '3.13.0-alpha - 3.13.0'
+        if: matrix.python-version != '3.13'
         run: |
           pip install -U pip
           pip install -U setuptools wheel twine
@@ -205,15 +211,15 @@ jobs:
           python setup.py build_ext -i
           python setup.py bdist_wheel
 
-      - name: Install persistent and dependencies (3.13.0-alpha - 3.13.0)
-        if: matrix.python-version == '3.13.0-alpha - 3.13.0'
+      - name: Install persistent and dependencies (3.13)
+        if: matrix.python-version == '3.13'
         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 persistent and dependencies
-        if: matrix.python-version != '3.13.0-alpha - 3.13.0'
+        if: matrix.python-version != '3.13'
         run: |
           # Install to collect dependencies into the (pip) cache.
           pip install .[test]
@@ -257,7 +263,7 @@ jobs:
           && startsWith(github.ref, 'refs/tags')
           && startsWith(runner.os, 'Mac')
           && !startsWith(matrix.python-version, 'pypy')
-          && !startsWith(matrix.python-version, '3.13.0-alpha - 3.13.0')
+          && !startsWith(matrix.python-version, '3.13')
         env:
           TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
         run: |
@@ -277,11 +283,16 @@ jobs:
           - "3.10"
           - "3.11"
           - "3.12"
-          - "3.13.0-alpha - 3.13.0"
+          - "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
@@ -290,6 +301,7 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
+          allow-prereleases: true
       ###
       # Caching.
       # This actually *restores* a cache and schedules a cleanup action
@@ -331,8 +343,8 @@ jobs:
         with:
           name: persistent-${{ runner.os }}-${{ matrix.python-version }}.whl
           path: dist/
-      - name: Install persistent 3.13.0-alpha - 3.13.0 ${{ matrix.python-version }}
-        if: matrix.python-version == '3.13.0-alpha - 3.13.0'
+      - name: Install persistent 3.13 ${{ matrix.python-version }}
+        if: matrix.python-version == '3.13'
         run: |
           pip install -U wheel setuptools
           # Remove this hack once 'cffi' has a release supporting Python 3.13.
@@ -348,7 +360,7 @@ jobs:
           # Python release may only be available as pre-releases
           pip install --pre -U -e .[test]
       - name: Install persistent
-        if: ${{ !startsWith(matrix.python-version, '3.13.0-alpha - 3.13.0') }}
+        if: matrix.python-version != '3.13'
         run: |
           pip install -U wheel setuptools
           pip install -U coverage
@@ -403,6 +415,7 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
+          allow-prereleases: true
       ###
       # Caching.
       # This actually *restores* a cache and schedules a cleanup action
@@ -471,6 +484,7 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
+          allow-prereleases: true
       ###
       # Caching.
       # This actually *restores* a cache and schedules a cleanup action
@@ -541,6 +555,7 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
+          allow-prereleases: true
       ###
       # Caching.
       # This actually *restores* a cache and schedules a cleanup action

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 = "133f57d5"
+commit-id = "5a4d3a13"
 
 [python]
 with-appveyor = true