Merge pull request #5496 from radarhere/setuptools

Removed setuptools version requirement on GHA macOS and Windows
python-pillow · May 14, 2021 · d74cf22 · d74cf22
2 parents 186145e + f132e4d
commit d74cf22
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/.github/workflows/macos-install.sh b/.github/workflows/macos-install.sh
@@ -17,9 +17,5 @@ echo -e "[openblas]\nlibraries = openblas\nlibrary_dirs = /usr/local/opt/openbla
 # TODO Remove condition when numpy supports 3.10
 if ! [ "$GHA_PYTHON_VERSION" == "3.10-dev" ]; then python3 -m pip install numpy ; fi
 
-# TODO Remove when 3.8 / 3.9 includes setuptools 49.3.2+:
-if [ "$GHA_PYTHON_VERSION" == "3.8" ]; then python3 -m pip install -U "setuptools>=49.3.2" ; fi
-if [ "$GHA_PYTHON_VERSION" == "3.9" ]; then python3 -m pip install -U "setuptools>=49.3.2" ; fi
-
 # extra test images
 pushd depends && ./install_extra_test_images.sh && popd
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
@@ -54,11 +54,6 @@ jobs:
     - name: python -m pip install wheel pytest pytest-cov pytest-timeout
       run: python -m pip install wheel pytest pytest-cov pytest-timeout
 
-    # TODO Remove when 3.8 / 3.9 includes setuptools 49.3.2+:
-    - name: Upgrade setuptools
-      if: "contains(matrix.python-version, '3.8') || contains(matrix.python-version, '3.9')"
-      run: python -m pip install -U "setuptools>=49.3.2"
-
     - name: Install dependencies
       id: install
       run: |