From 647df0ae6996a88b75bfb1393f42878ddadec685 Mon Sep 17 00:00:00 2001
From: James Addison <jay@jp-hosting.net>
Date: Sun, 21 May 2023 21:34:30 +0100
Subject: [PATCH] [testing] [ci] Focus on Windows (since that's where test
 flakiness was seen for #11232) and run a broader matrix of Python versions

---
 .github/workflows/main.yml | 64 ++------------------------------------
 1 file changed, 3 insertions(+), 61 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fcabcbe7df5..633295a9abf 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,9 +16,9 @@ env:
   PYTHONWARNINGS: "error"  # default: all warnings as errors
 
 jobs:
-  ubuntu:
-    runs-on: ubuntu-latest
-    name: Python ${{ matrix.python }} (Docutils ${{ matrix.docutils }})
+  windows:
+    runs-on: windows-2019
+    name: Python ${{ matrix.python }} (Docutils ${{ matrix.docutils }}) (Windows)
     strategy:
       fail-fast: false
       matrix:
@@ -36,20 +36,8 @@ jobs:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python }}
       uses: actions/setup-python@v4
-      if: "!endsWith(matrix.python, '-dev')"
       with:
         python-version: ${{ matrix.python }}
-    - name: Set up Python ${{ matrix.python }} (deadsnakes)
-      uses: deadsnakes/action@v2.1.1
-      if: "endsWith(matrix.python, '-dev')"
-      with:
-        python-version: ${{ matrix.python }}
-      env:
-        PYTHONWARNINGS: ""
-    - name: Check Python version
-      run: python --version
-    - name: Install graphviz
-      run: sudo apt-get install graphviz
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -62,49 +50,3 @@ jobs:
         PYTHONWARNINGS: ""
     - name: Test with pytest
       run: python -m pytest -vv --durations 25
-
-  windows:
-    runs-on: windows-2019
-    name: Windows
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: 3
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        python -m pip install .[test]
-      env:
-        PYTHONWARNINGS: ""
-    - name: Test with pytest
-      run: python -m pytest -vv --durations 25
-
-  docutils-latest:
-    runs-on: ubuntu-latest
-    name: Docutils HEAD
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3
-      uses: actions/setup-python@v4
-      with:
-        python-version: "3"
-    - name: Check Python version
-      run: python --version
-    - name: Install graphviz
-      run: sudo apt-get install graphviz
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        python -m pip install .[test]
-      env:
-        PYTHONWARNINGS: ""
-    - name: Install Docutils' HEAD
-      run: python -m pip install git+https://repo.or.cz/docutils.git\#subdirectory=docutils
-      env:
-        PYTHONWARNINGS: ""
-    - name: Test with pytest
-      run: python -m pytest -vv