Skip to content
This repository has been archived by the owner on Aug 30, 2024. It is now read-only.

add python 3.9 #99

Merged
merged 7 commits into from
Sep 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@ jobs:
- MB_PYTHON_VERSION=3.6
- DEBUG_PRINT=1
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
- os: linux
arch: arm64
env:
- PLAT=aarch64
- MB_ML_VER=2014
- MB_PYTHON_VERSION=3.7
- DEBUG_PRINT=1
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
- os: linux
arch: arm64
env:
Expand All @@ -68,7 +76,7 @@ jobs:
env:
- PLAT=aarch64
- MB_ML_VER=2014
- MB_PYTHON_VERSION=3.7
- MB_PYTHON_VERSION=3.9
- DEBUG_PRINT=1
- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}

Expand Down
20 changes: 19 additions & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ variables:
jobs:
- template: azure/windows.yml
parameters:
name: windows
name: windows2017
vmImage: vs2017-win2016
matrix:
py_3.6_32:
Expand Down Expand Up @@ -81,12 +81,28 @@ jobs:
py_3.8_64:
MB_PYTHON_VERSION: "3.8"
MB_ML_VER: "2010"
py_3.9_32manylinux2010:
MB_PYTHON_VERSION: "3.9"
# Comment this out when the image grows a CPython3.9
AZURE_PYTHON_VERSION: "3.8"
PLAT: "i686"
MB_ML_VER: "2010"
ENV_VARS_PATH: "env_vars_32.sh"
DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}"
py_3.9_64manylinux2010:
MB_PYTHON_VERSION: "3.9"
# Comment this out when the image grows a CPython3.9
AZURE_PYTHON_VERSION: "3.8"
MB_ML_VER: "2010"
DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}"

# manylinux1 wheels
py_3.6_32manylinux1:
MB_PYTHON_VERSION: "3.6"
PLAT: "i686"
MB_ML_VER: "1"
ENV_VARS_PATH: "env_vars_32.sh"
DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}"
py_3.6_64manylinux1:
MB_PYTHON_VERSION: "3.6"
MB_ML_VER: "1"
Expand All @@ -95,6 +111,7 @@ jobs:
PLAT: "i686"
MB_ML_VER: "1"
ENV_VARS_PATH: "env_vars_32.sh"
DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}"
py_3.7_64manylinux1:
MB_PYTHON_VERSION: "3.7"
MB_ML_VER: "1"
Expand All @@ -103,6 +120,7 @@ jobs:
PLAT: "i686"
MB_ML_VER: "1"
ENV_VARS_PATH: "env_vars_32.sh"
DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}"
py_3.8_64manylinux1:
MB_PYTHON_VERSION: "3.8"
MB_ML_VER: "1"
Expand Down
9 changes: 8 additions & 1 deletion azure/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,17 @@ jobs:
- checkout: self
submodules: true

- task: UsePythonVersion@0
inputs:
versionSpec: $(AZURE_PYTHON_VERSION)
displayName: Set python version from AZURE
condition: ne( coalesce (variables['AZURE_PYTHON_VERSION'], 'NONE'), 'NONE')

- task: UsePythonVersion@0
inputs:
versionSpec: $(MB_PYTHON_VERSION)
displayName: Set python version
displayName: Set python version from MB
condition: eq( coalesce (variables['AZURE_PYTHON_VERSION'], 'NONE'), 'NONE')

- bash: |
set -e
Expand Down