From 4dc9fc5259dd4b41640ccfcb53f69cb3e38c4ac8 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 28 Oct 2020 21:03:19 -0500 Subject: [PATCH 1/5] Add Py39 build --- azure-pipelines.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a0177fb..bae336c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -47,6 +47,16 @@ jobs: PYTHON_ARCH: "x64" NP_BUILD_DEP: "1.17.3" NIGHTLY_BUILD: "true" + py_3.9_32: + PYTHON_VERSION: "3.9" + PYTHON_ARCH: "x86" + NP_BUILD_DEP: "1.19.3" + NIGHTLY_BUILD: "true" + py_3.9_64: + PYTHON_VERSION: "3.9" + PYTHON_ARCH: "x64" + NP_BUILD_DEP: "1.17.3" + NIGHTLY_BUILD: "true" - template: azure/posix.yml parameters: @@ -76,6 +86,16 @@ jobs: MB_PYTHON_VERSION: "3.8" NP_BUILD_DEP: "numpy==1.17.3" NIGHTLY_BUILD: "true" + py_3.9_32: + MB_PYTHON_VERSION: "3.9" + PLAT: "i686" + NP_BUILD_DEP: "numpy==9.19.3" + NIGHTLY_BUILD: "true" + py_3.9_64: + MB_PYTHON_VERSION: "3.9" + NP_BUILD_DEP: "numpy==1.19.3" + NIGHTLY_BUILD: "true" + - template: azure/posix.yml parameters: @@ -93,3 +113,7 @@ jobs: MB_PYTHON_VERSION: "3.8" NP_BUILD_DEP: "numpy==1.17.3" NIGHTLY_BUILD: "true" + py_3.9_64: + MB_PYTHON_VERSION: "3.9" + NP_BUILD_DEP: "numpy==1.19.3" + NIGHTLY_BUILD: "true" From e2d1e11b98d9c97734d7d2d8032bfa1c64f824b9 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 28 Oct 2020 21:04:44 -0500 Subject: [PATCH 2/5] fixups --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bae336c..3467593 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -55,7 +55,7 @@ jobs: py_3.9_64: PYTHON_VERSION: "3.9" PYTHON_ARCH: "x64" - NP_BUILD_DEP: "1.17.3" + NP_BUILD_DEP: "1.19.3" NIGHTLY_BUILD: "true" - template: azure/posix.yml @@ -89,7 +89,7 @@ jobs: py_3.9_32: MB_PYTHON_VERSION: "3.9" PLAT: "i686" - NP_BUILD_DEP: "numpy==9.19.3" + NP_BUILD_DEP: "numpy==1.19.3" NIGHTLY_BUILD: "true" py_3.9_64: MB_PYTHON_VERSION: "3.9" From 1721d06930ae69a79cfa0b2f6122b1c2661ec54e Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 29 Oct 2020 05:52:30 -0500 Subject: [PATCH 3/5] update multibuild --- multibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multibuild b/multibuild index 47f4b24..ec386ef 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit 47f4b247be212315313ff72e3daafdff0cbc6c33 +Subproject commit ec386efaa9e6840b552d845dfc4d597f6b97a2b7 From 97b44302a09040a9a8fb962dd35a04423cca58aa Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 29 Oct 2020 06:11:19 -0500 Subject: [PATCH 4/5] set pip_cmd --- extra_functions.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extra_functions.sh b/extra_functions.sh index 6e5f1b6..59e7d17 100644 --- a/extra_functions.sh +++ b/extra_functions.sh @@ -27,3 +27,7 @@ function teardown_test_venv { fi fi } + +# Work around bug in multibuild. This is copied from NumPy-wheels +# https://github.com/MacPython/numpy-wheels/blob/34c2cdaca98d020081f5d03983d1c78b3b2a828c/extra_functions.sh#L50 +if [ ! -o PIP_CMD ]; then PIP_CMD="$PYTHON_EXE -m pip"; fi From 725e0c9ce7f366b79a30fcc8c79c06623ee52a61 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 29 Oct 2020 06:34:37 -0500 Subject: [PATCH 5/5] set pip_cmd in test_venv --- extra_functions.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extra_functions.sh b/extra_functions.sh index 59e7d17..6901609 100644 --- a/extra_functions.sh +++ b/extra_functions.sh @@ -12,6 +12,8 @@ function setup_test_venv { # Note: the idiom "python -m pip install ..." is necessary to upgrade # pip itself on Windows. Otherwise one would get a permission error on # pip.exe. + PYTHON_EXE=python + PIP_CMD="$PYTHON_EXE -m pip" python -m pip install --upgrade pip wheel if [ "$TEST_DEPENDS" != "" ]; then pip install $TEST_DEPENDS