From afc5964df3632ffc1ffe2c714c3244f55bd9307c Mon Sep 17 00:00:00 2001
From: Maurits van Rees <maurits@vanrees.org>
Date: Tue, 19 Mar 2024 23:16:59 +0100
Subject: [PATCH] gh-actions 6.1: Python 3.10 plus.

And update to latest versions of the actions.
Remove `versions:python38`.
---
 .github/workflows/bare.yml         |  8 ++++----
 .github/workflows/ecosystem.yml    |  6 +++---
 .github/workflows/run-buildout.yml |  8 +++-----
 .github/workflows/versioncheck.yml | 10 +++++-----
 versions.cfg                       |  4 ----
 5 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/bare.yml b/.github/workflows/bare.yml
index 6445f874f2..ae3e835ad0 100644
--- a/.github/workflows/bare.yml
+++ b/.github/workflows/bare.yml
@@ -8,7 +8,7 @@ jobs:
       matrix:
         python-version:
         # Use the oldest supported Python version, as that may pull in more versions.
-        - "3.8"
+        - "3.10"
     runs-on: ubuntu-latest
     steps:
     - name: locale
@@ -16,9 +16,9 @@ jobs:
       run: |
         sudo locale-gen nl_NL@euro
         sudo update-locale
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
         cache: 'pip'
@@ -27,7 +27,7 @@ jobs:
       with:
         path: "requirements.txt"
     - name: Cache eggs
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           eggs
diff --git a/.github/workflows/ecosystem.yml b/.github/workflows/ecosystem.yml
index 6d4551b8c2..082cf7ab90 100644
--- a/.github/workflows/ecosystem.yml
+++ b/.github/workflows/ecosystem.yml
@@ -10,9 +10,9 @@ jobs:
         - "3.10"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
         cache: 'pip'
@@ -21,7 +21,7 @@ jobs:
       with:
         path: "requirements.txt"
     - name: Cache eggs
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           eggs
diff --git a/.github/workflows/run-buildout.yml b/.github/workflows/run-buildout.yml
index 60d744390c..364892f34a 100644
--- a/.github/workflows/run-buildout.yml
+++ b/.github/workflows/run-buildout.yml
@@ -7,8 +7,6 @@ jobs:
     strategy:
       matrix:
         python-version:
-        - "3.8"
-        - "3.9"
         - "3.10"
         - "3.11"
         - "3.12"
@@ -18,9 +16,9 @@ jobs:
         - macos-latest
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
         cache: 'pip'
@@ -29,7 +27,7 @@ jobs:
       with:
         path: "requirements.txt"
     - name: Cache eggs
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           eggs
diff --git a/.github/workflows/versioncheck.yml b/.github/workflows/versioncheck.yml
index 1990e69da3..6dc4b593ed 100644
--- a/.github/workflows/versioncheck.yml
+++ b/.github/workflows/versioncheck.yml
@@ -9,15 +9,15 @@ jobs:
     strategy:
       matrix:
         python-version:
-        - "3.8"
+        - "3.10"
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
          ref: ${{ matrix.branch }}
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
         cache: 'pip'
@@ -26,7 +26,7 @@ jobs:
       with:
         path: "requirements.txt"
     - name: Cache eggs
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           eggs
@@ -41,7 +41,7 @@ jobs:
       run: |
          ./bin/versioncheck -pnNbo versions.html
     - name: Upload versions.html
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: versions-${{ matrix.python-version }}
         path: versions.html
diff --git a/versions.cfg b/versions.cfg
index 1fca340439..af708cea2c 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -256,10 +256,6 @@ webresource = 1.2
 wrapt = 1.16.0
 wsproto = 1.2.0
 
-[versions:python38]
-backports.zoneinfo = 0.2.1
-pkgutil-resolve-name = 1.3.10
-
 [versionannotations]
 # keep this alphabetical please
 prompt-toolkit =