From 3d33caf1548990aff9dadfe08e2b25c43f63b1a4 Mon Sep 17 00:00:00 2001 From: mattip Date: Thu, 6 Aug 2020 00:21:19 +0300 Subject: [PATCH 1/7] add python 3.9 --- .travis.yml | 10 +++++++++- azure-pipelines.yml | 20 ++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 39bf852..97ec8f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: @@ -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} diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e1359b5..3e42440 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -48,6 +48,15 @@ jobs: PYTHON_VERSION: "3.8.x" PYTHON_ARCH: 'x64' BITS: 64 + py_3.9_32: + PYTHON_VERSION: "3.9.x" + PYTHON_ARCH: "x86" + BITS: 32 + py_3.9_64: + PYTHON_VERSION: "3.9.x" + PYTHON_ARCH: 'x64' + BITS: 64 + - template: azure/posix.yml parameters: @@ -106,6 +115,15 @@ jobs: py_3.8_64manylinux1: MB_PYTHON_VERSION: "3.8" MB_ML_VER: "1" + py_3.9_32manylinux1: + MB_PYTHON_VERSION: "3.9" + PLAT: "i686" + MB_ML_VER: "1" + ENV_VARS_PATH: "env_vars_32.sh" + py_3.9_64manylinux1: + MB_PYTHON_VERSION: "3.9" + MB_ML_VER: "1" + - template: azure/posix.yml parameters: @@ -118,3 +136,5 @@ jobs: MB_PYTHON_VERSION: "3.7" py_3.8_64: MB_PYTHON_VERSION: "3.8" + py_3.9_64: + MB_PYTHON_VERSION: "3.9" From 841bb25e71caa6610c4bf7c81ea2412b7c1443af Mon Sep 17 00:00:00 2001 From: mattip Date: Thu, 6 Aug 2020 09:11:20 +0300 Subject: [PATCH 2/7] update windows python version, remove step from posix --- azure-pipelines.yml | 4 ++-- azure/posix.yml | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3e42440..e47aa1e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -49,11 +49,11 @@ jobs: PYTHON_ARCH: 'x64' BITS: 64 py_3.9_32: - PYTHON_VERSION: "3.9.x" + PYTHON_VERSION: "3.9.0-beta.4" PYTHON_ARCH: "x86" BITS: 32 py_3.9_64: - PYTHON_VERSION: "3.9.x" + PYTHON_VERSION: "3.9.0-beta.4" PYTHON_ARCH: 'x64' BITS: 64 diff --git a/azure/posix.yml b/azure/posix.yml index f8ee0f1..be1be16 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -23,11 +23,6 @@ jobs: - checkout: self submodules: true - - task: UsePythonVersion@0 - inputs: - versionSpec: $(MB_PYTHON_VERSION) - displayName: Set python version - - bash: | set -e From 0c8d4d7f751af5778d763368ccb84ff6ba6d2628 Mon Sep 17 00:00:00 2001 From: mattip Date: Thu, 6 Aug 2020 11:44:49 +0300 Subject: [PATCH 3/7] update windows to 2019, re-add python version task --- azure-pipelines.yml | 32 +++++++++++++++++++++----------- azure/posix.yml | 5 +++++ 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e47aa1e..f038176 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -48,12 +48,19 @@ jobs: PYTHON_VERSION: "3.8.x" PYTHON_ARCH: 'x64' BITS: 64 + + - template: azure/windows.yml + parameters: + name: windows + vmImage: windows-2019 py_3.9_32: - PYTHON_VERSION: "3.9.0-beta.4" + # Will use the latest up to 3.9.0 + PYTHON_VERSION: "'3.9.0-alpha - 3.9.0'" PYTHON_ARCH: "x86" BITS: 32 py_3.9_64: - PYTHON_VERSION: "3.9.0-beta.4" + # Will use the latest up to 3.9.0 + PYTHON_VERSION: "'3.9.0-alpha - 3.9.0'" PYTHON_ARCH: 'x64' BITS: 64 @@ -90,6 +97,18 @@ jobs: py_3.8_64: MB_PYTHON_VERSION: "3.8" MB_ML_VER: "2010" + py_3.9_32manylinux2010: + MB_PYTHON_VERSION: "3.9" + AZURE_PYTHON_VERSION: "3.8" + PLAT: "i686" + MB_ML_VER: "2010" + MB_ML_VER: "1" + ENV_VARS_PATH: "env_vars_32.sh" + py_3.9_64manylinux2010: + MB_PYTHON_VERSION: "3.9" + AZURE_PYTHON_VERSION: "3.8" + MB_ML_VER: "2010" + # manylinux1 wheels py_3.6_32manylinux1: MB_PYTHON_VERSION: "3.6" @@ -115,15 +134,6 @@ jobs: py_3.8_64manylinux1: MB_PYTHON_VERSION: "3.8" MB_ML_VER: "1" - py_3.9_32manylinux1: - MB_PYTHON_VERSION: "3.9" - PLAT: "i686" - MB_ML_VER: "1" - ENV_VARS_PATH: "env_vars_32.sh" - py_3.9_64manylinux1: - MB_PYTHON_VERSION: "3.9" - MB_ML_VER: "1" - - template: azure/posix.yml parameters: diff --git a/azure/posix.yml b/azure/posix.yml index be1be16..42e19f7 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -23,6 +23,11 @@ jobs: - checkout: self submodules: true + - task: UsePythonVersion@0 + inputs: + versionSpec: $[coalesce(variables.AZURE_PYTHON_VERSION, variables.MB_PYTHON_VERSION)] + displayName: Set python version + - bash: | set -e From 9082c52da7472bcedb3e39840f2de199b22ddd64 Mon Sep 17 00:00:00 2001 From: mattip Date: Thu, 6 Aug 2020 12:19:16 +0300 Subject: [PATCH 4/7] typo --- azure-pipelines.yml | 6 +++--- azure/posix.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f038176..c584eaf 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -16,7 +16,7 @@ variables: jobs: - template: azure/windows.yml parameters: - name: windows + name: windows2017 vmImage: vs2017-win2016 matrix: py_3.6_32: @@ -51,8 +51,9 @@ jobs: - template: azure/windows.yml parameters: - name: windows + name: windows2019 vmImage: windows-2019 + matrix: py_3.9_32: # Will use the latest up to 3.9.0 PYTHON_VERSION: "'3.9.0-alpha - 3.9.0'" @@ -102,7 +103,6 @@ jobs: AZURE_PYTHON_VERSION: "3.8" PLAT: "i686" MB_ML_VER: "2010" - MB_ML_VER: "1" ENV_VARS_PATH: "env_vars_32.sh" py_3.9_64manylinux2010: MB_PYTHON_VERSION: "3.9" diff --git a/azure/posix.yml b/azure/posix.yml index 42e19f7..ba8b913 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -25,7 +25,7 @@ jobs: - task: UsePythonVersion@0 inputs: - versionSpec: $[coalesce(variables.AZURE_PYTHON_VERSION, variables.MB_PYTHON_VERSION)] + versionSpec: ${{ coalesce(variables.AZURE_PYTHON_VERSION, variables.MB_PYTHON_VERSION) }} displayName: Set python version - bash: | From ce775a4b2798841bae78fc0731127070338b64de Mon Sep 17 00:00:00 2001 From: mattip Date: Thu, 6 Aug 2020 22:57:27 +0300 Subject: [PATCH 5/7] try to get conditional to work 10 --- azure-pipelines.yml | 21 ++------------------- azure/posix.yml | 11 +++++++++-- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c584eaf..a8cc8aa 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -49,23 +49,6 @@ jobs: PYTHON_ARCH: 'x64' BITS: 64 - - template: azure/windows.yml - parameters: - name: windows2019 - vmImage: windows-2019 - matrix: - py_3.9_32: - # Will use the latest up to 3.9.0 - PYTHON_VERSION: "'3.9.0-alpha - 3.9.0'" - PYTHON_ARCH: "x86" - BITS: 32 - py_3.9_64: - # Will use the latest up to 3.9.0 - PYTHON_VERSION: "'3.9.0-alpha - 3.9.0'" - PYTHON_ARCH: 'x64' - BITS: 64 - - - template: azure/posix.yml parameters: name: linux @@ -100,12 +83,14 @@ jobs: 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" 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" @@ -146,5 +131,3 @@ jobs: MB_PYTHON_VERSION: "3.7" py_3.8_64: MB_PYTHON_VERSION: "3.8" - py_3.9_64: - MB_PYTHON_VERSION: "3.9" diff --git a/azure/posix.yml b/azure/posix.yml index ba8b913..145c38e 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -25,8 +25,15 @@ jobs: - task: UsePythonVersion@0 inputs: - versionSpec: ${{ coalesce(variables.AZURE_PYTHON_VERSION, variables.MB_PYTHON_VERSION) }} - displayName: Set python version + 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 from MB + condition: eq( coalesce (variables['AZURE_PYTHON_VERSION'], 'NONE'), 'NONE') - bash: | set -e From 83875a6e15998df52c3c5118f18833083f9756e0 Mon Sep 17 00:00:00 2001 From: mattip Date: Fri, 7 Aug 2020 00:09:24 +0300 Subject: [PATCH 6/7] use xenial image for testing since trusty does not have python3.9 --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a8cc8aa..240e65e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -88,11 +88,13 @@ jobs: 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: From b399891e36a5a087d23c63c6d0bb5842a203e98c Mon Sep 17 00:00:00 2001 From: mattip Date: Fri, 7 Aug 2020 00:14:22 +0300 Subject: [PATCH 7/7] use xenial image for testing on 32 bit manylinux1 --- azure-pipelines.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 240e65e..2b393c1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -102,6 +102,7 @@ jobs: 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" @@ -110,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" @@ -118,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"