From 87841448554685871eb95f2fc0f2f1de8bf4e0a1 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Thu, 13 Aug 2020 12:39:08 +0300 Subject: [PATCH] GHA/Ubuntu/3.9-dev: Require setuptools 49.3.2+ --- .ci/install.sh | 5 ++++- .github/workflows/test.yml | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.ci/install.sh b/.ci/install.sh index b127018f4..3c75526fe 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -30,8 +30,11 @@ pip install -U pytest-cov pip install pyroma pip install test-image-results pip install numpy -# TODO Remove when Travis/3.9 includes setuptools 49.3.2+: + +# TODO Remove when 3.9-dev includes setuptools 49.3.2+: if [ "$TRAVIS_PYTHON_VERSION" == "3.9-dev" ]; then pip install -U "setuptools>=49.3.2" ; fi +if [ "$GHA_PYTHON_VERSION" == "3.9-dev" ]; then pip install -U "setuptools>=49.3.2" ; fi + if [[ $TRAVIS_PYTHON_VERSION == 3.* ]]; then # arm64, ppc64le, s390x CPUs: # "ERROR: Could not find a version that satisfies the requirement pyqt5" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 65673b0a2..0ffa76168 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -62,6 +62,8 @@ jobs: if: startsWith(matrix.os, 'ubuntu') run: | .ci/install.sh + env: + GHA_PYTHON_VERSION: ${{ matrix.python-version }} - name: Install macOS dependencies if: startsWith(matrix.os, 'macOS')