Further reduce differences between test workflows

This makes the two CI test workflows more similar in a couple of
the remaining ways they differ unnecessarily.

This could be extended, and otherwise improved upon, in the future.

Author: EliahKagan

Diff for: .github/workflows/cygwin-test.yml

@@ -42,7 +42,7 @@ jobs:
       run: |
         TRAVIS=yes ./init-tests-after-clone.sh
 
-    - name: Further prepare git configuration for tests
+    - name: Set git user identity and command aliases for the tests
       run: |
         git config --global user.email "[email protected]"
         git config --global user.name "Travis Runner"
@@ -52,7 +52,8 @@ jobs:
 
     - name: Update PyPA packages
       run: |
-        python -m pip install --upgrade pip setuptools wheel
+        # Get the latest pip, wheel, and prior to Python 3.12, setuptools.
+        python -m pip install -U pip $(pip freeze --all | grep -oF setuptools) wheel
 
     - name: Install project and test dependencies
       run: |

Diff for: .github/workflows/pythonpackage.yml

@@ -41,7 +41,7 @@ jobs:
       run: |
         TRAVIS=yes ./init-tests-after-clone.sh
 
-    - name: Prepare git configuration for tests
+    - name: Set git user identity and command aliases for the tests
       run: |
         git config --global user.email "[email protected]"
         git config --global user.name "Travis Runner"
@@ -51,12 +51,8 @@ jobs:
 
     - name: Update PyPA packages
       run: |
-        python -m pip install --upgrade pip wheel
-
-        # Python prior to 3.12 ships setuptools. Upgrade it if present.
-        if pip freeze --all | grep --quiet '^setuptools=='; then
-            python -m pip install --upgrade setuptools
-        fi
+        # Get the latest pip, wheel, and prior to Python 3.12, setuptools.
+        python -m pip install -U pip $(pip freeze --all | grep -oF setuptools) wheel
 
     - name: Install project and test dependencies
       run: |