Merge pull request #215 from radarhere/python310

This commit is contained in:
Hugo van Kemenade 2021-08-15 15:58:23 +03:00 committed by GitHub
commit 668fa3d2c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 4 deletions

View File

@ -17,17 +17,24 @@ jobs:
fail-fast: false
matrix:
os: [ "ubuntu-20.04", "macos-latest" ]
python: [ "pypy3.7-7.3.3","pypy3.6-7.3.3", "3.6", "3.7", "3.8", "3.9" ]
python: [ "pypy3.7-7.3.3", "pypy3.6-7.3.3", "3.6", "3.7", "3.8", "3.9", "3.10" ]
platform: [ "x86_64", "i686" ]
macos-target: [ "10.10" ]
exclude:
- os: "macos-latest"
platform: "i686"
- os: "ubuntu-20.04"
python: "3.10"
include:
- os: "macos-latest"
os-name: "osx"
- os: "ubuntu-20.04"
os-name: "focal"
- os: "macos-11"
os-name: "osx"
platform: "arm64"
python: "3.10"
macos-target: "11.0"
- os: "macos-11"
os-name: "osx"
platform: "arm64"
@ -70,17 +77,24 @@ jobs:
fail-fast: false
matrix:
os: [ "ubuntu-20.04", "macos-latest" ]
python: [ "pypy3.7-7.3.3", "pypy3.6-7.3.3", "3.6", "3.7", "3.8", "3.9" ]
python: [ "pypy3.7-7.3.3", "pypy3.6-7.3.3", "3.6", "3.7", "3.8", "3.9", "3.10" ]
platform: [ "x86_64", "i686" ]
macos-target: [ "10.10" ]
exclude:
- os: "macos-latest"
platform: "i686"
- os: "ubuntu-20.04"
python: "3.10"
include:
- os: "macos-latest"
os-name: "osx"
- os: "ubuntu-20.04"
os-name: "focal"
- os: "macos-11"
os-name: "osx"
platform: "arm64"
python: "3.10"
macos-target: "11.0"
- os: "macos-11"
os-name: "osx"
platform: "arm64"

View File

@ -132,7 +132,7 @@ function run_tests {
else
python3 -m pip install numpy==1.20.3
fi
else
elif [[ "$MB_PYTHON_VERSION" != 3.10 ]] || [[ "$PLAT" != "x86_64" ]]; then
python3 -m pip install numpy
fi

@ -1 +1 @@
Subproject commit 84c6f7f6c2b56d88197cd9d1fe928326d9c734c3
Subproject commit 13a01725b0f0aa551ab34aa2311cdc1c77be4337