Merge pull request #4958 from radarhere/setuptools

Update setuptools for more Python 3.8 jobs
This commit is contained in:
Hugo van Kemenade 2020-10-08 17:04:30 +03:00 committed by GitHub
commit 027ba3ec3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

View File

@ -33,7 +33,8 @@ pip install pyroma
pip install test-image-results
pip install numpy
# TODO Remove when 3.9 includes setuptools 49.3.2+:
# TODO Remove when 3.8 / 3.9 includes setuptools 49.3.2+:
if [ "$GHA_PYTHON_VERSION" == "3.8" ]; then pip install -U "setuptools>=49.3.2" ; fi
if [ "$GHA_PYTHON_VERSION" == "3.9" ]; then pip install -U "setuptools>=49.3.2" ; fi
if [[ $TRAVIS_PYTHON_VERSION == 3.* ]]; then

View File

@ -63,9 +63,9 @@ jobs:
- name: pip install wheel pytest pytest-cov
run: python -m pip install wheel pytest pytest-cov
# TODO Remove when 3.9 includes setuptools 49.3.2+:
# TODO Remove when 3.8 / 3.9 includes setuptools 49.3.2+:
- name: Upgrade setuptools
if: "contains(matrix.python-version, '3.9')"
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