From 0d63ede0d2ca9f4acc8329aa4261a7cec489ffdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= <contact@ionelmc.ro>
Date: Sun, 21 May 2023 16:27:29 +0300
Subject: [PATCH] Update test config. Reapply some of the changes from PR567 to
 the right file (the template).

---
 .github/workflows/test.yml              | 108 ++++++++++++++----------
 ci/templates/.github/workflows/test.yml |  28 +++---
 2 files changed, 78 insertions(+), 58 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2dbeb51a..7fade785 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -60,131 +60,149 @@ jobs:
             toxpython: 'python3.11'
             tox_env: 'docs'
             os: 'ubuntu-latest'
-          - name: 'py37-pytest71-xdist250-coverage64 (ubuntu)'
+          - name: 'py37-pytest73-xdist330-coverage72 (ubuntu)'
             python: '3.7'
             toxpython: 'python3.7'
             python_arch: 'x64'
-            tox_env: 'py37-pytest71-xdist250-coverage64'
+            tox_env: 'py37-pytest73-xdist330-coverage72'
             os: 'ubuntu-latest'
-          - name: 'py37-pytest71-xdist250-coverage64 (windows)'
+          - name: 'py37-pytest73-xdist330-coverage72 (windows)'
             python: '3.7'
             toxpython: 'python3.7'
             python_arch: 'x64'
-            tox_env: 'py37-pytest71-xdist250-coverage64'
+            tox_env: 'py37-pytest73-xdist330-coverage72'
             os: 'windows-latest'
-          - name: 'py37-pytest71-xdist250-coverage64 (macos)'
+          - name: 'py37-pytest73-xdist330-coverage72 (macos)'
             python: '3.7'
             toxpython: 'python3.7'
             python_arch: 'x64'
-            tox_env: 'py37-pytest71-xdist250-coverage64'
+            tox_env: 'py37-pytest73-xdist330-coverage72'
             os: 'macos-latest'
-          - name: 'py38-pytest71-xdist250-coverage64 (ubuntu)'
+          - name: 'py38-pytest73-xdist330-coverage72 (ubuntu)'
             python: '3.8'
             toxpython: 'python3.8'
             python_arch: 'x64'
-            tox_env: 'py38-pytest71-xdist250-coverage64'
+            tox_env: 'py38-pytest73-xdist330-coverage72'
             os: 'ubuntu-latest'
-          - name: 'py38-pytest71-xdist250-coverage64 (windows)'
+          - name: 'py38-pytest73-xdist330-coverage72 (windows)'
             python: '3.8'
             toxpython: 'python3.8'
             python_arch: 'x64'
-            tox_env: 'py38-pytest71-xdist250-coverage64'
+            tox_env: 'py38-pytest73-xdist330-coverage72'
             os: 'windows-latest'
-          - name: 'py38-pytest71-xdist250-coverage64 (macos)'
+          - name: 'py38-pytest73-xdist330-coverage72 (macos)'
             python: '3.8'
             toxpython: 'python3.8'
             python_arch: 'x64'
-            tox_env: 'py38-pytest71-xdist250-coverage64'
+            tox_env: 'py38-pytest73-xdist330-coverage72'
             os: 'macos-latest'
-          - name: 'py39-pytest71-xdist250-coverage64 (ubuntu)'
+          - name: 'py39-pytest73-xdist330-coverage72 (ubuntu)'
             python: '3.9'
             toxpython: 'python3.9'
             python_arch: 'x64'
-            tox_env: 'py39-pytest71-xdist250-coverage64'
+            tox_env: 'py39-pytest73-xdist330-coverage72'
             os: 'ubuntu-latest'
-          - name: 'py39-pytest71-xdist250-coverage64 (windows)'
+          - name: 'py39-pytest73-xdist330-coverage72 (windows)'
             python: '3.9'
             toxpython: 'python3.9'
             python_arch: 'x64'
-            tox_env: 'py39-pytest71-xdist250-coverage64'
+            tox_env: 'py39-pytest73-xdist330-coverage72'
             os: 'windows-latest'
-          - name: 'py39-pytest71-xdist250-coverage64 (macos)'
+          - name: 'py39-pytest73-xdist330-coverage72 (macos)'
             python: '3.9'
             toxpython: 'python3.9'
             python_arch: 'x64'
-            tox_env: 'py39-pytest71-xdist250-coverage64'
+            tox_env: 'py39-pytest73-xdist330-coverage72'
             os: 'macos-latest'
-          - name: 'py310-pytest71-xdist250-coverage64 (ubuntu)'
+          - name: 'py310-pytest73-xdist330-coverage72 (ubuntu)'
             python: '3.10'
             toxpython: 'python3.10'
             python_arch: 'x64'
-            tox_env: 'py310-pytest71-xdist250-coverage64'
+            tox_env: 'py310-pytest73-xdist330-coverage72'
             os: 'ubuntu-latest'
-          - name: 'py310-pytest71-xdist250-coverage64 (windows)'
+          - name: 'py310-pytest73-xdist330-coverage72 (windows)'
             python: '3.10'
             toxpython: 'python3.10'
             python_arch: 'x64'
-            tox_env: 'py310-pytest71-xdist250-coverage64'
+            tox_env: 'py310-pytest73-xdist330-coverage72'
             os: 'windows-latest'
-          - name: 'py310-pytest71-xdist250-coverage64 (macos)'
+          - name: 'py310-pytest73-xdist330-coverage72 (macos)'
             python: '3.10'
             toxpython: 'python3.10'
             python_arch: 'x64'
-            tox_env: 'py310-pytest71-xdist250-coverage64'
+            tox_env: 'py310-pytest73-xdist330-coverage72'
             os: 'macos-latest'
-          - name: 'py311-pytest72-xdist320-coverage65 (ubuntu)'
+          - name: 'py311-pytest73-xdist330-coverage72 (ubuntu)'
             python: '3.11'
             toxpython: 'python3.11'
             python_arch: 'x64'
-            tox_env: 'py311-pytest72-xdist320-coverage65'
+            tox_env: 'py311-pytest73-xdist330-coverage72'
             os: 'ubuntu-latest'
-          - name: 'py311-pytest72-xdist320-coverage65 (windows)'
+          - name: 'py311-pytest73-xdist330-coverage72 (windows)'
             python: '3.11'
             toxpython: 'python3.11'
             python_arch: 'x64'
-            tox_env: 'py311-pytest72-xdist320-coverage65'
+            tox_env: 'py311-pytest73-xdist330-coverage72'
             os: 'windows-latest'
-          - name: 'py311-pytest72-xdist320-coverage65 (macos)'
+          - name: 'py311-pytest73-xdist330-coverage72 (macos)'
             python: '3.11'
             toxpython: 'python3.11'
             python_arch: 'x64'
-            tox_env: 'py311-pytest72-xdist320-coverage65'
+            tox_env: 'py311-pytest73-xdist330-coverage72'
             os: 'macos-latest'
-          - name: 'pypy38-pytest71-xdist250-coverage64 (ubuntu)'
+          - name: 'pypy37-pytest73-xdist330-coverage72 (ubuntu)'
+            python: 'pypy-3.7'
+            toxpython: 'pypy3.7'
+            python_arch: 'x64'
+            tox_env: 'pypy37-pytest73-xdist330-coverage72'
+            os: 'ubuntu-latest'
+          - name: 'pypy37-pytest73-xdist330-coverage72 (windows)'
+            python: 'pypy-3.7'
+            toxpython: 'pypy3.7'
+            python_arch: 'x64'
+            tox_env: 'pypy37-pytest73-xdist330-coverage72'
+            os: 'windows-latest'
+          - name: 'pypy37-pytest73-xdist330-coverage72 (macos)'
+            python: 'pypy-3.7'
+            toxpython: 'pypy3.7'
+            python_arch: 'x64'
+            tox_env: 'pypy37-pytest73-xdist330-coverage72'
+            os: 'macos-latest'
+          - name: 'pypy38-pytest73-xdist330-coverage72 (ubuntu)'
             python: 'pypy-3.8'
             toxpython: 'pypy3.8'
             python_arch: 'x64'
-            tox_env: 'pypy38-pytest71-xdist250-coverage64'
+            tox_env: 'pypy38-pytest73-xdist330-coverage72'
             os: 'ubuntu-latest'
-          - name: 'pypy38-pytest71-xdist250-coverage64 (windows)'
+          - name: 'pypy38-pytest73-xdist330-coverage72 (windows)'
             python: 'pypy-3.8'
             toxpython: 'pypy3.8'
             python_arch: 'x64'
-            tox_env: 'pypy38-pytest71-xdist250-coverage64'
+            tox_env: 'pypy38-pytest73-xdist330-coverage72'
             os: 'windows-latest'
-          - name: 'pypy38-pytest71-xdist250-coverage64 (macos)'
+          - name: 'pypy38-pytest73-xdist330-coverage72 (macos)'
             python: 'pypy-3.8'
             toxpython: 'pypy3.8'
             python_arch: 'x64'
-            tox_env: 'pypy38-pytest71-xdist250-coverage64'
+            tox_env: 'pypy38-pytest73-xdist330-coverage72'
             os: 'macos-latest'
-          - name: 'pypy39--pytest72-xdist320-coverage65 (ubuntu)'
+          - name: 'pypy39-pytest73-xdist330-coverage72 (ubuntu)'
             python: 'pypy-3.9'
             toxpython: 'pypy3.9'
             python_arch: 'x64'
-            tox_env: 'pypy39-pytest72-xdist320-coverage65'
+            tox_env: 'pypy39-pytest73-xdist330-coverage72'
             os: 'ubuntu-latest'
-          - name: 'pypy39-pytest72-xdist320-coverage65 (windows)'
+          - name: 'pypy39-pytest73-xdist330-coverage72 (windows)'
             python: 'pypy-3.9'
             toxpython: 'pypy3.9'
             python_arch: 'x64'
-            tox_env: 'pypy39-pytest72-xdist320-coverage65'
+            tox_env: 'pypy39-pytest73-xdist330-coverage72'
             os: 'windows-latest'
-          - name: 'pypy39-pytest72-xdist320-coverage65 (macos)'
+          - name: 'pypy39-pytest73-xdist330-coverage72 (macos)'
             python: 'pypy-3.9'
             toxpython: 'pypy3.9'
             python_arch: 'x64'
-            tox_env: 'pypy39-pytest72-xdist320-coverage65'
+            tox_env: 'pypy39-pytest73-xdist330-coverage72'
             os: 'macos-latest'
     steps:
     - uses: actions/checkout@v3
@@ -196,7 +214,7 @@ jobs:
         architecture: ${{ matrix.python_arch }}
     - name: install dependencies
       run: |
-        python -m pip install --progress-bar=off -r ci/requirements.txt
+        python -mpip install --progress-bar=off -r ci/requirements.txt
         virtualenv --version
         pip --version
         tox --version
@@ -207,7 +225,9 @@ jobs:
       run: >
         tox -e ${{ matrix.tox_env }} -v
 
-  check:
+  successful:
+    # this provides a single status check for branch merge rules
+    # (use this in `Require status checks to pass before merging` in branch settings)
     if: always()
     needs:
       - test
diff --git a/ci/templates/.github/workflows/test.yml b/ci/templates/.github/workflows/test.yml
index 3e99ef08..6aaf1dbc 100644
--- a/ci/templates/.github/workflows/test.yml
+++ b/ci/templates/.github/workflows/test.yml
@@ -7,25 +7,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["pypy-3.7", "3.9"]
+        python-version: ["pypy-3.9", "3.11"]
         target: [
             "src-layout",
             "adhoc-layout",
         ]
         include:
           # Add new helper variables to existing jobs
-          - {python-version: "pypy-3.7", tox-python-version: "pypy3"}
-          - {python-version: "3.9", tox-python-version: "py39"}
+          - {python-version: "pypy-3.9", tox-python-version: "pypy3"}
+          - {python-version: "3.11", tox-python-version: "py311"}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           key:
@@ -35,8 +35,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python -m pip install -U pip
-          python -m pip install -U wheel
+          python -m pip install --upgrade pip
+          python -m pip install --upgrade wheel
           python -m pip install --progress-bar=off tox -rci/requirements.txt
 
       - name: Examples
@@ -54,13 +54,13 @@ jobs:
       matrix:
         include:
           - name: 'check'
-            python: '3.9'
-            toxpython: 'python3.9'
+            python: '3.11'
+            toxpython: 'python3.11'
             tox_env: 'check'
             os: 'ubuntu-latest'
           - name: 'docs'
-            python: '3.9'
-            toxpython: 'python3.9'
+            python: '3.11'
+            toxpython: 'python3.11'
             tox_env: 'docs'
             os: 'ubuntu-latest'
 {% for env in tox_environments %}
@@ -88,10 +88,10 @@ jobs:
 {% endfor %}
 {% endfor %}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v4
       with:
         python-version: {{ '${{ matrix.python }}' }}
         architecture: {{ '${{ matrix.python_arch }}' }}