From 58b75801d3966923ffedd13581656154d053815c Mon Sep 17 00:00:00 2001
From: Julian Berman <Julian@GrayVines.com>
Date: Sat, 28 May 2022 11:08:58 -0400
Subject: [PATCH] Re-enable Python 3.11 testing in CI.

---
 .github/workflows/ci.yml       | 27 ++++++++++++---------------
 .github/workflows/coverage.yml |  2 --
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a1b7ee37e..996ba31cb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -84,19 +84,18 @@ jobs:
             toxenv: py310-format_nongpl-build
           - name: "3.10"
             toxenv: py310-format_nongpl-tests
-          # Temporarily disabled due to pypa/setuptools#3274
-          # - name: "3.11.0-alpha - 3.11.0"
-          #   toxenv: py311-noextra-build
-          # - name: "3.11.0-alpha - 3.11.0"
-          #   toxenv: py311-noextra-tests
-          # - name: "3.11.0-alpha - 3.11.0"
-          #   toxenv: py311-format-build
-          # - name: "3.11.0-alpha - 3.11.0"
-          #   toxenv: py311-format-tests
-          # - name: "3.11.0-alpha - 3.11.0"
-          #   toxenv: py311-format_nongpl-build
-          # - name: "3.11.0-alpha - 3.11.0"
-          #   toxenv: py311-format_nongpl-tests
+          - name: "3.11.0-beta - 3.11.0"
+            toxenv: py311-noextra-build
+          - name: "3.11.0-beta - 3.11.0"
+            toxenv: py311-noextra-tests
+          - name: "3.11.0-beta - 3.11.0"
+            toxenv: py311-format-build
+          - name: "3.11.0-beta - 3.11.0"
+            toxenv: py311-format-tests
+          - name: "3.11.0-beta - 3.11.0"
+            toxenv: py311-format_nongpl-build
+          - name: "3.11.0-beta - 3.11.0"
+            toxenv: py311-format_nongpl-tests
           - name: "3.10"
             toxenv: docs-dirhtml
           - name: "3.10"
@@ -185,8 +184,6 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version.name }}
-    - name: Ensure we have new enough versions to respect python_version
-      run: python -m pip install -U pip setuptools
     - name: Install dependencies
       run: >
         sudo apt-get update &&
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 7a14bcedb..5bb23aacd 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -15,8 +15,6 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: 3.9
-    - name: Ensure we have new enough versions to respect python_version
-      run: python -m pip install -U pip setuptools
     - name: Install tox
       run: python -m pip install tox
     - name: Collect & Upload Coverage