Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 4860f70

Browse filesBrowse files
committed
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.
1 parent 3007abc commit 4860f70
Copy full SHA for 4860f70

File tree

2 files changed

+6
-9
lines changed
Filter options

2 files changed

+6
-9
lines changed

‎.github/workflows/cygwin-test.yml

Copy file name to clipboardExpand all lines: .github/workflows/cygwin-test.yml
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
run: |
4343
TRAVIS=yes ./init-tests-after-clone.sh
4444
45-
- name: Further prepare git configuration for tests
45+
- name: Set git user identity and command aliases for the tests
4646
run: |
4747
git config --global user.email "travis@ci.com"
4848
git config --global user.name "Travis Runner"
@@ -52,7 +52,8 @@ jobs:
5252
5353
- name: Update PyPA packages
5454
run: |
55-
python -m pip install --upgrade pip setuptools wheel
55+
# Get the latest pip, wheel, and prior to Python 3.12, setuptools.
56+
python -m pip install -U pip $(pip freeze --all | grep -oF setuptools) wheel
5657
5758
- name: Install project and test dependencies
5859
run: |

‎.github/workflows/pythonpackage.yml

Copy file name to clipboardExpand all lines: .github/workflows/pythonpackage.yml
+3-7Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
run: |
4242
TRAVIS=yes ./init-tests-after-clone.sh
4343
44-
- name: Prepare git configuration for tests
44+
- name: Set git user identity and command aliases for the tests
4545
run: |
4646
git config --global user.email "travis@ci.com"
4747
git config --global user.name "Travis Runner"
@@ -51,12 +51,8 @@ jobs:
5151
5252
- name: Update PyPA packages
5353
run: |
54-
python -m pip install --upgrade pip wheel
55-
56-
# Python prior to 3.12 ships setuptools. Upgrade it if present.
57-
if pip freeze --all | grep --quiet '^setuptools=='; then
58-
python -m pip install --upgrade setuptools
59-
fi
54+
# Get the latest pip, wheel, and prior to Python 3.12, setuptools.
55+
python -m pip install -U pip $(pip freeze --all | grep -oF setuptools) wheel
6056
6157
- name: Install project and test dependencies
6258
run: |

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.