From 47024329ce7512d757e8487c09bffa3878166cb7 Mon Sep 17 00:00:00 2001 From: mattip Date: Sun, 29 Nov 2020 23:53:23 +0200 Subject: [PATCH 01/10] add azure CI, temporarily disable others --- appveyor.yml => _appveyor.yml | 0 .travis.yml => _travis.yml.backup | 0 azure-pipelines.yml | 86 ++++++++++++++++---- azure-posix.yml | 128 ++++++++++++++++++++++++++++++ 4 files changed, 199 insertions(+), 15 deletions(-) rename appveyor.yml => _appveyor.yml (100%) rename .travis.yml => _travis.yml.backup (100%) create mode 100644 azure-posix.yml diff --git a/appveyor.yml b/_appveyor.yml similarity index 100% rename from appveyor.yml rename to _appveyor.yml diff --git a/.travis.yml b/_travis.yml.backup similarity index 100% rename from .travis.yml rename to _travis.yml.backup diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ac078ef..3e44578 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,19 +1,75 @@ -# Starter pipeline -# Start with a minimal pipeline that you can customize to build and deploy your code. -# Add steps that build, run tests, deploy, and more: -# https://aka.ms/yaml +schedules: +- cron: "27 3 * * 0" + # 3:27am UTC every Sunday + displayName: Weekly build + branches: + include: + - master + always: true -trigger: -- main +pr: +- master -pool: - vmImage: 'ubuntu-latest' +variables: + BUILD_COMMIT: "master" -steps: -- script: echo Hello, world! - displayName: 'Run a one-line script' +jobs: + - template: azure-posix.yml + parameters: + name: linux + vmImage: ubuntu-18.04 + matrix: + amd64-linux-py39: + MB_PYTHON_VERSION: "3.9" + NP_BUILD_DEP: "numpy==1.19.1" + NP_TEST_DEP: "numpy==1.19.1" + 32bit-amd64-linux-py39: + MB_PYTHON_VERSION: "3.9" + NP_BUILD_DEP: "numpy==1.19.1" + NP_TEST_DEP: "numpy==1.19.1" + PLAT: "i686" + amd64-linux-py38: + MB_PYTHON_VERSION: "3.8" + NP_BUILD_DEP: "numpy==1.17.3" + NP_TEST_DEP: "numpy==1.17.3" + CYTHON_BUILD_DEP: "Cython" + 32bit-amd64-linux-py38: + MB_PYTHON_VERSION: "3.8" + NP_BUILD_DEP: "numpy==1.17.3" + NP_TEST_DEP: "numpy==1.17.3" + CYTHON_BUILD_DEP: "Cython" + PLAT: "i686" + amd64-linux-py37: + MB_PYTHON_VERSION: "3.7" + NP_BUILD_DEP: "numpy==1.16.5" + NP_TEST_DEP: "numpy==1.16.5" + CYTHON_BUILD_DEP: "Cython" + 32bit-amd64-linux-py37: + MB_PYTHON_VERSION: "3.7" + NP_BUILD_DEP: "numpy==1.16.5" + NP_TEST_DEP: "numpy==1.16.5" + CYTHON_BUILD_DEP: "Cython" + PLAT: "i686" -- script: | - echo Add other tasks to build, test, and deploy your project. - echo See https://aka.ms/yaml - displayName: 'Run a multi-line script' + - template: azure-posix.yml + parameters: + name: macOS + vmImage: macOS-10.14 + matrix: + osx-Py37: + MB_PYTHON_VERSION: "3.7" + NP_BUILD_DEP: "numpy==1.16.5" + NP_TEST_DEP: "numpy==1.16.5" + CYTHON_BUILD_DEP: "Cython" + osx-Py38: + MB_PYTHON_VERSION: "3.8" + NP_BUILD_DEP: "numpy==1.17.3" + NP_TEST_DEP: "numpy==1.17.3" + CYTHON_BUILD_DEP: "Cython" + MB_PYTHON_OSX_VER: "10.9" + osx-Py39: + MB_PYTHON_VERSION: "3.9" + NP_BUILD_DEP: "numpy==1.19.1" + NP_TEST_DEP: "numpy==1.19.1" + CYTHON_BUILD_DEP: "Cython" + MB_PYTHON_OSX_VER: "10.9" diff --git a/azure-posix.yml b/azure-posix.yml new file mode 100644 index 0000000..319c4ce --- /dev/null +++ b/azure-posix.yml @@ -0,0 +1,128 @@ +parameters: + name: "" + vmImage: "" + matrix: [] + +jobs: + - job: ${{ parameters.name }} + pool: + vmImage: ${{ parameters.vmImage }} + variables: + REPO_DIR: "scipy" + PLAT: "x86_64" + CYTHON_BUILD_DEP: "cython==0.29.18" + PYBIND11_BUILD_DEP: "pybind11==2.4.3" + NP_BUILD_DEP: "numpy==1.16.5" + NIGHTLY_BUILD_COMMIT: "master" + DAILY_COMMIT: "master" + strategy: + matrix: + ${{ insert }}: ${{ parameters.matrix }} + + steps: + - 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 from MB + condition: eq( coalesce (variables['AZURE_PYTHON_VERSION'], 'NONE'), 'NONE') + + - bash: | + set -e + + if [ "$BUILD_REASON" == "Schedule" ]; then + BUILD_COMMIT=$NIGHTLY_BUILD_COMMIT + fi + echo "Building numpy@$BUILD_COMMIT" + echo "##vso[task.setvariable variable=BUILD_COMMIT]$BUILD_COMMIT" + + # Platform variables used in multibuild scripts + if [ `uname` == 'Darwin' ]; then + echo "##vso[task.setvariable variable=TRAVIS_OS_NAME]osx" + echo "##vso[task.setvariable variable=MACOSX_DEPLOYMENT_TARGET]10.9" + else + echo "##vso[task.setvariable variable=TRAVIS_OS_NAME]linux" + fi + + # Store original Python path to be able to create test_venv pointing + # to same Python version. + PYTHON_EXE=`which python` + echo "##vso[task.setvariable variable=PYTHON_EXE]$PYTHON_EXE" + displayName: Define build env variables + + - bash: | + set -e + echo $BUILD_COMMIT + pip install virtualenv wheel + BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $PYBIND11_BUILD_DEP" + + source multibuild/common_utils.sh + source multibuild/travis_steps.sh + + before_install + + clean_code $REPO_DIR $BUILD_COMMIT + ./patch_code.sh $REPO_DIR + build_wheel $REPO_DIR $PLAT + displayName: Build wheel + + - bash: | + set -e + source multibuild/common_utils.sh + source multibuild/travis_steps.sh + source extra_functions.sh + setup_test_venv + install_run $PLAT + teardown_test_venv + displayName: Install wheel and test + + - bash: | + echo "##vso[task.prependpath]$CONDA/bin" + sudo chown -R $USER $CONDA + displayName: Add conda to PATH + + - bash: conda install -q -y anaconda-client + displayName: Install anaconda-client + + - bash: | + set -e + if [ "$BUILD_COMMIT" == "master" ]; then + ANACONDA_ORG="scipy-wheels-nightly" + TOKEN="$MAPPED_NUMPY_NIGHTLY_UPLOAD_TOKEN" + else + ANACONDA_ORG="multibuild-wheels-staging" + TOKEN="$MAPPED_NUMPY_STAGING_UPLOAD_TOKEN" + fi + if [ "$TOKEN" == "" -o "${TOKEN:0:7}" == "\$(NUMPY" ]; then + echo "##[warning] Could not find anaconda.org upload token in secret variables" + TOKEN="" + fi + echo "##vso[task.setvariable variable=TOKEN]$TOKEN" + echo "##vso[task.setvariable variable=ANACONDA_ORG]$ANACONDA_ORG" + displayName: Retrieve secret upload token + env: + # Secret variables need to mapped to env variables explicitly: + MAPPED_NUMPY_NIGHTLY_UPLOAD_TOKEN: $(NUMPY_NIGHTLY_UPLOAD_TOKEN) + MAPPED_NUMPY_STAGING_UPLOAD_TOKEN: $(NUMPY_STAGING_UPLOAD_TOKEN) + + - bash: | + set -e + if [ $ANACONDA_ORG == "scipy-wheels-nightly" ]; then + source extra_functions.sh + for f in wheelhouse/*.whl; do rename_wheel $f; done + fi + + echo uploading wheelhouse/*.whl + + anaconda -t $TOKEN upload -u $ANACONDA_ORG wheelhouse/*.whl + echo "PyPI-style index: https://pypi.anaconda.org/$ANACONDA_ORG/simple" + displayName: Upload to anaconda.org (only if secret token is retrieved) + condition: ne(variables['TOKEN'], '') From fb450b9e887a1a66560117dadbfa9c93d414e186 Mon Sep 17 00:00:00 2001 From: mattip Date: Mon, 30 Nov 2020 00:52:03 +0200 Subject: [PATCH 02/10] remove cruft from numpy-wheels --- azure-posix.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/azure-posix.yml b/azure-posix.yml index 319c4ce..416c660 100644 --- a/azure-posix.yml +++ b/azure-posix.yml @@ -79,9 +79,7 @@ jobs: source multibuild/common_utils.sh source multibuild/travis_steps.sh source extra_functions.sh - setup_test_venv install_run $PLAT - teardown_test_venv displayName: Install wheel and test - bash: | From 9b2dd12c31ada61210fbc055980442ac59b5b9f7 Mon Sep 17 00:00:00 2001 From: mattip Date: Mon, 30 Nov 2020 08:45:16 +0200 Subject: [PATCH 03/10] add TEST_DEPENDS --- azure-posix.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-posix.yml b/azure-posix.yml index 416c660..7fceedb 100644 --- a/azure-posix.yml +++ b/azure-posix.yml @@ -63,6 +63,7 @@ jobs: echo $BUILD_COMMIT pip install virtualenv wheel BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $PYBIND11_BUILD_DEP" + TEST_DEPENDS="$NP_TEST_DEP pytest pytest-xdist pytest-faulthandler pytest-env" source multibuild/common_utils.sh source multibuild/travis_steps.sh From 3fca1889e8bdcdc0065ef5f5435ac0a7fc66fd02 Mon Sep 17 00:00:00 2001 From: mattip Date: Mon, 30 Nov 2020 09:23:31 +0200 Subject: [PATCH 04/10] depend on pyproject.toml for build, move TEST_DEPENDS --- azure-pipelines.yml | 25 ------------------------- azure-posix.yml | 6 +----- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3e44578..a30a8c0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,34 +21,18 @@ jobs: matrix: amd64-linux-py39: MB_PYTHON_VERSION: "3.9" - NP_BUILD_DEP: "numpy==1.19.1" - NP_TEST_DEP: "numpy==1.19.1" 32bit-amd64-linux-py39: MB_PYTHON_VERSION: "3.9" - NP_BUILD_DEP: "numpy==1.19.1" - NP_TEST_DEP: "numpy==1.19.1" PLAT: "i686" amd64-linux-py38: MB_PYTHON_VERSION: "3.8" - NP_BUILD_DEP: "numpy==1.17.3" - NP_TEST_DEP: "numpy==1.17.3" - CYTHON_BUILD_DEP: "Cython" 32bit-amd64-linux-py38: MB_PYTHON_VERSION: "3.8" - NP_BUILD_DEP: "numpy==1.17.3" - NP_TEST_DEP: "numpy==1.17.3" - CYTHON_BUILD_DEP: "Cython" PLAT: "i686" amd64-linux-py37: MB_PYTHON_VERSION: "3.7" - NP_BUILD_DEP: "numpy==1.16.5" - NP_TEST_DEP: "numpy==1.16.5" - CYTHON_BUILD_DEP: "Cython" 32bit-amd64-linux-py37: MB_PYTHON_VERSION: "3.7" - NP_BUILD_DEP: "numpy==1.16.5" - NP_TEST_DEP: "numpy==1.16.5" - CYTHON_BUILD_DEP: "Cython" PLAT: "i686" - template: azure-posix.yml @@ -58,18 +42,9 @@ jobs: matrix: osx-Py37: MB_PYTHON_VERSION: "3.7" - NP_BUILD_DEP: "numpy==1.16.5" - NP_TEST_DEP: "numpy==1.16.5" - CYTHON_BUILD_DEP: "Cython" osx-Py38: MB_PYTHON_VERSION: "3.8" - NP_BUILD_DEP: "numpy==1.17.3" - NP_TEST_DEP: "numpy==1.17.3" - CYTHON_BUILD_DEP: "Cython" MB_PYTHON_OSX_VER: "10.9" osx-Py39: MB_PYTHON_VERSION: "3.9" - NP_BUILD_DEP: "numpy==1.19.1" - NP_TEST_DEP: "numpy==1.19.1" - CYTHON_BUILD_DEP: "Cython" MB_PYTHON_OSX_VER: "10.9" diff --git a/azure-posix.yml b/azure-posix.yml index 7fceedb..2796424 100644 --- a/azure-posix.yml +++ b/azure-posix.yml @@ -10,9 +10,6 @@ jobs: variables: REPO_DIR: "scipy" PLAT: "x86_64" - CYTHON_BUILD_DEP: "cython==0.29.18" - PYBIND11_BUILD_DEP: "pybind11==2.4.3" - NP_BUILD_DEP: "numpy==1.16.5" NIGHTLY_BUILD_COMMIT: "master" DAILY_COMMIT: "master" strategy: @@ -62,8 +59,6 @@ jobs: set -e echo $BUILD_COMMIT pip install virtualenv wheel - BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $PYBIND11_BUILD_DEP" - TEST_DEPENDS="$NP_TEST_DEP pytest pytest-xdist pytest-faulthandler pytest-env" source multibuild/common_utils.sh source multibuild/travis_steps.sh @@ -77,6 +72,7 @@ jobs: - bash: | set -e + TEST_DEPENDS="oldest-supported-numpy pytest pytest-xdist pytest-faulthandler pytest-env" source multibuild/common_utils.sh source multibuild/travis_steps.sh source extra_functions.sh From 36e7cde5feefdb45c82cd648aedc697696eb1a1e Mon Sep 17 00:00:00 2001 From: mattip Date: Mon, 30 Nov 2020 10:30:08 +0200 Subject: [PATCH 05/10] use BUILD_DEPENDS copied from pyproject.toml --- azure-posix.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/azure-posix.yml b/azure-posix.yml index 2796424..2058682 100644 --- a/azure-posix.yml +++ b/azure-posix.yml @@ -38,7 +38,7 @@ jobs: if [ "$BUILD_REASON" == "Schedule" ]; then BUILD_COMMIT=$NIGHTLY_BUILD_COMMIT fi - echo "Building numpy@$BUILD_COMMIT" + echo "Building scipy@$BUILD_COMMIT" echo "##vso[task.setvariable variable=BUILD_COMMIT]$BUILD_COMMIT" # Platform variables used in multibuild scripts @@ -57,8 +57,9 @@ jobs: - bash: | set -e - echo $BUILD_COMMIT + echo building for commit "$BUILD_COMMIT" pip install virtualenv wheel + BUILD_DEPENDS="setuptools wheel oldest-supported-numpy Cython>=0.29.18 pybind11>=2.4.3" source multibuild/common_utils.sh source multibuild/travis_steps.sh From 6e1c6b05d15c330eda8c1047e74e9f2807ba0e6a Mon Sep 17 00:00:00 2001 From: mattip Date: Mon, 30 Nov 2020 12:11:34 +0200 Subject: [PATCH 06/10] upgrade setuptools, add more verbose scripting --- azure-posix.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-posix.yml b/azure-posix.yml index 2058682..2e21900 100644 --- a/azure-posix.yml +++ b/azure-posix.yml @@ -58,8 +58,8 @@ jobs: - bash: | set -e echo building for commit "$BUILD_COMMIT" - pip install virtualenv wheel - BUILD_DEPENDS="setuptools wheel oldest-supported-numpy Cython>=0.29.18 pybind11>=2.4.3" + pip install --upgrade virtualenv wheel setuptools + BUILD_DEPENDS="wheel oldest-supported-numpy Cython>=0.29.18 pybind11>=2.4.3" source multibuild/common_utils.sh source multibuild/travis_steps.sh @@ -72,7 +72,7 @@ jobs: displayName: Build wheel - bash: | - set -e + set -xe TEST_DEPENDS="oldest-supported-numpy pytest pytest-xdist pytest-faulthandler pytest-env" source multibuild/common_utils.sh source multibuild/travis_steps.sh From b9213e7493290662cf84e68dbc4f96fcc6169416 Mon Sep 17 00:00:00 2001 From: mattip Date: Mon, 30 Nov 2020 14:36:27 +0200 Subject: [PATCH 07/10] use PYTHON_EXE not python --- config.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config.sh b/config.sh index f8cb486..275b047 100644 --- a/config.sh +++ b/config.sh @@ -69,21 +69,21 @@ function run_tests { local testmode="fast" fi # Check bundled license file - python ../check_installed_package.py + $PYTHON_EXE ../check_installed_package.py # Run tests if [[ -z "$IS_OSX" && `uname -m` != 'aarch64' ]]; then - python ../run_scipy_tests.py $testmode -- -n2 -rfEX + $PYTHON_EXE ../run_scipy_tests.py $testmode -- -n2 -rfEX else - python ../run_scipy_tests.py $testmode -- -n8 -rfEX + $PYTHON_EXE ../run_scipy_tests.py $testmode -- -n8 -rfEX fi # Show BLAS / LAPACK used - python -c 'import scipy; scipy.show_config()' + $PYTHON_EXE -c 'import scipy; scipy.show_config()' } function install_run { # Override multibuild test running command, to preinstall packages # that have to be installed before TEST_DEPENDS. - pip install $(pip_opts) setuptools_scm + $PYTHON_EXE -m pip install $(pip_opts) setuptools_scm # Copypaste from multibuild/common_utils.sh:install_run install_wheel From 47b811f10f9d02dc5241e773f2b794a82b4ce5fb Mon Sep 17 00:00:00 2001 From: mattip Date: Mon, 30 Nov 2020 14:54:55 +0200 Subject: [PATCH 08/10] define PIP_CMD --- config.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/config.sh b/config.sh index 275b047..f40ce5c 100644 --- a/config.sh +++ b/config.sh @@ -83,6 +83,7 @@ function run_tests { function install_run { # Override multibuild test running command, to preinstall packages # that have to be installed before TEST_DEPENDS. + PIP_CMD="$PYTHON_EXE -m pip" $PYTHON_EXE -m pip install $(pip_opts) setuptools_scm # Copypaste from multibuild/common_utils.sh:install_run From 4adda6f800f954cbc8d86fa88b34b9d53380914b Mon Sep 17 00:00:00 2001 From: mattip Date: Wed, 2 Dec 2020 15:11:06 +0200 Subject: [PATCH 09/10] add tokens, remove linux. macos from travis --- _travis.yml.backup | 72 ---------------------------------------------- azure-posix.yml | 8 +++--- 2 files changed, 4 insertions(+), 76 deletions(-) diff --git a/_travis.yml.backup b/_travis.yml.backup index f1da361..03a9651 100644 --- a/_travis.yml.backup +++ b/_travis.yml.backup @@ -6,7 +6,6 @@ env: - PLAT=x86_64 - NP_BUILD_DEP="numpy==1.16.5" - CYTHON_BUILD_DEP="Cython==0.29.18" - - PYBIND11_BUILD_DEP="pybind11==2.4.3" - NP_TEST_DEP="numpy==1.16.5" - UNICODE_WIDTH=32 - MANYLINUX_URL="https://5cf40426d9f06eb7461d-6fe47d9331aba7cd62fc36c7196769e4.ssl.cf2.rackcdn.com" @@ -92,77 +91,6 @@ jobs: - wheelhouse after_success: - echo "This stage will not upload aarch64 wheel" - - os: linux - name: amd64-Linux-Py39 - env: - - MB_PYTHON_VERSION=3.9 - - NP_BUILD_DEP=numpy==1.19.1 - - NP_TEST_DEP=numpy==1.19.1 - - os: linux - name: 32bit-amd64-Linux-Py39 - env: - - MB_PYTHON_VERSION=3.9 - - PLAT=i686 - - NP_BUILD_DEP=numpy==1.19.3 - - NP_TEST_DEP=numpy==1.19.3 - - os: linux - name: amd64-Linux-Py37 - env: - - MB_PYTHON_VERSION=3.7 - - NP_BUILD_DEP=numpy==1.16.5 - - NP_TEST_DEP=numpy==1.16.5 - - CYTHON_BUILD_DEP="Cython" - - os: linux - name: amd64-Linux-Py38 - env: - - MB_PYTHON_VERSION=3.8 - - NP_BUILD_DEP=numpy==1.17.3 - - NP_TEST_DEP=numpy==1.17.3 - - CYTHON_BUILD_DEP="Cython" - - os: linux - name: 32bit-amd64-Linux-Py38 - env: - - MB_PYTHON_VERSION=3.8 - - PLAT=i686 - - NP_BUILD_DEP=numpy==1.17.3 - - NP_TEST_DEP=numpy==1.17.3 - - CYTHON_BUILD_DEP="Cython" - - os: linux - name: 32bit-amd64-Linux-Py37 - env: - - MB_PYTHON_VERSION=3.7 - - PLAT=i686 - - NP_BUILD_DEP=numpy==1.16.5 - - NP_TEST_DEP=numpy==1.16.5 - - CYTHON_BUILD_DEP="Cython" - - os: osx - name: osx-Py37 - language: generic - env: - - MB_PYTHON_VERSION=3.7 - - NP_BUILD_DEP=numpy==1.16.5 - - NP_TEST_DEP=numpy==1.16.5 - - CYTHON_BUILD_DEP="Cython" - - os: osx - name: osx-Py38 - language: generic - osx_image: xcode10.1 - env: - - MB_PYTHON_VERSION=3.8 - - NP_BUILD_DEP=numpy==1.17.3 - - NP_TEST_DEP=numpy==1.17.3 - - CYTHON_BUILD_DEP="Cython" - - MB_PYTHON_OSX_VER=10.9 - - os: osx - name: osx-Py39 - language: generic - osx_image: xcode10.1 - env: - - MB_PYTHON_VERSION=3.9 - - NP_BUILD_DEP=numpy==1.19.1 - - NP_TEST_DEP=numpy==1.19.1 - - CYTHON_BUILD_DEP="Cython" - - MB_PYTHON_OSX_VER=10.9 - stage: Test wheel name: ARM64-Linux-Py37 diff --git a/azure-posix.yml b/azure-posix.yml index 2e21900..d76625d 100644 --- a/azure-posix.yml +++ b/azure-posix.yml @@ -92,10 +92,10 @@ jobs: set -e if [ "$BUILD_COMMIT" == "master" ]; then ANACONDA_ORG="scipy-wheels-nightly" - TOKEN="$MAPPED_NUMPY_NIGHTLY_UPLOAD_TOKEN" + TOKEN="$MAPPED_SCIPY_NIGHTLY_UPLOAD_TOKEN" else ANACONDA_ORG="multibuild-wheels-staging" - TOKEN="$MAPPED_NUMPY_STAGING_UPLOAD_TOKEN" + TOKEN="$MAPPED_SCIPY_STAGING_UPLOAD_TOKEN" fi if [ "$TOKEN" == "" -o "${TOKEN:0:7}" == "\$(NUMPY" ]; then echo "##[warning] Could not find anaconda.org upload token in secret variables" @@ -106,8 +106,8 @@ jobs: displayName: Retrieve secret upload token env: # Secret variables need to mapped to env variables explicitly: - MAPPED_NUMPY_NIGHTLY_UPLOAD_TOKEN: $(NUMPY_NIGHTLY_UPLOAD_TOKEN) - MAPPED_NUMPY_STAGING_UPLOAD_TOKEN: $(NUMPY_STAGING_UPLOAD_TOKEN) + MAPPED_SCIPY_NIGHTLY_UPLOAD_TOKEN: $(SCIPY_NIGHTLY_UPLOAD_TOKEN) + MAPPED_SCIPY_STAGING_UPLOAD_TOKEN: $(SCIPY_STAGING_UPLOAD_TOKEN) - bash: | set -e From 61155feba7ce737bf67bfd63ea91956acc226a34 Mon Sep 17 00:00:00 2001 From: mattip Date: Thu, 3 Dec 2020 07:49:34 +0200 Subject: [PATCH 10/10] tweak travis.yml backup, revive appveyor.yml --- _travis.yml.backup | 13 +++---------- _appveyor.yml => appveyor.yml | 0 2 files changed, 3 insertions(+), 10 deletions(-) rename _appveyor.yml => appveyor.yml (100%) diff --git a/_travis.yml.backup b/_travis.yml.backup index 03a9651..ba0d861 100644 --- a/_travis.yml.backup +++ b/_travis.yml.backup @@ -4,9 +4,8 @@ env: # Also see DAILY_COMMIT below - BUILD_COMMIT=master - PLAT=x86_64 - - NP_BUILD_DEP="numpy==1.16.5" - CYTHON_BUILD_DEP="Cython==0.29.18" - - NP_TEST_DEP="numpy==1.16.5" + - PYBIND11_BUILD_DEP="pybind11==2.4.3" - UNICODE_WIDTH=32 - MANYLINUX_URL="https://5cf40426d9f06eb7461d-6fe47d9331aba7cd62fc36c7196769e4.ssl.cf2.rackcdn.com" - WHEELHOUSE_UPLOADER_USERNAME=travis-worker @@ -37,7 +36,6 @@ jobs: env: - MB_PYTHON_VERSION=3.7 - PLAT=aarch64 - - NP_BUILD_DEP=numpy==1.19.1 - CYTHON_BUILD_DEP="Cython" - DOCKER_IMAGE=quay.io/pypa/manylinux2014_${PLAT} script: @@ -58,7 +56,6 @@ jobs: env: - MB_PYTHON_VERSION=3.8 - PLAT=aarch64 - - NP_BUILD_DEP=numpy==1.19.1 - CYTHON_BUILD_DEP="Cython" - DOCKER_IMAGE=quay.io/pypa/manylinux2014_${PLAT} script: @@ -79,7 +76,6 @@ jobs: env: - MB_PYTHON_VERSION=3.9 - PLAT=aarch64 - - NP_BUILD_DEP=numpy==1.19.1 - CYTHON_BUILD_DEP="Cython" - DOCKER_IMAGE=quay.io/pypa/manylinux2014_${PLAT} script: @@ -101,7 +97,6 @@ jobs: env: - MB_PYTHON_VERSION=3.7 - PLAT=aarch64 - - NP_TEST_DEP=numpy==1.19.1 - CYTHON_BUILD_DEP="Cython" - DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8 workspaces: @@ -116,7 +111,6 @@ jobs: env: - MB_PYTHON_VERSION=3.9 - PLAT=aarch64 - - NP_TEST_DEP=numpy==1.19.1 - CYTHON_BUILD_DEP="Cython" - DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8 workspaces: @@ -131,7 +125,6 @@ jobs: env: - MB_PYTHON_VERSION=3.8 - PLAT=aarch64 - - NP_TEST_DEP=numpy==1.19.1 - CYTHON_BUILD_DEP="Cython" - DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8 workspaces: @@ -147,8 +140,8 @@ before_install: CONTAINER=wheels; UPLOAD_ARGS="--no-update-index"; fi - - BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $PYBIND11_BUILD_DEP" - - TEST_DEPENDS="$NP_TEST_DEP pytest pytest-xdist pytest-faulthandler pytest-env" + - BUILD_DEPENDS="wheel oldest-supported-numpy $CYTHON_BUILD_DEP $PYBIND11_BUILD_DEP" + - TEST_DEPENDS="oldest-supported-numpy pytest pytest-xdist pytest-faulthandler pytest-env" - source multibuild/common_utils.sh - source multibuild/travis_steps.sh - before_install diff --git a/_appveyor.yml b/appveyor.yml similarity index 100% rename from _appveyor.yml rename to appveyor.yml