Skip to content

Commit ebacfd9

Browse files
committed
Make setuptools check on CI more precise
This checks for setuptools as a full word at the very beginning of a line of output from "pip freeze --all", to: - Avoid the unlikely but possible case that setuptools is absent while something besides setuptools has "setuptools" in its line. - Prevent "setuptools" from being passed to install multiple times. This causes no problems -- it's still only installed/upgraded at most once -- but it was making the GitHub Actions log confusing on Cygwin. (It could happen on other platforms, but hasn't been.)
1 parent ad19912 commit ebacfd9

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/cygwin-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
- name: Update PyPA packages
6464
run: |
6565
# Get the latest pip, wheel, and prior to Python 3.12, setuptools.
66-
python -m pip install -U pip $(pip freeze --all | grep -oF setuptools) wheel
66+
python -m pip install -U pip $(pip freeze --all | grep -ow ^setuptools) wheel
6767
6868
- name: Install project and test dependencies
6969
run: |

.github/workflows/pythonpackage.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- name: Update PyPA packages
5757
run: |
5858
# Get the latest pip, wheel, and prior to Python 3.12, setuptools.
59-
python -m pip install -U pip $(pip freeze --all | grep -oF setuptools) wheel
59+
python -m pip install -U pip $(pip freeze --all | grep -ow ^setuptools) wheel
6060
6161
- name: Install project and test dependencies
6262
run: |

0 commit comments

Comments
 (0)