From 81e866a82420d96d6f656ad52695abe44c3495fd Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Mon, 9 Aug 2021 16:17:09 +0300 Subject: [PATCH 1/3] Wheel now works on Python 3.10 --- .ci/install.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.ci/install.sh b/.ci/install.sh index 0dbf2d690c7..03e3649ff41 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -35,8 +35,7 @@ python3 -m pip install test-image-results if ! [ "$GHA_PYTHON_VERSION" == "3.10-dev" ]; then python3 -m pip install numpy ; fi # PyQt5 doesn't support PyPy3 -# Wheel doesn't yet support 3.10 -if [[ $GHA_PYTHON_VERSION == 3.* && $GHA_PYTHON_VERSION != "3.10-dev" ]]; then +if [[ $GHA_PYTHON_VERSION == 3.* ]]; then # arm64, ppc64le, s390x CPUs: # "ERROR: Could not find a version that satisfies the requirement pyqt5" sudo apt-get -qq install libxcb-xinerama0 pyqt5-dev-tools From 370f32ba720a446d9e53842f0ebaed96bfa31478 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Thu, 29 Jul 2021 12:04:48 +0300 Subject: [PATCH 2/3] Install wheel on CI to avoid legacy setup.py installs --- .ci/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/install.sh b/.ci/install.sh index 03e3649ff41..0f3a36bc42f 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -22,6 +22,7 @@ sudo apt-get -qq install libfreetype6-dev liblcms2-dev python3-tk\ cmake imagemagick libharfbuzz-dev libfribidi-dev python3 -m pip install --upgrade pip +python3 -m pip install --upgrade wheel PYTHONOPTIMIZE=0 python3 -m pip install cffi python3 -m pip install coverage python3 -m pip install defusedxml From 771c7d937ee3455ea7ac62983eb66b6fa19781ad Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 10 Aug 2021 12:46:12 +1000 Subject: [PATCH 3/3] Install numpy on Python 3.10 --- .github/workflows/macos-install.sh | 3 +-- .github/workflows/test.yml | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/macos-install.sh b/.github/workflows/macos-install.sh index 3a70c8047e9..8260cf8d8d3 100755 --- a/.github/workflows/macos-install.sh +++ b/.github/workflows/macos-install.sh @@ -15,8 +15,7 @@ python3 -m pip install pyroma python3 -m pip install test-image-results echo -e "[openblas]\nlibraries = openblas\nlibrary_dirs = /usr/local/opt/openblas/lib" >> ~/.numpy-site.cfg -# TODO Remove condition when numpy supports 3.10 -if ! [ "$GHA_PYTHON_VERSION" == "3.10-dev" ]; then python3 -m pip install numpy ; fi +python3 -m pip install numpy # extra test images pushd depends && ./install_extra_test_images.sh && popd diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 042e6d83ecc..cd85bc53764 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -72,8 +72,6 @@ jobs: if: startsWith(matrix.os, 'macOS') run: | .github/workflows/macos-install.sh - env: - GHA_PYTHON_VERSION: ${{ matrix.python-version }} - name: Build run: |