From b56f0836ffd74b382686c32d5264b770ed9c9a84 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Mon, 13 Jul 2020 20:13:35 +0300 Subject: [PATCH 1/5] Travis/3.9-dev: Require setuptools 49.1.3+ --- .ci/install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.ci/install.sh b/.ci/install.sh index 36bce295c6f..52f59745a38 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -30,7 +30,8 @@ pip install -U pytest-cov pip install pyroma pip install test-image-results pip install numpy -if [ "$TRAVIS_PYTHON_VERSION" == "3.9-dev" ]; then pip install setuptools==47.3.1 ; fi +# TODO Remove when Travis/3.9 includes setuptools 49.1.3+: +if [ "$TRAVIS_PYTHON_VERSION" == "3.9-dev" ]; then pip install -U "setuptools>=49.1.3" ; fi if [[ $TRAVIS_PYTHON_VERSION == 3.* ]]; then # arm64, ppc64le, s390x CPUs: # "ERROR: Could not find a version that satisfies the requirement pyqt5" From ab4239efd1c4a6a2b91c872f2ccf46ade92b2174 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Thu, 13 Aug 2020 00:58:10 +0300 Subject: [PATCH 2/5] Require setuptools 49.3.2+ --- .ci/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/install.sh b/.ci/install.sh index 52f59745a38..b127018f4a8 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -30,8 +30,8 @@ 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.1.3+: -if [ "$TRAVIS_PYTHON_VERSION" == "3.9-dev" ]; then pip install -U "setuptools>=49.1.3" ; fi +# TODO Remove when Travis/3.9 includes setuptools 49.3.2+: +if [ "$TRAVIS_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" From 87841448554685871eb95f2fc0f2f1de8bf4e0a1 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Thu, 13 Aug 2020 12:39:08 +0300 Subject: [PATCH 3/5] 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 b127018f4a8..3c75526fe03 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 65673b0a290..0ffa761680f 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') From 83dc02ae2c68f2ca95424f486d20004f9d6c3686 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Thu, 13 Aug 2020 12:42:02 +0300 Subject: [PATCH 4/5] GHA/Windows/3.9-dev: Require setuptools 49.3.2+ --- .github/workflows/test-windows.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index dd3e6422c35..6b8b104453a 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -63,6 +63,11 @@ jobs: - name: pip install wheel pytest pytest-cov run: python -m pip install wheel pytest pytest-cov + # TODO Remove when 3.9-dev includes setuptools 49.3.2+: + - name: Upgrade setuptools + if: "contains(matrix.python-version, '3.9-dev')" + run: python -m pip install -U "setuptools>=49.3.2" + - name: Prepare dependencies run: | 7z x winbuild\depends\nasm-2.14.02-win64.zip "-o$env:RUNNER_WORKSPACE\" From 1a3f5b6520660f2e206d96488c7bb1fffbba27eb Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Thu, 13 Aug 2020 12:59:52 +0300 Subject: [PATCH 5/5] GHA/macOS/3.9-dev: Require setuptools 49.3.2+ --- .github/workflows/macos-install.sh | 3 +++ .github/workflows/test.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/.github/workflows/macos-install.sh b/.github/workflows/macos-install.sh index 76a3ef2b748..a0418c3ba78 100755 --- a/.github/workflows/macos-install.sh +++ b/.github/workflows/macos-install.sh @@ -15,5 +15,8 @@ pip install test-image-results echo -e "[openblas]\nlibraries = openblas\nlibrary_dirs = /usr/local/opt/openblas/lib" >> ~/.numpy-site.cfg pip install numpy +# TODO Remove when 3.9-dev includes setuptools 49.3.2+: +if [ "$GHA_PYTHON_VERSION" == "3.9-dev" ]; then 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.yml b/.github/workflows/test.yml index 0ffa761680f..dbe0eb82298 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -69,6 +69,8 @@ jobs: if: startsWith(matrix.os, 'macOS') run: | .github/workflows/macos-install.sh + env: + GHA_PYTHON_VERSION: ${{ matrix.python-version }} - name: Build run: |