From cf0738eb3fe5748184ecbc7bcab7c8e31982e180 Mon Sep 17 00:00:00 2001 From: Charles Harris Date: Wed, 14 Oct 2020 19:28:10 -0600 Subject: [PATCH] Further experiments with manylinux 3.9 --- .travis.yml | 60 +++++++------- azure-pipelines.yml | 193 ++++++++++++++++++++++++-------------------- 2 files changed, 134 insertions(+), 119 deletions(-) diff --git a/.travis.yml b/.travis.yml index 97ec8f2..f88d6b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,12 +16,12 @@ os: linux jobs: include: - - os: linux - arch: x86_64 - env: - - MB_PYTHON_VERSION=pypy3.6-7.3.1 - - MB_ML_VER=2010 - - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} + #- os: linux + #arch: x86_64 + #env: + #- MB_PYTHON_VERSION=pypy3.6-7.3.1 + #- MB_ML_VER=2010 + #- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} # The manylinux2014 arm64 image has libbz2.so.1 and libbz.so.1.0.6 but not # libbz2.so.1.0, leading to this error with pypy: @@ -47,30 +47,30 @@ jobs: # - MB_PYTHON_VERSION=pypy3.6-7.3.1 # - MB_PYTHON_OSX_VER=10.9 - - os: linux - arch: arm64 - env: - - PLAT=aarch64 - - MB_ML_VER=2014 - - 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: - - PLAT=aarch64 - - MB_ML_VER=2014 - - MB_PYTHON_VERSION=3.8 - - DEBUG_PRINT=1 - - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} + #- os: linux + #arch: arm64 + #env: + #- PLAT=aarch64 + #- MB_ML_VER=2014 + #- 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: + #- PLAT=aarch64 + #- MB_ML_VER=2014 + #- MB_PYTHON_VERSION=3.8 + #- DEBUG_PRINT=1 + #- DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} - os: linux arch: arm64 env: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1564711..dd6220f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,35 +19,35 @@ jobs: name: windows2017 vmImage: vs2017-win2016 matrix: - py_3.6_32: - PYTHON_VERSION: "3.6.x" - PYTHON_ARCH: "x86" - BITS: 32 - pypy_3.6_32: - PYTHON_VERSION: "PyPy3.6" - PYTHON_ARCH: "x86" - BITS: 32 - EXTRA_ARGV: "'-m', 'not slow'" - py_3.6_64: - PYTHON_VERSION: "3.6.x" - PYTHON_ARCH: 'x64' - BITS: 64 - py_3.7_32: - PYTHON_VERSION: "3.7.x" - PYTHON_ARCH: "x86" - BITS: 32 - py_3.7_64: - PYTHON_VERSION: "3.7.x" - PYTHON_ARCH: 'x64' - BITS: 64 - py_3.8_32: - PYTHON_VERSION: "3.8.x" - PYTHON_ARCH: "x86" - BITS: 32 - py_3.8_64: - PYTHON_VERSION: "3.8.x" - PYTHON_ARCH: 'x64' - BITS: 64 + #py_3.6_32: + #PYTHON_VERSION: "3.6.x" + #PYTHON_ARCH: "x86" + #BITS: 32 + #pypy_3.6_32: + #PYTHON_VERSION: "PyPy3.6" + #PYTHON_ARCH: "x86" + #BITS: 32 + #EXTRA_ARGV: "'-m', 'not slow'" + #py_3.6_64: + #PYTHON_VERSION: "3.6.x" + #PYTHON_ARCH: 'x64' + #BITS: 64 + #py_3.7_32: + #PYTHON_VERSION: "3.7.x" + #PYTHON_ARCH: "x86" + #BITS: 32 + #py_3.7_64: + #PYTHON_VERSION: "3.7.x" + #PYTHON_ARCH: 'x64' + #BITS: 64 + #py_3.8_32: + #PYTHON_VERSION: "3.8.x" + #PYTHON_ARCH: "x86" + #BITS: 32 + #py_3.8_64: + #PYTHON_VERSION: "3.8.x" + #PYTHON_ARCH: 'x64' + #BITS: 64 py_3.9_32: PYTHON_VERSION: "3.9.x" PYTHON_ARCH: "x86" @@ -62,33 +62,33 @@ jobs: name: linux vmImage: ubuntu-18.04 matrix: - py_3.6_32: - MB_PYTHON_VERSION: "3.6" - PLAT: "i686" - MB_ML_VER: "2010" - ENV_VARS_PATH: "env_vars_32.sh" - DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}" - py_3.6_64: - MB_PYTHON_VERSION: "3.6" - MB_ML_VER: "2010" - py_3.7_32: - MB_PYTHON_VERSION: "3.7" - PLAT: "i686" - MB_ML_VER: "2010" - ENV_VARS_PATH: "env_vars_32.sh" - DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}" - py_3.7_64: - MB_PYTHON_VERSION: "3.7" - MB_ML_VER: "2010" - py_3.8_32: - MB_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.8_64: - MB_PYTHON_VERSION: "3.8" - MB_ML_VER: "2010" + #py_3.6_32: + #MB_PYTHON_VERSION: "3.6" + #PLAT: "i686" + #MB_ML_VER: "2010" + #ENV_VARS_PATH: "env_vars_32.sh" + #DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}" + #py_3.6_64: + #MB_PYTHON_VERSION: "3.6" + #MB_ML_VER: "2010" + #py_3.7_32: + #MB_PYTHON_VERSION: "3.7" + #PLAT: "i686" + #MB_ML_VER: "2010" + #ENV_VARS_PATH: "env_vars_32.sh" + #DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}" + #py_3.7_64: + #MB_PYTHON_VERSION: "3.7" + #MB_ML_VER: "2010" + #py_3.8_32: + #MB_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.8_64: + #MB_PYTHON_VERSION: "3.8" + #MB_ML_VER: "2010" py_3.9_32manylinux2010: MB_PYTHON_VERSION: "3.9" PLAT: "i686" @@ -101,44 +101,59 @@ jobs: 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" - py_3.7_32manylinux1: - MB_PYTHON_VERSION: "3.7" - 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" - py_3.8_32manylinux1: - MB_PYTHON_VERSION: "3.8" - 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" + #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" + #py_3.7_32manylinux1: + #MB_PYTHON_VERSION: "3.7" + #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" + #py_3.8_32manylinux1: + #MB_PYTHON_VERSION: "3.8" + #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" + #py_3.9_32manylinux1: + #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: "1" + #ENV_VARS_PATH: "env_vars_32.sh" + #DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}" + #py_3.9_64manylinux1: + #MB_PYTHON_VERSION: "3.9" + ## Comment this out when the image grows a CPython3.9 + #AZURE_PYTHON_VERSION: "3.8" + #MB_ML_VER: "1" - template: azure/posix.yml parameters: name: macOS vmImage: macOS-10.14 matrix: - py_3.6_64: - MB_PYTHON_VERSION: "3.6" - py_3.7_64: - MB_PYTHON_VERSION: "3.7" - py_3.8_64: - MB_PYTHON_VERSION: "3.8" + #py_3.6_64: + #MB_PYTHON_VERSION: "3.6" + #py_3.7_64: + #MB_PYTHON_VERSION: "3.7" + #py_3.8_64: + #MB_PYTHON_VERSION: "3.8" py_3.9_64: MB_PYTHON_VERSION: "3.9" + # Comment this out when the image grows a CPython3.9 + #AZURE_PYTHON_VERSION: "3.9"