Skip to content

Commit d74cf22

Browse files
authored
Merge pull request #5496 from radarhere/setuptools
Removed setuptools version requirement on GHA macOS and Windows
2 parents 186145e + f132e4d commit d74cf22

File tree

2 files changed

+0
-9
lines changed

2 files changed

+0
-9
lines changed

.github/workflows/macos-install.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,5 @@ echo -e "[openblas]\nlibraries = openblas\nlibrary_dirs = /usr/local/opt/openbla
1717
# TODO Remove condition when numpy supports 3.10
1818
if ! [ "$GHA_PYTHON_VERSION" == "3.10-dev" ]; then python3 -m pip install numpy ; fi
1919

20-
# TODO Remove when 3.8 / 3.9 includes setuptools 49.3.2+:
21-
if [ "$GHA_PYTHON_VERSION" == "3.8" ]; then python3 -m pip install -U "setuptools>=49.3.2" ; fi
22-
if [ "$GHA_PYTHON_VERSION" == "3.9" ]; then python3 -m pip install -U "setuptools>=49.3.2" ; fi
23-
2420
# extra test images
2521
pushd depends && ./install_extra_test_images.sh && popd

.github/workflows/test-windows.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,6 @@ jobs:
5454
- name: python -m pip install wheel pytest pytest-cov pytest-timeout
5555
run: python -m pip install wheel pytest pytest-cov pytest-timeout
5656

57-
# TODO Remove when 3.8 / 3.9 includes setuptools 49.3.2+:
58-
- name: Upgrade setuptools
59-
if: "contains(matrix.python-version, '3.8') || contains(matrix.python-version, '3.9')"
60-
run: python -m pip install -U "setuptools>=49.3.2"
61-
6257
- name: Install dependencies
6358
id: install
6459
run: |

0 commit comments

Comments
 (0)