Merge pull request #4951 from hugovk/gha-3.9

3.9: Test GitHub Actions
This commit is contained in:
Andrew Murray 2020-10-07 19:04:05 +11:00 committed by GitHub
commit 41d935a5a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 8 deletions

View File

@ -33,8 +33,8 @@ pip install pyroma
pip install test-image-results pip install test-image-results
pip install numpy pip install numpy
# TODO Remove when 3.9-dev includes setuptools 49.3.2+: # TODO Remove when 3.9 includes setuptools 49.3.2+:
if [ "$GHA_PYTHON_VERSION" == "3.9-dev" ]; 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 if [[ $TRAVIS_PYTHON_VERSION == 3.* ]]; then
# arm64, ppc64le, s390x CPUs: # arm64, ppc64le, s390x CPUs:

View File

@ -15,8 +15,9 @@ pip install test-image-results
echo -e "[openblas]\nlibraries = openblas\nlibrary_dirs = /usr/local/opt/openblas/lib" >> ~/.numpy-site.cfg echo -e "[openblas]\nlibraries = openblas\nlibrary_dirs = /usr/local/opt/openblas/lib" >> ~/.numpy-site.cfg
pip install numpy pip install numpy
# TODO Remove when 3.9-dev includes setuptools 49.3.2+: # TODO Remove when 3.8 / 3.9 includes setuptools 49.3.2+:
if [ "$GHA_PYTHON_VERSION" == "3.9-dev" ]; then pip install -U "setuptools>=49.3.2" ; fi 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
# extra test images # extra test images
pushd depends && ./install_extra_test_images.sh && popd pushd depends && ./install_extra_test_images.sh && popd

View File

@ -8,7 +8,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
python-version: ["3.6", "3.7", "3.8", "3.9-dev", "pypy3"] python-version: ["3.6", "3.7", "3.8", "3.9", "pypy3"]
architecture: ["x86", "x64"] architecture: ["x86", "x64"]
include: include:
- architecture: "x86" - architecture: "x86"
@ -63,9 +63,9 @@ jobs:
- name: pip install wheel pytest pytest-cov - name: pip install wheel pytest pytest-cov
run: python -m 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+: # TODO Remove when 3.9 includes setuptools 49.3.2+:
- name: Upgrade setuptools - name: Upgrade setuptools
if: "contains(matrix.python-version, '3.9-dev')" if: "contains(matrix.python-version, '3.9')"
run: python -m pip install -U "setuptools>=49.3.2" run: python -m pip install -U "setuptools>=49.3.2"
- name: Install dependencies - name: Install dependencies

View File

@ -14,7 +14,7 @@ jobs:
] ]
python-version: [ python-version: [
"pypy3", "pypy3",
"3.9-dev", "3.9",
"3.8", "3.8",
"3.7", "3.7",
"3.6", "3.6",