From f1a102beb9b4a4179c64ce7223816d6546860470 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Tue, 5 Mar 2019 10:08:17 -0500 Subject: [PATCH 001/194] ENH Enable Azure pipelines Enable Azure fully --- azure-pipelines.yml | 113 ++++++++++++++++++++++++++++++++++++++++++++ azure/posix.yml | 92 ++++++++++++++++++++++++++++++++++++ azure/windows.yml | 88 ++++++++++++++++++++++++++++++++++ 3 files changed, 293 insertions(+) create mode 100644 azure-pipelines.yml create mode 100644 azure/posix.yml create mode 100644 azure/windows.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 00000000..333c6e51 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,113 @@ +jobs: +- template: azure/posix.yml + parameters: + name: linux + vmImage: ubuntu-16.04 + matrix: + py_2.7_64_uni_32: + MB_PYTHON_VERSION: '2.7' + py_2.7_64_uni_16: + MB_PYTHON_VERSION: '2.7' + UNICODE_WIDTH: '16' + py_2.7_32_uni_32: + MB_PYTHON_VERSION: '2.7' + PLAT: 'i686' + py_2.7_32_uni_16: + MB_PYTHON_VERSION: '2.7' + PLAT: 'i686' + UNICODE_WIDTH: '16' + py_3.4_64: + MB_PYTHON_VERSION: '3.4' + NP_BUILD_DEP: 'numpy==1.9.3' + py_3.4_32: + MB_PYTHON_VERSION: '3.4' + PLAT: 'i686' + NP_BUILD_DEP: 'numpy==1.9.3' + py_3.5_64: + MB_PYTHON_VERSION: '3.5' + NP_BUILD_DEP: 'numpy==1.9.3' + py_3.5_32: + MB_PYTHON_VERSION: '3.5' + PLAT: 'i686' + NP_BUILD_DEP: 'numpy==1.9.3' + py_3.6_64: + MB_PYTHON_VERSION: '3.6' + NP_BUILD_DEP: 'numpy==1.11.3' + DAILY_BUILD: 'true' + py_3.6_32: + MB_PYTHON_VERSION: '3.6' + PLAT: 'i686' + NP_BUILD_DEP: 'numpy==1.11.3' + DAILY_BUILD: 'true' + py_3.7_64: + MB_PYTHON_VERSION: '3.7' + NP_BUILD_DEP: 'numpy==1.14.5' + NP_TEST_DEP: 'numpy==1.14.5' + DAILY_BUILD: 'true' + py_3.7_32: + MB_PYTHON_VERSION: '3.7' + PLAT: 'i686' + NP_BUILD_DEP: 'numpy==1.14.5' + NP_TEST_DEP: 'numpy==1.14.5' + DAILY_BUILD: 'true' + +- template: azure/posix.yml + parameters: + name: macOS + vmImage: xcode9-macos10.13 + matrix: + py_2.7_64: + MB_PYTHON_VERSION: '2.7' + py_3.4_64: + MB_PYTHON_VERSION: '3.4' + py_3.5_64: + MB_PYTHON_VERSION: '3.5' + NP_BUILD_DEP: 'numpy==1.9.3' + py_3.6_64: + MB_PYTHON_VERSION: '3.6' + NP_BUILD_DEP: 'numpy==1.11.3' + DAILY_BUILD: 'true' + py_3.7_64: + MB_PYTHON_VERSION: '3.7' + NP_BUILD_DEP: 'numpy==1.14.5' + NP_TEST_DEP: 'numpy==1.14.5' + DAILY_BUILD: 'true' + +- template: azure/windows.yml + parameters: + name: windows + vmImage: vs2017-win2016 + matrix: + py_2.7_32: + PYTHON_VERSION: '2.7.x' + PYTHON_ARCH: 'x86' + py_2.7_64: + PYTHON_VERSION: '2.7.x' + py_3.4_32: + PYTHON_VERSION: '3.4.x' + PYTHON_ARCH: 'x86' + py_3.4_64: + PYTHON_VERSION: '3.4.x' + py_3.5_32: + PYTHON_VERSION: '3.5.x' + PYTHON_ARCH: 'x86' + py_3.5_64: + PYTHON_VERSION: '3.5.x' + py_3.6_32: + PYTHON_VERSION: '3.6.x' + PYTHON_ARCH: 'x86' + NP_BUILD_DEP: '1.12.1' + DAILY_BUILD: 'true' + py_3.6_64: + PYTHON_VERSION: '3.6.x' + NP_BUILD_DEP: '1.12.1' + DAILY_BUILD: 'true' + py_3.7_32: + PYTHON_VERSION: '3.7.x' + PYTHON_ARCH: 'x86' + NP_BUILD_DEP: '1.14.5' + DAILY_BUILD: 'true' + py_3.7_64: + PYTHON_VERSION: '3.7.x' + NP_BUILD_DEP: '1.14.5' + DAILY_BUILD: 'true' diff --git a/azure/posix.yml b/azure/posix.yml new file mode 100644 index 00000000..957b5ff1 --- /dev/null +++ b/azure/posix.yml @@ -0,0 +1,92 @@ +parameters: + name: '' + vmImage: '' + matrix: [] + +jobs: +- job: ${{ parameters.name }} + pool: + vmImage: ${{ parameters.vmImage }} + variables: + REPO_DIR: 'scikit-learn' + BUILD_COMMIT: '0.20.3' + PLAT: 'x86_64' + UNICODE_WIDTH: '32' + NP_BUILD_DEP: 'numpy==1.8.2' + NP_TEST_DEP: 'numpy==1.13.1' + CYTHON_BUILD_DEP: 'cython==0.28.5' + CYTHON_TEST_DEP: 'cython' + SCIPY_BUILD_DEP: 'scipy' + SCIPY_TEST_DEP: 'scipy' + DAILY_COMMIT: 'master' + DAILY_BUILD: 'false' + strategy: + matrix: + ${{ insert }}: ${{ parameters.matrix }} + + steps: + - checkout: self + submodules: true + - task: UsePythonVersion@0 + inputs: + versionSpec: $(MB_PYTHON_VERSION) + displayName: Set python version + - script: | + if [ "$BUILD_REASON" == "Schedule" ]; then + if [ "$DAILY_BUILD" != "true" ]; then + exit 0 + fi + BUILD_COMMIT=$DAILY_COMMIT + fi + echo "Building scikit-learn-$BUILD_COMMIT" + + pip install virtualenv + BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $SCIPY_BUILD_DEP" + TEST_DEPENDS="$NP_TEST_DEP pytest $CYTHON_TEST_DEP $SCIPY_TEST_DEP" + + if [ `uname` == 'Darwin' ]; then + TRAVIS_OS_NAME='osx' + else + TRAVIS_OS_NAME='linux' + fi + + source multibuild/common_utils.sh + source multibuild/travis_steps.sh + before_install + + # OpenMP is not present on osx by default + if [ $TRAVIS_OS_NAME == "osx" ]; then + enable_openmp + fi + + clean_code $REPO_DIR $BUILD_COMMIT + build_wheel $REPO_DIR $PLAT + + if [ $TRAVIS_OS_NAME == "osx" ]; then + disable_system_openmp + fi + + install_run $PLAT + displayName: Build and Test + - script: | + if [ "$BUILD_REASON" == "Schedule" ]; then + if [ "$DAILY_BUILD" != "true" ]; then + exit 0 + fi + CONTAINER="sklearn-nightly" + BUILD_COMMIT="$DAILY_COMMIT" + else + CONTAINER="wheels" + UPLOAD_ARGS="--no-update-index" + fi + pip install wheelhouse-uploader + python -m wheelhouse_uploader upload --local-folder \ + $BUILD_REPOSITORY_LOCALPATH/wheelhouse/ \ + $UPLOAD_ARGS \ + $CONTAINER + condition: and(succeeded(), not(contains(variables['Build.SourceVersionMessage'], '[no upload]'))) + env: + WHEELHOUSE_UPLOADER_SECRET: $(WHEELHOUSE_UPLOADER_SECRET) + WHEELHOUSE_UPLOADER_USERNAME: $(WHEELHOUSE_UPLOADER_USERNAME) + displayName: Upload wheel + diff --git a/azure/windows.yml b/azure/windows.yml new file mode 100644 index 00000000..be17fd30 --- /dev/null +++ b/azure/windows.yml @@ -0,0 +1,88 @@ +parameters: + name: '' + vmImage: '' + matrix: [] + +jobs: +- job: ${{ parameters.name }} + pool: + vmImage: ${{ parameters.vmImage }} + variables: + BUILD_COMMIT: '0.20.3' + SKLEARN_SKIP_NETWORK_TESTS: '1' + NP_BUILD_DEP: '1.10.4' + CYTHON_BUILD_DEP: '0.28.5' + SCIPY_BUILD_DEP: '1.1.0' + DAILY_COMMIT: 'master' + DAILY_BUILD: 'false' + PYTHON_ARCH: 'x64' + strategy: + matrix: + ${{ insert }}: ${{ parameters.matrix }} + steps: + - checkout: self + submodules: true + - task: UsePythonVersion@0 + inputs: + versionSpec: $(PYTHON_VERSION) + architecture: $(PYTHON_ARCH) + displayName: Set python version + - script: | + echo PYTHON %PYTHON_VERSION% %PYTHON_ARCH% + echo Build Reason %BUILD_REASON% + python --version + python -c "import struct; print(struct.calcsize('P') * 8)" + pip --version + displayName: Check that we have the expected version and architecture for Python + - script: | + if "%BUILD_REASON%" == "Schedule" ( + if NOT "%DAILY_BUILD%" == "true" ( + exit 0 + ) + set BUILD_COMMIT = %DAILY_COMMIT% + ) + pushd scikit-learn + git checkout %BUILD_COMMIT% + git clean -fxd + git reset --hard + popd + displayName: Checkout commit + - script: | + if "%BUILD_REASON%" == "Schedule" ( + if NOT "%DAILY_BUILD%" == "true" ( + exit 0 + ) + ) + pip install --timeout=60 numpy==%NP_BUILD_DEP% + pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% + + pushd scikit-learn + python setup.py bdist_wheel + pip install --pre --no-index --find-links dist/ scikit-learn + popd + + mkdir tmp + cd tmp + + pip install -U --timeout=60 numpy + pytest -rs --pyargs sklearn + displayName: Build and Test + - script: | + if "%BUILD_REASON%" == "Schedule" ( + if NOT "%DAILY_BUILD%" == "true" ( + exit 0 + ) + set CONTAINER = "sklearn-nightly" + ) else ( + set CONTAINER = "wheels" + set UPLOAD_ARGS = "--no-update-index" + ) + pip install --timeout=60 wheelhouse_uploader + cd scikit-learn + python -m wheelhouse_uploader upload --no-ssl-check --local-folder=dist %UPLOAD_ARGS% %CONTAINER% + condition: and(succeeded(), not(contains(variables['Build.SourceVersionMessage'], '[no upload]'))) + env: + WHEELHOUSE_UPLOADER_SECRET: $(WHEELHOUSE_UPLOADER_SECRET) + WHEELHOUSE_UPLOADER_USERNAME: $(WHEELHOUSE_UPLOADER_USERNAME) + displayName: Upload wheel + From 07aa7a83d0db6c3af9e7d83fce430708dbaebeb7 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 6 Mar 2019 12:04:15 -0500 Subject: [PATCH 002/194] FIX upload --- azure-pipelines.yml | 190 ++++++++++++++++++++++---------------------- azure/windows.yml | 12 +-- 2 files changed, 102 insertions(+), 100 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 333c6e51..4e0cee6d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,112 +1,112 @@ jobs: -- template: azure/posix.yml - parameters: - name: linux - vmImage: ubuntu-16.04 - matrix: - py_2.7_64_uni_32: - MB_PYTHON_VERSION: '2.7' - py_2.7_64_uni_16: - MB_PYTHON_VERSION: '2.7' - UNICODE_WIDTH: '16' - py_2.7_32_uni_32: - MB_PYTHON_VERSION: '2.7' - PLAT: 'i686' - py_2.7_32_uni_16: - MB_PYTHON_VERSION: '2.7' - PLAT: 'i686' - UNICODE_WIDTH: '16' - py_3.4_64: - MB_PYTHON_VERSION: '3.4' - NP_BUILD_DEP: 'numpy==1.9.3' - py_3.4_32: - MB_PYTHON_VERSION: '3.4' - PLAT: 'i686' - NP_BUILD_DEP: 'numpy==1.9.3' - py_3.5_64: - MB_PYTHON_VERSION: '3.5' - NP_BUILD_DEP: 'numpy==1.9.3' - py_3.5_32: - MB_PYTHON_VERSION: '3.5' - PLAT: 'i686' - NP_BUILD_DEP: 'numpy==1.9.3' - py_3.6_64: - MB_PYTHON_VERSION: '3.6' - NP_BUILD_DEP: 'numpy==1.11.3' - DAILY_BUILD: 'true' - py_3.6_32: - MB_PYTHON_VERSION: '3.6' - PLAT: 'i686' - NP_BUILD_DEP: 'numpy==1.11.3' - DAILY_BUILD: 'true' - py_3.7_64: - MB_PYTHON_VERSION: '3.7' - NP_BUILD_DEP: 'numpy==1.14.5' - NP_TEST_DEP: 'numpy==1.14.5' - DAILY_BUILD: 'true' - py_3.7_32: - MB_PYTHON_VERSION: '3.7' - PLAT: 'i686' - NP_BUILD_DEP: 'numpy==1.14.5' - NP_TEST_DEP: 'numpy==1.14.5' - DAILY_BUILD: 'true' +# - template: azure/posix.yml +# parameters: +# name: linux +# vmImage: ubuntu-16.04 +# matrix: +# py_2.7_64_uni_32: +# MB_PYTHON_VERSION: '2.7' +# py_2.7_64_uni_16: +# MB_PYTHON_VERSION: '2.7' +# UNICODE_WIDTH: '16' +# py_2.7_32_uni_32: +# MB_PYTHON_VERSION: '2.7' +# PLAT: 'i686' +# py_2.7_32_uni_16: +# MB_PYTHON_VERSION: '2.7' +# PLAT: 'i686' +# UNICODE_WIDTH: '16' +# py_3.4_64: +# MB_PYTHON_VERSION: '3.4' +# NP_BUILD_DEP: 'numpy==1.9.3' +# py_3.4_32: +# MB_PYTHON_VERSION: '3.4' +# PLAT: 'i686' +# NP_BUILD_DEP: 'numpy==1.9.3' +# py_3.5_64: +# MB_PYTHON_VERSION: '3.5' +# NP_BUILD_DEP: 'numpy==1.9.3' +# py_3.5_32: +# MB_PYTHON_VERSION: '3.5' +# PLAT: 'i686' +# NP_BUILD_DEP: 'numpy==1.9.3' +# py_3.6_64: +# MB_PYTHON_VERSION: '3.6' +# NP_BUILD_DEP: 'numpy==1.11.3' +# DAILY_BUILD: 'true' +# py_3.6_32: +# MB_PYTHON_VERSION: '3.6' +# PLAT: 'i686' +# NP_BUILD_DEP: 'numpy==1.11.3' +# DAILY_BUILD: 'true' +# py_3.7_64: +# MB_PYTHON_VERSION: '3.7' +# NP_BUILD_DEP: 'numpy==1.14.5' +# NP_TEST_DEP: 'numpy==1.14.5' +# DAILY_BUILD: 'true' +# py_3.7_32: +# MB_PYTHON_VERSION: '3.7' +# PLAT: 'i686' +# NP_BUILD_DEP: 'numpy==1.14.5' +# NP_TEST_DEP: 'numpy==1.14.5' +# DAILY_BUILD: 'true' -- template: azure/posix.yml - parameters: - name: macOS - vmImage: xcode9-macos10.13 - matrix: - py_2.7_64: - MB_PYTHON_VERSION: '2.7' - py_3.4_64: - MB_PYTHON_VERSION: '3.4' - py_3.5_64: - MB_PYTHON_VERSION: '3.5' - NP_BUILD_DEP: 'numpy==1.9.3' - py_3.6_64: - MB_PYTHON_VERSION: '3.6' - NP_BUILD_DEP: 'numpy==1.11.3' - DAILY_BUILD: 'true' - py_3.7_64: - MB_PYTHON_VERSION: '3.7' - NP_BUILD_DEP: 'numpy==1.14.5' - NP_TEST_DEP: 'numpy==1.14.5' - DAILY_BUILD: 'true' +# - template: azure/posix.yml +# parameters: +# name: macOS +# vmImage: xcode9-macos10.13 +# matrix: +# py_2.7_64: +# MB_PYTHON_VERSION: '2.7' +# py_3.4_64: +# MB_PYTHON_VERSION: '3.4' +# py_3.5_64: +# MB_PYTHON_VERSION: '3.5' +# NP_BUILD_DEP: 'numpy==1.9.3' +# py_3.6_64: +# MB_PYTHON_VERSION: '3.6' +# NP_BUILD_DEP: 'numpy==1.11.3' +# DAILY_BUILD: 'true' +# py_3.7_64: +# MB_PYTHON_VERSION: '3.7' +# NP_BUILD_DEP: 'numpy==1.14.5' +# NP_TEST_DEP: 'numpy==1.14.5' +# DAILY_BUILD: 'true' - template: azure/windows.yml parameters: name: windows vmImage: vs2017-win2016 matrix: - py_2.7_32: - PYTHON_VERSION: '2.7.x' - PYTHON_ARCH: 'x86' - py_2.7_64: - PYTHON_VERSION: '2.7.x' - py_3.4_32: - PYTHON_VERSION: '3.4.x' - PYTHON_ARCH: 'x86' - py_3.4_64: - PYTHON_VERSION: '3.4.x' - py_3.5_32: - PYTHON_VERSION: '3.5.x' - PYTHON_ARCH: 'x86' + # py_2.7_32: + # PYTHON_VERSION: '2.7.x' + # PYTHON_ARCH: 'x86' + # py_2.7_64: + # PYTHON_VERSION: '2.7.x' + # py_3.4_32: + # PYTHON_VERSION: '3.4.x' + # PYTHON_ARCH: 'x86' + # py_3.4_64: + # PYTHON_VERSION: '3.4.x' + # py_3.5_32: + # PYTHON_VERSION: '3.5.x' + # PYTHON_ARCH: 'x86' py_3.5_64: PYTHON_VERSION: '3.5.x' - py_3.6_32: - PYTHON_VERSION: '3.6.x' - PYTHON_ARCH: 'x86' - NP_BUILD_DEP: '1.12.1' - DAILY_BUILD: 'true' + # py_3.6_32: + # PYTHON_VERSION: '3.6.x' + # PYTHON_ARCH: 'x86' + # NP_BUILD_DEP: '1.12.1' + # DAILY_BUILD: 'true' py_3.6_64: PYTHON_VERSION: '3.6.x' NP_BUILD_DEP: '1.12.1' DAILY_BUILD: 'true' - py_3.7_32: - PYTHON_VERSION: '3.7.x' - PYTHON_ARCH: 'x86' - NP_BUILD_DEP: '1.14.5' - DAILY_BUILD: 'true' + # py_3.7_32: + # PYTHON_VERSION: '3.7.x' + # PYTHON_ARCH: 'x86' + # NP_BUILD_DEP: '1.14.5' + # DAILY_BUILD: 'true' py_3.7_64: PYTHON_VERSION: '3.7.x' NP_BUILD_DEP: '1.14.5' diff --git a/azure/windows.yml b/azure/windows.yml index be17fd30..38570aeb 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -39,7 +39,7 @@ jobs: if NOT "%DAILY_BUILD%" == "true" ( exit 0 ) - set BUILD_COMMIT = %DAILY_COMMIT% + set BUILD_COMMIT=%DAILY_COMMIT% ) pushd scikit-learn git checkout %BUILD_COMMIT% @@ -48,6 +48,7 @@ jobs: popd displayName: Checkout commit - script: | + @echo on if "%BUILD_REASON%" == "Schedule" ( if NOT "%DAILY_BUILD%" == "true" ( exit 0 @@ -65,17 +66,18 @@ jobs: cd tmp pip install -U --timeout=60 numpy - pytest -rs --pyargs sklearn + REM pytest -rs --pyargs sklearn displayName: Build and Test - script: | + @echo on if "%BUILD_REASON%" == "Schedule" ( if NOT "%DAILY_BUILD%" == "true" ( exit 0 ) - set CONTAINER = "sklearn-nightly" + set CONTAINER="sklearn-nightly" ) else ( - set CONTAINER = "wheels" - set UPLOAD_ARGS = "--no-update-index" + set CONTAINER="wheels" + set UPLOAD_ARGS="--no-update-index" ) pip install --timeout=60 wheelhouse_uploader cd scikit-learn From ae050889065231da104cb9975aa0c2b62a6ef3de Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 6 Mar 2019 12:19:18 -0500 Subject: [PATCH 003/194] FIX Python 2.7 3.4 --- azure-pipelines.yml | 28 ++++++++++++++-------------- azure/windows.yml | 7 +++++++ 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4e0cee6d..68619e96 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -81,33 +81,33 @@ jobs: # py_2.7_32: # PYTHON_VERSION: '2.7.x' # PYTHON_ARCH: 'x86' - # py_2.7_64: - # PYTHON_VERSION: '2.7.x' + py_2.7_64: + PYTHON_VERSION: '2.7.x' # py_3.4_32: # PYTHON_VERSION: '3.4.x' # PYTHON_ARCH: 'x86' - # py_3.4_64: - # PYTHON_VERSION: '3.4.x' + py_3.4_64: + PYTHON_VERSION: '3.4.x' # py_3.5_32: # PYTHON_VERSION: '3.5.x' # PYTHON_ARCH: 'x86' - py_3.5_64: - PYTHON_VERSION: '3.5.x' + # py_3.5_64: + # PYTHON_VERSION: '3.5.x' # py_3.6_32: # PYTHON_VERSION: '3.6.x' # PYTHON_ARCH: 'x86' # NP_BUILD_DEP: '1.12.1' # DAILY_BUILD: 'true' - py_3.6_64: - PYTHON_VERSION: '3.6.x' - NP_BUILD_DEP: '1.12.1' - DAILY_BUILD: 'true' + # py_3.6_64: + # PYTHON_VERSION: '3.6.x' + # NP_BUILD_DEP: '1.12.1' + # DAILY_BUILD: 'true' # py_3.7_32: # PYTHON_VERSION: '3.7.x' # PYTHON_ARCH: 'x86' # NP_BUILD_DEP: '1.14.5' # DAILY_BUILD: 'true' - py_3.7_64: - PYTHON_VERSION: '3.7.x' - NP_BUILD_DEP: '1.14.5' - DAILY_BUILD: 'true' + # py_3.7_64: + # PYTHON_VERSION: '3.7.x' + # NP_BUILD_DEP: '1.14.5' + # DAILY_BUILD: 'true' diff --git a/azure/windows.yml b/azure/windows.yml index 38570aeb..ba7f9f9b 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -54,6 +54,13 @@ jobs: exit 0 ) ) + if "%PYTHON_VERSION" == "2.7.x" ( + SET VS90COMNTOOLS=%VS170COMNTOOLS% + ) + if "%PYTHON_VERSION" == "3.4.x" ( + SET VS100COMNTOOLS=%VS170COMNTOOLS% + ) + pip install --timeout=60 numpy==%NP_BUILD_DEP% pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% From a332eb906ae1612c6681a52ef0b7d0f68fe8d1b1 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 6 Mar 2019 12:26:19 -0500 Subject: [PATCH 004/194] FIX Python 2.7 --- azure-pipelines.yml | 4 ++-- azure/windows.yml | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 68619e96..bf92ee82 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -86,8 +86,8 @@ jobs: # py_3.4_32: # PYTHON_VERSION: '3.4.x' # PYTHON_ARCH: 'x86' - py_3.4_64: - PYTHON_VERSION: '3.4.x' + # py_3.4_64: + # PYTHON_VERSION: '3.4.x' # py_3.5_32: # PYTHON_VERSION: '3.5.x' # PYTHON_ARCH: 'x86' diff --git a/azure/windows.yml b/azure/windows.yml index ba7f9f9b..3de80cd5 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -27,6 +27,12 @@ jobs: versionSpec: $(PYTHON_VERSION) architecture: $(PYTHON_ARCH) displayName: Set python version + - powershell: | + $wc = New-Object net.webclient + $wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi") + Start-Process "VCForPython27.msi" /qn -Wait + displayName: 'Install VC 9.0 only for Python 2.7' + condition: eq(variables['PYTHON_VERSION'], '2.7.x') - script: | echo PYTHON %PYTHON_VERSION% %PYTHON_ARCH% echo Build Reason %BUILD_REASON% From 48a39d7e0515a97975c82f9b6748e0b1c77a0e0e Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 6 Mar 2019 12:33:57 -0500 Subject: [PATCH 005/194] FIX Python 3.4 --- azure-pipelines.yml | 4 ++-- azure/windows.yml | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bf92ee82..68619e96 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -86,8 +86,8 @@ jobs: # py_3.4_32: # PYTHON_VERSION: '3.4.x' # PYTHON_ARCH: 'x86' - # py_3.4_64: - # PYTHON_VERSION: '3.4.x' + py_3.4_64: + PYTHON_VERSION: '3.4.x' # py_3.5_32: # PYTHON_VERSION: '3.5.x' # PYTHON_ARCH: 'x86' diff --git a/azure/windows.yml b/azure/windows.yml index 3de80cd5..2341c941 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -60,11 +60,8 @@ jobs: exit 0 ) ) - if "%PYTHON_VERSION" == "2.7.x" ( - SET VS90COMNTOOLS=%VS170COMNTOOLS% - ) if "%PYTHON_VERSION" == "3.4.x" ( - SET VS100COMNTOOLS=%VS170COMNTOOLS% + set VS100COMNTOOLS=%VS140COMNTOOLS% ) pip install --timeout=60 numpy==%NP_BUILD_DEP% From 089755afd23c698bca76fb24322b23b9e1123f4f Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 6 Mar 2019 12:36:13 -0500 Subject: [PATCH 006/194] BUG Fix --- azure-pipelines.yml | 4 ++-- azure/windows.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 68619e96..c3a2052e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -81,8 +81,8 @@ jobs: # py_2.7_32: # PYTHON_VERSION: '2.7.x' # PYTHON_ARCH: 'x86' - py_2.7_64: - PYTHON_VERSION: '2.7.x' + # py_2.7_64: + # PYTHON_VERSION: '2.7.x' # py_3.4_32: # PYTHON_VERSION: '3.4.x' # PYTHON_ARCH: 'x86' diff --git a/azure/windows.yml b/azure/windows.yml index 2341c941..ab962e53 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -60,7 +60,7 @@ jobs: exit 0 ) ) - if "%PYTHON_VERSION" == "3.4.x" ( + if "%PYTHON_VERSION%" == "3.4.x" ( set VS100COMNTOOLS=%VS140COMNTOOLS% ) From 372b1ed0bb2876a6bb3aa8ef216e5803123ae6e5 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 6 Mar 2019 12:36:50 -0500 Subject: [PATCH 007/194] TST Debug --- azure/windows.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/azure/windows.yml b/azure/windows.yml index ab962e53..84525085 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -60,6 +60,12 @@ jobs: exit 0 ) ) + ECHO %VS130COMNTOOLS% + ECHO %VS140COMNTOOLS% + ECHO %VS150COMNTOOLS% + ECHO %VS160COMNTOOLS% + ECHO %VS170COMNTOOLS% + if "%PYTHON_VERSION%" == "3.4.x" ( set VS100COMNTOOLS=%VS140COMNTOOLS% ) From 7da2c4cbf44c1f5a024353a5cbbcb2285c079538 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 6 Mar 2019 13:18:43 -0500 Subject: [PATCH 008/194] TST quote it --- azure/windows.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 84525085..3c129290 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -60,14 +60,9 @@ jobs: exit 0 ) ) - ECHO %VS130COMNTOOLS% - ECHO %VS140COMNTOOLS% - ECHO %VS150COMNTOOLS% - ECHO %VS160COMNTOOLS% - ECHO %VS170COMNTOOLS% if "%PYTHON_VERSION%" == "3.4.x" ( - set VS100COMNTOOLS=%VS140COMNTOOLS% + set VS100COMNTOOLS="%VS140COMNTOOLS%" ) pip install --timeout=60 numpy==%NP_BUILD_DEP% From 5ffb59f009ec01a1b3710f1a777717550e8cecf9 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 6 Mar 2019 13:26:30 -0500 Subject: [PATCH 009/194] TST Debug --- azure/windows.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/azure/windows.yml b/azure/windows.yml index 3c129290..b4b3b0a8 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -61,6 +61,12 @@ jobs: ) ) + set A="%VS130COMNTOOLS%" + set A="%VS140COMNTOOLS%" + set A="%VS150COMNTOOLS%" + set A="%VS160COMNTOOLS%" + set A="%VS170COMNTOOLS%" + if "%PYTHON_VERSION%" == "3.4.x" ( set VS100COMNTOOLS="%VS140COMNTOOLS%" ) From f13a860514768e92ba8b2048918bbc36c5216a86 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 6 Mar 2019 13:45:30 -0500 Subject: [PATCH 010/194] BUG Fix python 3.4 --- azure-pipelines.yml | 8 ++++---- azure/windows.yml | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c3a2052e..337fb785 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -83,11 +83,11 @@ jobs: # PYTHON_ARCH: 'x86' # py_2.7_64: # PYTHON_VERSION: '2.7.x' - # py_3.4_32: - # PYTHON_VERSION: '3.4.x' - # PYTHON_ARCH: 'x86' - py_3.4_64: + py_3.4_32: PYTHON_VERSION: '3.4.x' + PYTHON_ARCH: 'x86' + # py_3.4_64: + # PYTHON_VERSION: '3.4.x' # py_3.5_32: # PYTHON_VERSION: '3.5.x' # PYTHON_ARCH: 'x86' diff --git a/azure/windows.yml b/azure/windows.yml index b4b3b0a8..4befbb0d 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -33,6 +33,12 @@ jobs: Start-Process "VCForPython27.msi" /qn -Wait displayName: 'Install VC 9.0 only for Python 2.7' condition: eq(variables['PYTHON_VERSION'], '2.7.x') + - powershell: | + $wc = New-Object net.webclient + $wc.Downloadfile("https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe", "vcredist_x86.msi") + Start-Process "vcredist_x86.msi" /qn -Wait + displayName: 'Install Microsoft Visual C++ 2010 Redistributable Package only for Python 3.4 (x86)' + condition: and(eq(variables['PYTHON_VERSION'], '3.4.x'),eq(variables['PYTHON_ARCH'], 'x86')) - script: | echo PYTHON %PYTHON_VERSION% %PYTHON_ARCH% echo Build Reason %BUILD_REASON% @@ -61,12 +67,6 @@ jobs: ) ) - set A="%VS130COMNTOOLS%" - set A="%VS140COMNTOOLS%" - set A="%VS150COMNTOOLS%" - set A="%VS160COMNTOOLS%" - set A="%VS170COMNTOOLS%" - if "%PYTHON_VERSION%" == "3.4.x" ( set VS100COMNTOOLS="%VS140COMNTOOLS%" ) From 2208aa43bd89e81bdab6c66233b8a46cb7edebe9 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 6 Mar 2019 13:58:14 -0500 Subject: [PATCH 011/194] BUG Fix python 3.4 --- azure/windows.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 4befbb0d..7f405075 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -33,12 +33,6 @@ jobs: Start-Process "VCForPython27.msi" /qn -Wait displayName: 'Install VC 9.0 only for Python 2.7' condition: eq(variables['PYTHON_VERSION'], '2.7.x') - - powershell: | - $wc = New-Object net.webclient - $wc.Downloadfile("https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe", "vcredist_x86.msi") - Start-Process "vcredist_x86.msi" /qn -Wait - displayName: 'Install Microsoft Visual C++ 2010 Redistributable Package only for Python 3.4 (x86)' - condition: and(eq(variables['PYTHON_VERSION'], '3.4.x'),eq(variables['PYTHON_ARCH'], 'x86')) - script: | echo PYTHON %PYTHON_VERSION% %PYTHON_ARCH% echo Build Reason %BUILD_REASON% @@ -68,7 +62,7 @@ jobs: ) if "%PYTHON_VERSION%" == "3.4.x" ( - set VS100COMNTOOLS="%VS140COMNTOOLS%" + set VS100COMNTOOLS=%VS140COMNTOOLS% ) pip install --timeout=60 numpy==%NP_BUILD_DEP% From 2a9392bb9456f88621b5d7ed6779794cb0f476af Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 6 Mar 2019 14:03:20 -0500 Subject: [PATCH 012/194] BUG Fix python 3.4 --- azure/windows.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 7f405075..f2f270b0 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -33,6 +33,11 @@ jobs: Start-Process "VCForPython27.msi" /qn -Wait displayName: 'Install VC 9.0 only for Python 2.7' condition: eq(variables['PYTHON_VERSION'], '2.7.x') + - powershell: | + $wc = New-Object net.webclient + $wc.Downloadfile("https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe", "vcredist_x86.msi") + Start-Process "vcredist_x86.msi" /qn -Wait + displayName: 'Install Microsoft Visual C++ 2010 Redistributable Package only for Python 3.4 (x86)' - script: | echo PYTHON %PYTHON_VERSION% %PYTHON_ARCH% echo Build Reason %BUILD_REASON% @@ -61,10 +66,6 @@ jobs: ) ) - if "%PYTHON_VERSION%" == "3.4.x" ( - set VS100COMNTOOLS=%VS140COMNTOOLS% - ) - pip install --timeout=60 numpy==%NP_BUILD_DEP% pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% From 70ddb196da30f1795feca0895bf709f52e0db7a9 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 6 Mar 2019 14:11:04 -0500 Subject: [PATCH 013/194] BUG Fix python 3.4 --- azure-pipelines.yml | 19 +++++++++++++++---- azure/windows.yml | 4 ++-- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 337fb785..7c385074 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -76,16 +76,27 @@ jobs: - template: azure/windows.yml parameters: name: windows - vmImage: vs2017-win2016 + vmImage: vs2015-win2012r2 matrix: + py_3.4_32: + PYTHON_VERSION: '3.4.x' + PYTHON_ARCH: 'x86' + # py_3.4_64: + # PYTHON_VERSION: '3.4.x' + +# - template: azure/windows.yml +# parameters: +# name: windows +# vmImage: vs2017-win2016 +# matrix: # py_2.7_32: # PYTHON_VERSION: '2.7.x' # PYTHON_ARCH: 'x86' # py_2.7_64: # PYTHON_VERSION: '2.7.x' - py_3.4_32: - PYTHON_VERSION: '3.4.x' - PYTHON_ARCH: 'x86' + # py_3.4_32: + # PYTHON_VERSION: '3.4.x' + # PYTHON_ARCH: 'x86' # py_3.4_64: # PYTHON_VERSION: '3.4.x' # py_3.5_32: diff --git a/azure/windows.yml b/azure/windows.yml index f2f270b0..4e5e280d 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -35,8 +35,8 @@ jobs: condition: eq(variables['PYTHON_VERSION'], '2.7.x') - powershell: | $wc = New-Object net.webclient - $wc.Downloadfile("https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe", "vcredist_x86.msi") - Start-Process "vcredist_x86.msi" /qn -Wait + $wc.Downloadfile("https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe", "vcredist_x86.exe") + Start-Process "vcredist_x86.exe" /qn -Wait displayName: 'Install Microsoft Visual C++ 2010 Redistributable Package only for Python 3.4 (x86)' - script: | echo PYTHON %PYTHON_VERSION% %PYTHON_ARCH% From fcd0b27c969a0ca71a54ec891deff21325f92b9c Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 6 Mar 2019 14:11:25 -0500 Subject: [PATCH 014/194] BUG Fix python 3.4 --- azure/windows.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 4e5e280d..774c826c 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -33,11 +33,6 @@ jobs: Start-Process "VCForPython27.msi" /qn -Wait displayName: 'Install VC 9.0 only for Python 2.7' condition: eq(variables['PYTHON_VERSION'], '2.7.x') - - powershell: | - $wc = New-Object net.webclient - $wc.Downloadfile("https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe", "vcredist_x86.exe") - Start-Process "vcredist_x86.exe" /qn -Wait - displayName: 'Install Microsoft Visual C++ 2010 Redistributable Package only for Python 3.4 (x86)' - script: | echo PYTHON %PYTHON_VERSION% %PYTHON_ARCH% echo Build Reason %BUILD_REASON% From f5fcb5a59802226b42bcfcbae39f6033959c5b02 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 6 Mar 2019 14:50:43 -0500 Subject: [PATCH 015/194] BUG Fix python 3.4 --- azure-pipelines.yml | 20 +++++--------------- azure/windows.yml | 7 +++++++ 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7c385074..5eac6100 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -73,30 +73,20 @@ jobs: # NP_TEST_DEP: 'numpy==1.14.5' # DAILY_BUILD: 'true' + - template: azure/windows.yml parameters: name: windows - vmImage: vs2015-win2012r2 + vmImage: vs2017-win2016 matrix: - py_3.4_32: - PYTHON_VERSION: '3.4.x' - PYTHON_ARCH: 'x86' - # py_3.4_64: - # PYTHON_VERSION: '3.4.x' - -# - template: azure/windows.yml -# parameters: -# name: windows -# vmImage: vs2017-win2016 -# matrix: # py_2.7_32: # PYTHON_VERSION: '2.7.x' # PYTHON_ARCH: 'x86' # py_2.7_64: # PYTHON_VERSION: '2.7.x' - # py_3.4_32: - # PYTHON_VERSION: '3.4.x' - # PYTHON_ARCH: 'x86' + py_3.4_32: + PYTHON_VERSION: '3.4.x' + PYTHON_ARCH: 'x86' # py_3.4_64: # PYTHON_VERSION: '3.4.x' # py_3.5_32: diff --git a/azure/windows.yml b/azure/windows.yml index 774c826c..e059a5f8 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -53,6 +53,9 @@ jobs: git reset --hard popd displayName: Checkout commit + - bash: | + ls "Program Files (x86)" + displayName: See programs - script: | @echo on if "%BUILD_REASON%" == "Schedule" ( @@ -61,6 +64,10 @@ jobs: ) ) + if "%PYTHON_VERSION%" == "3.4.x" ( + set VS100COMNTOOLS="%VS140COMNTOOLS%" + ) + pip install --timeout=60 numpy==%NP_BUILD_DEP% pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% From 80651023d29268901d6ee3a57c3739a928944de7 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 6 Mar 2019 14:53:41 -0500 Subject: [PATCH 016/194] BUG Fix python 3.4 --- azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index e059a5f8..ae773b13 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -54,7 +54,7 @@ jobs: popd displayName: Checkout commit - bash: | - ls "Program Files (x86)" + ls "C:\Program Files (x86)" displayName: See programs - script: | @echo on From a74601d0f262f7befefee88045f0cf33fcf6ec6a Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 6 Mar 2019 15:01:55 -0500 Subject: [PATCH 017/194] OC --- azure/windows.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index ae773b13..812e7b37 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -64,9 +64,7 @@ jobs: ) ) - if "%PYTHON_VERSION%" == "3.4.x" ( - set VS100COMNTOOLS="%VS140COMNTOOLS%" - ) + echo "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 > "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64/vcvars64.bat" pip install --timeout=60 numpy==%NP_BUILD_DEP% pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% From 8f906d2a687f96458a20bf7325bc72bb5120f76b Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 6 Mar 2019 15:14:54 -0500 Subject: [PATCH 018/194] Checking apps --- azure/windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure/windows.yml b/azure/windows.yml index 812e7b37..0eefe6fa 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -55,6 +55,7 @@ jobs: displayName: Checkout commit - bash: | ls "C:\Program Files (x86)" + ls "C:\Program Files\Microsoft SDKs\Windows" displayName: See programs - script: | @echo on From 59877d09789f2db5fa8a1767dca6e64ac73bd9b2 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 6 Mar 2019 15:38:12 -0500 Subject: [PATCH 019/194] Checking apps --- azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index 0eefe6fa..321027a5 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -54,8 +54,8 @@ jobs: popd displayName: Checkout commit - bash: | + ls "C:\Program Files" ls "C:\Program Files (x86)" - ls "C:\Program Files\Microsoft SDKs\Windows" displayName: See programs - script: | @echo on From 3d33849b3e63e8bd5fd172bf8bf8222d407c866d Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 6 Mar 2019 15:47:42 -0500 Subject: [PATCH 020/194] Checking apps --- azure/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 321027a5..082ba0d1 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -54,8 +54,8 @@ jobs: popd displayName: Checkout commit - bash: | - ls "C:\Program Files" - ls "C:\Program Files (x86)" + ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64" + ls "C:\Program Files\Microsoft SDKs" displayName: See programs - script: | @echo on From 32c9e3e1a4d75579217aafbb0ff616af70ef9b54 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 6 Mar 2019 15:49:56 -0500 Subject: [PATCH 021/194] Checking apps --- azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index 082ba0d1..c6a34354 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -54,7 +54,7 @@ jobs: popd displayName: Checkout commit - bash: | - ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64" + ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0" ls "C:\Program Files\Microsoft SDKs" displayName: See programs - script: | From 3e40168ab884248b79e8fffb7f818be33b9fc541 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 6 Mar 2019 15:53:53 -0500 Subject: [PATCH 022/194] Checking apps --- azure/windows.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index c6a34354..1dd954e5 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -54,8 +54,10 @@ jobs: popd displayName: Checkout commit - bash: | + echo "studio" ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0" - ls "C:\Program Files\Microsoft SDKs" + echo "sdks" + ls "C:\Program Files\Microsoft SDKs\Common7" displayName: See programs - script: | @echo on From 48ff9ba4c24e95fad4322ab2b6758b9a59b63c47 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 6 Mar 2019 20:12:27 -0500 Subject: [PATCH 023/194] DEBUG --- azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index 1dd954e5..53572c8e 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -57,7 +57,7 @@ jobs: echo "studio" ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0" echo "sdks" - ls "C:\Program Files\Microsoft SDKs\Common7" + ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7 displayName: See programs - script: | @echo on From 5a438780116dc81e2412950450462d5736e2fc31 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 6 Mar 2019 20:21:51 -0500 Subject: [PATCH 024/194] DEBUG --- azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index 53572c8e..78c956d4 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -57,7 +57,7 @@ jobs: echo "studio" ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0" echo "sdks" - ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7 + ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7" displayName: See programs - script: | @echo on From 595a3b234c3466bf32643d61b0f3afb8800350ec Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 09:21:03 -0500 Subject: [PATCH 025/194] Use SDK for distutils --- azure/windows.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 78c956d4..6ceb4049 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -53,12 +53,6 @@ jobs: git reset --hard popd displayName: Checkout commit - - bash: | - echo "studio" - ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0" - echo "sdks" - ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7" - displayName: See programs - script: | @echo on if "%BUILD_REASON%" == "Schedule" ( @@ -67,7 +61,8 @@ jobs: ) ) - echo "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 > "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64/vcvars64.bat" + set DISTUTILS_USE_SDK=1 + set MSSdk=1 pip install --timeout=60 numpy==%NP_BUILD_DEP% pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% From 660017031d72dc19ff3eddf9762fb07abe0d4da0 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 09:31:13 -0500 Subject: [PATCH 026/194] DEBUG --- azure/windows.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 6ceb4049..fbad045d 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -53,6 +53,12 @@ jobs: git reset --hard popd displayName: Checkout commit + - bash: | + echo "studio" + ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0" + echo "sdks" + ls "C:\Program Files\Microsoft SDKs" + displayName: See programs - script: | @echo on if "%BUILD_REASON%" == "Schedule" ( @@ -61,9 +67,6 @@ jobs: ) ) - set DISTUTILS_USE_SDK=1 - set MSSdk=1 - pip install --timeout=60 numpy==%NP_BUILD_DEP% pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% From a693d448e4f1886fcd4b38436771426991acbf4b Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 09:35:56 -0500 Subject: [PATCH 027/194] DEBUG --- azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index fbad045d..f2bf81a6 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -57,7 +57,7 @@ jobs: echo "studio" ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0" echo "sdks" - ls "C:\Program Files\Microsoft SDKs" + ls "C:\Program Files\Microsoft SDKs\Azure" displayName: See programs - script: | @echo on From f466ac37a227c6486c9cdaa6e3e1030fbc2dc03a Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 09:42:42 -0500 Subject: [PATCH 028/194] DEBUG --- azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index f2bf81a6..fee0ef53 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -55,7 +55,7 @@ jobs: displayName: Checkout commit - bash: | echo "studio" - ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0" + ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7" echo "sdks" ls "C:\Program Files\Microsoft SDKs\Azure" displayName: See programs From cb7ab6410a37695669cc4bfe3c18776320dac54f Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 09:47:18 -0500 Subject: [PATCH 029/194] DEBUG --- azure/windows.yml | 76 ++++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 37 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index fee0ef53..0207ce04 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -55,49 +55,51 @@ jobs: displayName: Checkout commit - bash: | echo "studio" + SET HELLO="%VS140COMNTOOLS%" + ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7" echo "sdks" ls "C:\Program Files\Microsoft SDKs\Azure" displayName: See programs - - script: | - @echo on - if "%BUILD_REASON%" == "Schedule" ( - if NOT "%DAILY_BUILD%" == "true" ( - exit 0 - ) - ) + # - script: | + # @echo on + # if "%BUILD_REASON%" == "Schedule" ( + # if NOT "%DAILY_BUILD%" == "true" ( + # exit 0 + # ) + # ) - pip install --timeout=60 numpy==%NP_BUILD_DEP% - pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% + # pip install --timeout=60 numpy==%NP_BUILD_DEP% + # pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% - pushd scikit-learn - python setup.py bdist_wheel - pip install --pre --no-index --find-links dist/ scikit-learn - popd + # pushd scikit-learn + # python setup.py bdist_wheel + # pip install --pre --no-index --find-links dist/ scikit-learn + # popd - mkdir tmp - cd tmp + # mkdir tmp + # cd tmp - pip install -U --timeout=60 numpy - REM pytest -rs --pyargs sklearn - displayName: Build and Test - - script: | - @echo on - if "%BUILD_REASON%" == "Schedule" ( - if NOT "%DAILY_BUILD%" == "true" ( - exit 0 - ) - set CONTAINER="sklearn-nightly" - ) else ( - set CONTAINER="wheels" - set UPLOAD_ARGS="--no-update-index" - ) - pip install --timeout=60 wheelhouse_uploader - cd scikit-learn - python -m wheelhouse_uploader upload --no-ssl-check --local-folder=dist %UPLOAD_ARGS% %CONTAINER% - condition: and(succeeded(), not(contains(variables['Build.SourceVersionMessage'], '[no upload]'))) - env: - WHEELHOUSE_UPLOADER_SECRET: $(WHEELHOUSE_UPLOADER_SECRET) - WHEELHOUSE_UPLOADER_USERNAME: $(WHEELHOUSE_UPLOADER_USERNAME) - displayName: Upload wheel + # pip install -U --timeout=60 numpy + # REM pytest -rs --pyargs sklearn + # displayName: Build and Test + # - script: | + # @echo on + # if "%BUILD_REASON%" == "Schedule" ( + # if NOT "%DAILY_BUILD%" == "true" ( + # exit 0 + # ) + # set CONTAINER="sklearn-nightly" + # ) else ( + # set CONTAINER="wheels" + # set UPLOAD_ARGS="--no-update-index" + # ) + # pip install --timeout=60 wheelhouse_uploader + # cd scikit-learn + # python -m wheelhouse_uploader upload --no-ssl-check --local-folder=dist %UPLOAD_ARGS% %CONTAINER% + # condition: and(succeeded(), not(contains(variables['Build.SourceVersionMessage'], '[no upload]'))) + # env: + # WHEELHOUSE_UPLOADER_SECRET: $(WHEELHOUSE_UPLOADER_SECRET) + # WHEELHOUSE_UPLOADER_USERNAME: $(WHEELHOUSE_UPLOADER_USERNAME) + # displayName: Upload wheel From b232e015243713d1c6ae293789a6bc08e4ff9ae4 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 09:48:16 -0500 Subject: [PATCH 030/194] DEBUG --- azure/windows.yml | 52 +++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 0207ce04..2aea25e4 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -27,32 +27,32 @@ jobs: versionSpec: $(PYTHON_VERSION) architecture: $(PYTHON_ARCH) displayName: Set python version - - powershell: | - $wc = New-Object net.webclient - $wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi") - Start-Process "VCForPython27.msi" /qn -Wait - displayName: 'Install VC 9.0 only for Python 2.7' - condition: eq(variables['PYTHON_VERSION'], '2.7.x') - - script: | - echo PYTHON %PYTHON_VERSION% %PYTHON_ARCH% - echo Build Reason %BUILD_REASON% - python --version - python -c "import struct; print(struct.calcsize('P') * 8)" - pip --version - displayName: Check that we have the expected version and architecture for Python - - script: | - if "%BUILD_REASON%" == "Schedule" ( - if NOT "%DAILY_BUILD%" == "true" ( - exit 0 - ) - set BUILD_COMMIT=%DAILY_COMMIT% - ) - pushd scikit-learn - git checkout %BUILD_COMMIT% - git clean -fxd - git reset --hard - popd - displayName: Checkout commit + # - powershell: | + # $wc = New-Object net.webclient + # $wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi") + # Start-Process "VCForPython27.msi" /qn -Wait + # displayName: 'Install VC 9.0 only for Python 2.7' + # condition: eq(variables['PYTHON_VERSION'], '2.7.x') + # - script: | + # echo PYTHON %PYTHON_VERSION% %PYTHON_ARCH% + # echo Build Reason %BUILD_REASON% + # python --version + # python -c "import struct; print(struct.calcsize('P') * 8)" + # pip --version + # displayName: Check that we have the expected version and architecture for Python + # - script: | + # if "%BUILD_REASON%" == "Schedule" ( + # if NOT "%DAILY_BUILD%" == "true" ( + # exit 0 + # ) + # set BUILD_COMMIT=%DAILY_COMMIT% + # ) + # pushd scikit-learn + # git checkout %BUILD_COMMIT% + # git clean -fxd + # git reset --hard + # popd + # displayName: Checkout commit - bash: | echo "studio" SET HELLO="%VS140COMNTOOLS%" From 97d518b19e015e5bf646aeb96b2a22b13fdc627a Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 09:52:27 -0500 Subject: [PATCH 031/194] DEBUG --- azure/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 2aea25e4..67d5d26d 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -55,9 +55,9 @@ jobs: # displayName: Checkout commit - bash: | echo "studio" - SET HELLO="%VS140COMNTOOLS%" + echo $VS140COMNTOOLS - ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7" + ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\sdks" echo "sdks" ls "C:\Program Files\Microsoft SDKs\Azure" displayName: See programs From d21754679ff683417d32659e315cc5265dfe5559 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 09:54:01 -0500 Subject: [PATCH 032/194] DEBUG --- azure/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 67d5d26d..5ab11bd5 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -57,9 +57,9 @@ jobs: echo "studio" echo $VS140COMNTOOLS - ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\sdks" + ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7" echo "sdks" - ls "C:\Program Files\Microsoft SDKs\Azure" + ls "C:\Program Files\Microsoft SDKs\Azure\sdks" displayName: See programs # - script: | # @echo on From 337ef4017ba09a66aab63c756162420b3d3559bf Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 09:55:59 -0500 Subject: [PATCH 033/194] DEBUG --- azure/windows.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 5ab11bd5..cd1f470a 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -54,12 +54,11 @@ jobs: # popd # displayName: Checkout commit - bash: | - echo "studio" echo $VS140COMNTOOLS - - ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7" - echo "sdks" - ls "C:\Program Files\Microsoft SDKs\Azure\sdks" + echo "studio" + ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\sdks" + echo "Azure" + ls "C:\Program Files\Microsoft SDKs\Azure" displayName: See programs # - script: | # @echo on From 8061ebfc785d1e38d2316d8a438ff748293580c3 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 09:57:15 -0500 Subject: [PATCH 034/194] DEBUG --- azure/windows.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index cd1f470a..ba3c235e 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -20,8 +20,8 @@ jobs: matrix: ${{ insert }}: ${{ parameters.matrix }} steps: - - checkout: self - submodules: true + # - checkout: self + # submodules: true - task: UsePythonVersion@0 inputs: versionSpec: $(PYTHON_VERSION) @@ -56,7 +56,7 @@ jobs: - bash: | echo $VS140COMNTOOLS echo "studio" - ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\sdks" + ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7" echo "Azure" ls "C:\Program Files\Microsoft SDKs\Azure" displayName: See programs From cfa1a0a5857e8cc71b3bf1efb60367a2ec89fa99 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 09:58:08 -0500 Subject: [PATCH 035/194] DEBUG --- azure/windows.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index ba3c235e..d3de775e 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -55,9 +55,9 @@ jobs: # displayName: Checkout commit - bash: | echo $VS140COMNTOOLS - echo "studio" - ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7" - echo "Azure" + echo "WOW studio" + ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE" + echo "WOW Azure" ls "C:\Program Files\Microsoft SDKs\Azure" displayName: See programs # - script: | From 9b24455ddbdc40ac4945b36a33091cafec88540f Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 09:59:15 -0500 Subject: [PATCH 036/194] DEBUG --- azure/windows.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index d3de775e..b8b4097e 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -55,10 +55,10 @@ jobs: # displayName: Checkout commit - bash: | echo $VS140COMNTOOLS - echo "WOW studio" - ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE" - echo "WOW Azure" - ls "C:\Program Files\Microsoft SDKs\Azure" + echo "WOW studio 10.0" + ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7" + echo "WOW studio 14.0" + ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7" displayName: See programs # - script: | # @echo on From a92ef1bfc71b1b20090b9ffa3a561d7df42e1984 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 10:00:24 -0500 Subject: [PATCH 037/194] DEBUG --- azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index b8b4097e..5e671379 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -58,7 +58,7 @@ jobs: echo "WOW studio 10.0" ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7" echo "WOW studio 14.0" - ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7" + ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools" displayName: See programs # - script: | # @echo on From 9f00c2b9be96e70f634cd1c88017dae8ebd20075 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 10:22:27 -0500 Subject: [PATCH 038/194] DEBUG --- azure/windows.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 5e671379..0d00adb5 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -54,11 +54,10 @@ jobs: # popd # displayName: Checkout commit - bash: | - echo $VS140COMNTOOLS - echo "WOW studio 10.0" - ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7" - echo "WOW studio 14.0" - ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools" + pushd "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools" + ls + cat "vsvars32.bat" + which msvc displayName: See programs # - script: | # @echo on From 8fc60421aed633b0165ecf17b1905c170c842951 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 11:05:28 -0500 Subject: [PATCH 039/194] DEBUG --- azure/windows.yml | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 0d00adb5..a0b2156c 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -20,8 +20,8 @@ jobs: matrix: ${{ insert }}: ${{ parameters.matrix }} steps: - # - checkout: self - # submodules: true + - checkout: self + submodules: true - task: UsePythonVersion@0 inputs: versionSpec: $(PYTHON_VERSION) @@ -54,33 +54,32 @@ jobs: # popd # displayName: Checkout commit - bash: | - pushd "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools" - ls + cd "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools" cat "vsvars32.bat" - which msvc + cp "vsvars32.bat" "vcvarsall.bat" displayName: See programs - # - script: | - # @echo on - # if "%BUILD_REASON%" == "Schedule" ( - # if NOT "%DAILY_BUILD%" == "true" ( - # exit 0 - # ) - # ) + - script: | + @echo on + if "%BUILD_REASON%" == "Schedule" ( + if NOT "%DAILY_BUILD%" == "true" ( + exit 0 + ) + ) - # pip install --timeout=60 numpy==%NP_BUILD_DEP% - # pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% + pip install --timeout=60 numpy==%NP_BUILD_DEP% + pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% - # pushd scikit-learn - # python setup.py bdist_wheel - # pip install --pre --no-index --find-links dist/ scikit-learn - # popd + pushd scikit-learn + python setup.py bdist_wheel + pip install --pre --no-index --find-links dist/ scikit-learn + popd - # mkdir tmp - # cd tmp + mkdir tmp + cd tmp - # pip install -U --timeout=60 numpy - # REM pytest -rs --pyargs sklearn - # displayName: Build and Test + pip install -U --timeout=60 numpy + @REM pytest -rs --pyargs sklearn + displayName: Build and Test # - script: | # @echo on # if "%BUILD_REASON%" == "Schedule" ( From 75dcfa4a6e4f2be02d1525766c875550ef38d3dc Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 11:12:32 -0500 Subject: [PATCH 040/194] DEBUG --- azure/windows.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index a0b2156c..621d036a 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -53,11 +53,9 @@ jobs: # git reset --hard # popd # displayName: Checkout commit - - bash: | - cd "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools" - cat "vsvars32.bat" - cp "vsvars32.bat" "vcvarsall.bat" - displayName: See programs + # - bash: | + # cd "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools" + # displayName: See programs - script: | @echo on if "%BUILD_REASON%" == "Schedule" ( @@ -65,6 +63,10 @@ jobs: exit 0 ) ) + "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\vsvars32.bat" + + set DISTUTILS_USE_SDK=1' + set MSSdk=1 pip install --timeout=60 numpy==%NP_BUILD_DEP% pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% @@ -77,7 +79,7 @@ jobs: mkdir tmp cd tmp - pip install -U --timeout=60 numpy + pip install -U --timeout=60 numpy || EXIT /B 1 @REM pytest -rs --pyargs sklearn displayName: Build and Test # - script: | From 8b433984622614726a323d12fe8a8eac16764c85 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 11:15:36 -0500 Subject: [PATCH 041/194] DEBUG --- azure/windows.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 621d036a..bf5fbc5a 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -53,9 +53,11 @@ jobs: # git reset --hard # popd # displayName: Checkout commit - # - bash: | - # cd "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools" - # displayName: See programs + - bash: | + cd "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools" + cat "vsvars32.bat" + cp "vsvars32.bat" "vcvarsall.bat" + displayName: See programs - script: | @echo on if "%BUILD_REASON%" == "Schedule" ( @@ -63,10 +65,8 @@ jobs: exit 0 ) ) - "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\vsvars32.bat" - set DISTUTILS_USE_SDK=1' - set MSSdk=1 + set VS100COMNTOOLS="%VS140COMNTOOLS%" pip install --timeout=60 numpy==%NP_BUILD_DEP% pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% From c9e8fd794d14dca0ee657b16ff40ed598a44ec8a Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 11:19:51 -0500 Subject: [PATCH 042/194] DEBUG --- azure/windows.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index bf5fbc5a..5c2f40c8 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -55,8 +55,8 @@ jobs: # displayName: Checkout commit - bash: | cd "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools" - cat "vsvars32.bat" cp "vsvars32.bat" "vcvarsall.bat" + ls displayName: See programs - script: | @echo on @@ -73,13 +73,13 @@ jobs: pushd scikit-learn python setup.py bdist_wheel - pip install --pre --no-index --find-links dist/ scikit-learn + pip install --pre --no-index --find-links dist/ scikit-learn || exit 1 popd mkdir tmp cd tmp - pip install -U --timeout=60 numpy || EXIT /B 1 + pip install -U --timeout=60 numpy @REM pytest -rs --pyargs sklearn displayName: Build and Test # - script: | From ffe0f035339c0783e4959f687b79b47093835359 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 11:25:01 -0500 Subject: [PATCH 043/194] DEBUG --- azure/windows.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 5c2f40c8..70a72a19 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -54,9 +54,7 @@ jobs: # popd # displayName: Checkout commit - bash: | - cd "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools" - cp "vsvars32.bat" "vcvarsall.bat" - ls + ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools" displayName: See programs - script: | @echo on From f6f1063e71558741b1f42187c81df3bed3cc479e Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 11:27:51 -0500 Subject: [PATCH 044/194] DEBUG --- azure/windows.yml | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 70a72a19..5069dacd 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -54,32 +54,37 @@ jobs: # popd # displayName: Checkout commit - bash: | + echo "S 10" + ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0" + echo "COMMON7" + ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7" + echo "TOOLS" ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools" displayName: See programs - - script: | - @echo on - if "%BUILD_REASON%" == "Schedule" ( - if NOT "%DAILY_BUILD%" == "true" ( - exit 0 - ) - ) + # - script: | + # @echo on + # if "%BUILD_REASON%" == "Schedule" ( + # if NOT "%DAILY_BUILD%" == "true" ( + # exit 0 + # ) + # ) - set VS100COMNTOOLS="%VS140COMNTOOLS%" + # set VS100COMNTOOLS="%VS140COMNTOOLS%" - pip install --timeout=60 numpy==%NP_BUILD_DEP% - pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% + # pip install --timeout=60 numpy==%NP_BUILD_DEP% + # pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% - pushd scikit-learn - python setup.py bdist_wheel - pip install --pre --no-index --find-links dist/ scikit-learn || exit 1 - popd + # pushd scikit-learn + # python setup.py bdist_wheel + # pip install --pre --no-index --find-links dist/ scikit-learn || exit 1 + # popd - mkdir tmp - cd tmp + # mkdir tmp + # cd tmp - pip install -U --timeout=60 numpy - @REM pytest -rs --pyargs sklearn - displayName: Build and Test + # pip install -U --timeout=60 numpy + # @REM pytest -rs --pyargs sklearn + # displayName: Build and Test # - script: | # @echo on # if "%BUILD_REASON%" == "Schedule" ( From f273aaf5ad250cf5d515c1af11fafc6aaf56365a Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 11:30:25 -0500 Subject: [PATCH 045/194] DEBUG --- azure/windows.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 5069dacd..00cbc4bd 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -20,8 +20,8 @@ jobs: matrix: ${{ insert }}: ${{ parameters.matrix }} steps: - - checkout: self - submodules: true + # - checkout: self + # submodules: true - task: UsePythonVersion@0 inputs: versionSpec: $(PYTHON_VERSION) @@ -54,8 +54,8 @@ jobs: # popd # displayName: Checkout commit - bash: | - echo "S 10" - ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0" + echo "S 10 coomon7" + ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7" echo "COMMON7" ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7" echo "TOOLS" From 7a74745780f3786bb8a60f5393e3d49cba3e7993 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 11:32:39 -0500 Subject: [PATCH 046/194] DEBUG --- azure/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 00cbc4bd..d0dde953 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -54,8 +54,8 @@ jobs: # popd # displayName: Checkout commit - bash: | - echo "S 10 coomon7" - ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7" + echo "S 10 common7\IDE" + ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE" echo "COMMON7" ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7" echo "TOOLS" From ddcaa75c379b8c9d4792069d8bc4cd2015f03c15 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 11:33:27 -0500 Subject: [PATCH 047/194] DEBUG --- azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index d0dde953..e873efba 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -55,7 +55,7 @@ jobs: # displayName: Checkout commit - bash: | echo "S 10 common7\IDE" - ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE" + ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\PrivateAssemblies" echo "COMMON7" ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7" echo "TOOLS" From 54d1b02f7ff04b9604d6fb594eaa8629f69d0d45 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 11:34:39 -0500 Subject: [PATCH 048/194] DEBUG --- azure/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index e873efba..691e0c9d 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -55,9 +55,9 @@ jobs: # displayName: Checkout commit - bash: | echo "S 10 common7\IDE" - ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\PrivateAssemblies" + ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE" echo "COMMON7" - ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7" + ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE" echo "TOOLS" ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools" displayName: See programs From 4377435032c46bf6e1a2e3e21e747651a31cf23b Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 11:39:27 -0500 Subject: [PATCH 049/194] DEBUG --- azure/windows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure/windows.yml b/azure/windows.yml index 691e0c9d..cbb37e37 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -60,6 +60,8 @@ jobs: ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE" echo "TOOLS" ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools" + + which cl.exe displayName: See programs # - script: | # @echo on From 2387ba7a050e428584994d1efe773f28008d9bee Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 11:41:44 -0500 Subject: [PATCH 050/194] DEBUG --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5eac6100..5e821a61 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -77,7 +77,7 @@ jobs: - template: azure/windows.yml parameters: name: windows - vmImage: vs2017-win2016 + vmImage: vs2015-win2012r matrix: # py_2.7_32: # PYTHON_VERSION: '2.7.x' From 26773817378c7fd1277074625bac9cf7603bdab1 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 11:42:38 -0500 Subject: [PATCH 051/194] DEBUG --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5e821a61..9fa89c90 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -77,7 +77,7 @@ jobs: - template: azure/windows.yml parameters: name: windows - vmImage: vs2015-win2012r + vmImage: vs2015-win2012r2 matrix: # py_2.7_32: # PYTHON_VERSION: '2.7.x' From 324c4c3d05f12854dda68ad59375da3209ede7f3 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 11:47:58 -0500 Subject: [PATCH 052/194] DEBUG --- azure-pipelines.yml | 2 +- azure/windows.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9fa89c90..5eac6100 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -77,7 +77,7 @@ jobs: - template: azure/windows.yml parameters: name: windows - vmImage: vs2015-win2012r2 + vmImage: vs2017-win2016 matrix: # py_2.7_32: # PYTHON_VERSION: '2.7.x' diff --git a/azure/windows.yml b/azure/windows.yml index cbb37e37..e8ab9f20 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -60,7 +60,6 @@ jobs: ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE" echo "TOOLS" ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools" - which cl.exe displayName: See programs # - script: | From c0b6a94e9a4bb9f6b7c14c187473384bc49420ab Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 11:50:58 -0500 Subject: [PATCH 053/194] DEBUG --- azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index e8ab9f20..8f6f158a 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -55,7 +55,7 @@ jobs: # displayName: Checkout commit - bash: | echo "S 10 common7\IDE" - ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE" + ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0" echo "COMMON7" ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE" echo "TOOLS" From 4b9b0d6454ea2c5a70c6e0edbfecdb4a0a97479b Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 11:53:52 -0500 Subject: [PATCH 054/194] DEBUG --- azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index 8f6f158a..617e06f3 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -55,7 +55,7 @@ jobs: # displayName: Checkout commit - bash: | echo "S 10 common7\IDE" - ls "C:\Program Files (x86)\Microsoft Visual Studio 10.0" + ls "C:\Program Files (x86)\Microsoft Visual Studio" echo "COMMON7" ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE" echo "TOOLS" From 3dff38a3b14d8fc9dde34c87d254ce3c562dee40 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 11:57:01 -0500 Subject: [PATCH 055/194] DEBUG --- azure/windows.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 617e06f3..4ad6826f 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -54,12 +54,10 @@ jobs: # popd # displayName: Checkout commit - bash: | - echo "S 10 common7\IDE" - ls "C:\Program Files (x86)\Microsoft Visual Studio" - echo "COMMON7" - ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE" - echo "TOOLS" - ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools" + echo "WATCH 2017" + ls "C:\Program Files (x86)\Microsoft Visual Studio\2017" + echo "WATCH Shared" + ls "C:\Program Files (x86)\Microsoft Visual Studio\Shared" which cl.exe displayName: See programs # - script: | From 9bb3a2073a3a35751c06fad2fcf47c6c91e2ab4a Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 12:03:06 -0500 Subject: [PATCH 056/194] DEBUG --- azure/windows.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 4ad6826f..58c03d49 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -54,10 +54,14 @@ jobs: # popd # displayName: Checkout commit - bash: | - echo "WATCH 2017" - ls "C:\Program Files (x86)\Microsoft Visual Studio\2017" + echo "WATCH 2017\Enterprise" + ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise" echo "WATCH Shared" ls "C:\Program Files (x86)\Microsoft Visual Studio\Shared" + echo "WATCH Shared\Common" + ls "C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common" + echo "WATCH Shared\Packages" + ls "C:\Program Files (x86)\Microsoft Visual Studio\Shared\Packages" which cl.exe displayName: See programs # - script: | From 9faa863474f68247e0dfcfe7b7555154a9ae2b13 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 12:06:33 -0500 Subject: [PATCH 057/194] DEBUG --- azure/windows.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 58c03d49..c3de1ff6 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -54,14 +54,16 @@ jobs: # popd # displayName: Checkout commit - bash: | - echo "WATCH 2017\Enterprise" + echo "-----------2017\Enterprise" ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise" - echo "WATCH Shared" + echo "-----------2017\Enterprise\VC" + ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC" + echo "-----------2017\Enterprise\VSSDK" + ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VSSDK" + echo "-----------Shared" ls "C:\Program Files (x86)\Microsoft Visual Studio\Shared" - echo "WATCH Shared\Common" + echo "-----------Shared\Common" ls "C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common" - echo "WATCH Shared\Packages" - ls "C:\Program Files (x86)\Microsoft Visual Studio\Shared\Packages" which cl.exe displayName: See programs # - script: | From f261585ba4eae7a23c35bc9733d467569fda8820 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 12:11:02 -0500 Subject: [PATCH 058/194] DEBUG --- azure/windows.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index c3de1ff6..ab08f385 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -56,14 +56,16 @@ jobs: - bash: | echo "-----------2017\Enterprise" ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise" - echo "-----------2017\Enterprise\VC" - ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC" + echo "-----------2017\Enterprise\Common7" + ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7" + echo "-----------2017\Enterprise\SDK" + ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\SDK" + echo "-----------2017\Enterprise\Microsoft Azure Tools" + ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Microsoft Azure Tools" echo "-----------2017\Enterprise\VSSDK" ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VSSDK" - echo "-----------Shared" - ls "C:\Program Files (x86)\Microsoft Visual Studio\Shared" - echo "-----------Shared\Common" - ls "C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common" + echo "-----------2017\Enterprise\VSSDK\VisualStudioIntegration" + ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VSSDK\VisualStudioIntegration" which cl.exe displayName: See programs # - script: | From 364625b92759d8a225897ac531b4aa9de7b2bd7e Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 12:17:41 -0500 Subject: [PATCH 059/194] DEBUG --- azure/windows.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index ab08f385..caf5ba0b 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -54,19 +54,8 @@ jobs: # popd # displayName: Checkout commit - bash: | - echo "-----------2017\Enterprise" - ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise" - echo "-----------2017\Enterprise\Common7" - ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7" - echo "-----------2017\Enterprise\SDK" - ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\SDK" - echo "-----------2017\Enterprise\Microsoft Azure Tools" - ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Microsoft Azure Tools" - echo "-----------2017\Enterprise\VSSDK" - ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VSSDK" - echo "-----------2017\Enterprise\VSSDK\VisualStudioIntegration" - ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VSSDK\VisualStudioIntegration" - which cl.exe + cd "C:\Program Files (x86)" + find . -name "cl.exe" displayName: See programs # - script: | # @echo on From d22558d95a40719f82fcefe8449e8c7622aedaf8 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 12:20:17 -0500 Subject: [PATCH 060/194] DEBUG --- azure/windows.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index caf5ba0b..88236934 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -54,7 +54,6 @@ jobs: # popd # displayName: Checkout commit - bash: | - cd "C:\Program Files (x86)" find . -name "cl.exe" displayName: See programs # - script: | From dfdaa7ab2de27de78e6710bc39a777b155cad295 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 12:22:19 -0500 Subject: [PATCH 061/194] DEBUG --- azure/windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure/windows.yml b/azure/windows.yml index 88236934..a0c5a877 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -54,6 +54,7 @@ jobs: # popd # displayName: Checkout commit - bash: | + cd "C:\" find . -name "cl.exe" displayName: See programs # - script: | From 3ea698a25bdd71ae4a97532a26d2f25082387a7b Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 12:22:55 -0500 Subject: [PATCH 062/194] DEBUG --- azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index a0c5a877..138ac994 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -54,7 +54,7 @@ jobs: # popd # displayName: Checkout commit - bash: | - cd "C:\" + cd "C:\Program Files (x86)\Microsoft Visual Studio" find . -name "cl.exe" displayName: See programs # - script: | From cb6d0bd47fe73425bab272419541eaa4704b952a Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 12:27:39 -0500 Subject: [PATCH 063/194] DEBUG --- azure/windows.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 138ac994..5b49cbff 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -54,8 +54,17 @@ jobs: # popd # displayName: Checkout commit - bash: | - cd "C:\Program Files (x86)\Microsoft Visual Studio" - find . -name "cl.exe" + echo "-----------2017\Enterprise" + ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise" + echo "-----------2017\Enterprise\Common7\Tools" + ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools" + echo "-----------2017\Enterprise\Microsoft Azure Tools\Visual Studio 15.0" + ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Microsoft Azure Tools\Visual Studio 15.0" + echo "-----------2017\Enterprise\VSSDK\VisualStudioIntegration\Common" + ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VSSDK\VisualStudioIntegration\Common" + echo "-----------2017\Enterprise\VSSDK\VisualStudioIntegration\Tools" + ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VSSDK\VisualStudioIntegration\Tools" + which cl.exe displayName: See programs # - script: | # @echo on From f8a139e331de11e0a80e0d1667a687991b2e7e78 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 12:57:50 -0500 Subject: [PATCH 064/194] DEBUG --- azure/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 5b49cbff..c6bcc752 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -54,6 +54,7 @@ jobs: # popd # displayName: Checkout commit - bash: | + env echo "-----------2017\Enterprise" ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise" echo "-----------2017\Enterprise\Common7\Tools" @@ -62,8 +63,7 @@ jobs: ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Microsoft Azure Tools\Visual Studio 15.0" echo "-----------2017\Enterprise\VSSDK\VisualStudioIntegration\Common" ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VSSDK\VisualStudioIntegration\Common" - echo "-----------2017\Enterprise\VSSDK\VisualStudioIntegration\Tools" - ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VSSDK\VisualStudioIntegration\Tools" + ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VSSDK\VisualStudioIntegration\Tools\Bin" which cl.exe displayName: See programs # - script: | From 21621e9d76b8ef5996af04fefbe6b250dea88e27 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 13:02:40 -0500 Subject: [PATCH 065/194] DEBUG --- azure/windows.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index c6bcc752..a78b997e 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -54,17 +54,12 @@ jobs: # popd # displayName: Checkout commit - bash: | - env - echo "-----------2017\Enterprise" - ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise" - echo "-----------2017\Enterprise\Common7\Tools" + set -ex ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools" - echo "-----------2017\Enterprise\Microsoft Azure Tools\Visual Studio 15.0" ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Microsoft Azure Tools\Visual Studio 15.0" - echo "-----------2017\Enterprise\VSSDK\VisualStudioIntegration\Common" ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VSSDK\VisualStudioIntegration\Common" ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VSSDK\VisualStudioIntegration\Tools\Bin" - which cl.exe + ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\" displayName: See programs # - script: | # @echo on From 352951f1439ae9e83b6897c5ab8cd6ea6b24a5a1 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 13:06:09 -0500 Subject: [PATCH 066/194] DEBUG --- azure/windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure/windows.yml b/azure/windows.yml index a78b997e..9d910151 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -55,6 +55,7 @@ jobs: # displayName: Checkout commit - bash: | set -ex + ls "C:\Program Files (x86)\Microsoft Visual Studio\2017" ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools" ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Microsoft Azure Tools\Visual Studio 15.0" ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VSSDK\VisualStudioIntegration\Common" From 7b21ede6560750bfc519eaabbd73389f52d5166c Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 13:09:40 -0500 Subject: [PATCH 067/194] DEBUG --- azure/windows.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 9d910151..94e72caf 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -55,12 +55,11 @@ jobs: # displayName: Checkout commit - bash: | set -ex - ls "C:\Program Files (x86)\Microsoft Visual Studio\2017" ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools" ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Microsoft Azure Tools\Visual Studio 15.0" ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VSSDK\VisualStudioIntegration\Common" ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VSSDK\VisualStudioIntegration\Tools\Bin" - ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\" + ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools" displayName: See programs # - script: | # @echo on From 25ff7f87441213f1adcc4a01a4a675af582d79fb Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 13:14:40 -0500 Subject: [PATCH 068/194] DEBUG --- azure/windows.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/azure/windows.yml b/azure/windows.yml index 94e72caf..88a75875 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -61,6 +61,12 @@ jobs: ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VSSDK\VisualStudioIntegration\Tools\Bin" ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools" displayName: See programs + - script: | + CALL "%VS140COMNTOOLS%/vsvars32.bat" + SET + cl.exe + + # - script: | # @echo on # if "%BUILD_REASON%" == "Schedule" ( From 3e98f5474d076477d58f245e714565dd3e2c2ed3 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 13:18:24 -0500 Subject: [PATCH 069/194] DEBUG --- azure/windows.yml | 146 +++++++++++++++++++++------------------------- 1 file changed, 68 insertions(+), 78 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 88a75875..6064d221 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -20,94 +20,84 @@ jobs: matrix: ${{ insert }}: ${{ parameters.matrix }} steps: - # - checkout: self - # submodules: true + - checkout: self + submodules: true - task: UsePythonVersion@0 inputs: versionSpec: $(PYTHON_VERSION) architecture: $(PYTHON_ARCH) displayName: Set python version - # - powershell: | - # $wc = New-Object net.webclient - # $wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi") - # Start-Process "VCForPython27.msi" /qn -Wait - # displayName: 'Install VC 9.0 only for Python 2.7' - # condition: eq(variables['PYTHON_VERSION'], '2.7.x') - # - script: | - # echo PYTHON %PYTHON_VERSION% %PYTHON_ARCH% - # echo Build Reason %BUILD_REASON% - # python --version - # python -c "import struct; print(struct.calcsize('P') * 8)" - # pip --version - # displayName: Check that we have the expected version and architecture for Python - # - script: | - # if "%BUILD_REASON%" == "Schedule" ( - # if NOT "%DAILY_BUILD%" == "true" ( - # exit 0 - # ) - # set BUILD_COMMIT=%DAILY_COMMIT% - # ) - # pushd scikit-learn - # git checkout %BUILD_COMMIT% - # git clean -fxd - # git reset --hard - # popd - # displayName: Checkout commit - - bash: | - set -ex - ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools" - ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Microsoft Azure Tools\Visual Studio 15.0" - ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VSSDK\VisualStudioIntegration\Common" - ls "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VSSDK\VisualStudioIntegration\Tools\Bin" - ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools" - displayName: See programs + - powershell: | + $wc = New-Object net.webclient + $wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi") + Start-Process "VCForPython27.msi" /qn -Wait + displayName: 'Install VC 9.0 only for Python 2.7' + condition: eq(variables['PYTHON_VERSION'], '2.7.x') - script: | - CALL "%VS140COMNTOOLS%/vsvars32.bat" - SET - cl.exe - + echo PYTHON %PYTHON_VERSION% %PYTHON_ARCH% + echo Build Reason %BUILD_REASON% + python --version + python -c "import struct; print(struct.calcsize('P') * 8)" + pip --version + displayName: Check that we have the expected version and architecture for Python + - script: | + if "%BUILD_REASON%" == "Schedule" ( + if NOT "%DAILY_BUILD%" == "true" ( + exit 0 + ) + set BUILD_COMMIT=%DAILY_COMMIT% + ) + pushd scikit-learn + git checkout %BUILD_COMMIT% + git clean -fxd + git reset --hard + popd + displayName: Checkout commit + - script: | + @echo on + if "%BUILD_REASON%" == "Schedule" ( + if NOT "%DAILY_BUILD%" == "true" ( + exit 0 + ) + ) - # - script: | - # @echo on - # if "%BUILD_REASON%" == "Schedule" ( - # if NOT "%DAILY_BUILD%" == "true" ( - # exit 0 - # ) - # ) + set VS100COMNTOOLS="%VS140COMNTOOLS%" + CALL "%VS140COMNTOOLS%/vsvars32.bat" - # set VS100COMNTOOLS="%VS140COMNTOOLS%" + set DISTUTILS_USE_SDK=1 + set MSSdk=1 - # pip install --timeout=60 numpy==%NP_BUILD_DEP% - # pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% + pip install --timeout=60 numpy==%NP_BUILD_DEP% + pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% - # pushd scikit-learn - # python setup.py bdist_wheel - # pip install --pre --no-index --find-links dist/ scikit-learn || exit 1 - # popd + pushd scikit-learn + python setup.py bdist_wheel + pip install --pre --no-index --find-links dist/ scikit-learn || exit 1 + popd - # mkdir tmp - # cd tmp + mkdir tmp + cd tmp - # pip install -U --timeout=60 numpy - # @REM pytest -rs --pyargs sklearn - # displayName: Build and Test - # - script: | - # @echo on - # if "%BUILD_REASON%" == "Schedule" ( - # if NOT "%DAILY_BUILD%" == "true" ( - # exit 0 - # ) - # set CONTAINER="sklearn-nightly" - # ) else ( - # set CONTAINER="wheels" - # set UPLOAD_ARGS="--no-update-index" - # ) - # pip install --timeout=60 wheelhouse_uploader - # cd scikit-learn - # python -m wheelhouse_uploader upload --no-ssl-check --local-folder=dist %UPLOAD_ARGS% %CONTAINER% - # condition: and(succeeded(), not(contains(variables['Build.SourceVersionMessage'], '[no upload]'))) - # env: - # WHEELHOUSE_UPLOADER_SECRET: $(WHEELHOUSE_UPLOADER_SECRET) - # WHEELHOUSE_UPLOADER_USERNAME: $(WHEELHOUSE_UPLOADER_USERNAME) - # displayName: Upload wheel + pip install -U --timeout=60 numpy + @REM pytest -rs --pyargs sklearn + displayName: Build and Test + - script: | + @echo on + if "%BUILD_REASON%" == "Schedule" ( + if NOT "%DAILY_BUILD%" == "true" ( + exit 0 + ) + set CONTAINER="sklearn-nightly" + ) else ( + set CONTAINER="wheels" + set UPLOAD_ARGS="--no-update-index" + ) + pip install --timeout=60 wheelhouse_uploader + cd scikit-learn + python -m wheelhouse_uploader upload --no-ssl-check --local-folder=dist %UPLOAD_ARGS% %CONTAINER% + condition: and(succeeded(), not(contains(variables['Build.SourceVersionMessage'], '[no upload]'))) + env: + WHEELHOUSE_UPLOADER_SECRET: $(WHEELHOUSE_UPLOADER_SECRET) + WHEELHOUSE_UPLOADER_USERNAME: $(WHEELHOUSE_UPLOADER_USERNAME) + displayName: Upload wheel From 4369c9fd0d7cc2c48e0e2825ed8aa87cc6f46777 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 13:35:24 -0500 Subject: [PATCH 070/194] DEBUG --- azure/windows.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 6064d221..78e0cb41 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -61,11 +61,12 @@ jobs: ) ) - set VS100COMNTOOLS="%VS140COMNTOOLS%" - CALL "%VS140COMNTOOLS%/vsvars32.bat" + if "%PYTHON_VERSION%" == "3.4.x" ( + CALL "%VS140COMNTOOLS%/vsvars32.bat" - set DISTUTILS_USE_SDK=1 - set MSSdk=1 + set DISTUTILS_USE_SDK=1 + set MSSdk=1 + ) pip install --timeout=60 numpy==%NP_BUILD_DEP% pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% @@ -79,7 +80,7 @@ jobs: cd tmp pip install -U --timeout=60 numpy - @REM pytest -rs --pyargs sklearn + pytest -rs --pyargs sklearn displayName: Build and Test - script: | @echo on From 4305af0cbe7184c1d75d5bd2937f2dc31068db14 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Tue, 5 Mar 2019 10:08:17 -0500 Subject: [PATCH 071/194] ENH Adds Azure pipelines --- azure-pipelines.yml | 114 ++++++++++++++++++++++++++++++++++++++++++++ azure/posix.yml | 92 +++++++++++++++++++++++++++++++++++ azure/windows.yml | 104 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 310 insertions(+) create mode 100644 azure-pipelines.yml create mode 100644 azure/posix.yml create mode 100644 azure/windows.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 00000000..5eac6100 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,114 @@ +jobs: +# - template: azure/posix.yml +# parameters: +# name: linux +# vmImage: ubuntu-16.04 +# matrix: +# py_2.7_64_uni_32: +# MB_PYTHON_VERSION: '2.7' +# py_2.7_64_uni_16: +# MB_PYTHON_VERSION: '2.7' +# UNICODE_WIDTH: '16' +# py_2.7_32_uni_32: +# MB_PYTHON_VERSION: '2.7' +# PLAT: 'i686' +# py_2.7_32_uni_16: +# MB_PYTHON_VERSION: '2.7' +# PLAT: 'i686' +# UNICODE_WIDTH: '16' +# py_3.4_64: +# MB_PYTHON_VERSION: '3.4' +# NP_BUILD_DEP: 'numpy==1.9.3' +# py_3.4_32: +# MB_PYTHON_VERSION: '3.4' +# PLAT: 'i686' +# NP_BUILD_DEP: 'numpy==1.9.3' +# py_3.5_64: +# MB_PYTHON_VERSION: '3.5' +# NP_BUILD_DEP: 'numpy==1.9.3' +# py_3.5_32: +# MB_PYTHON_VERSION: '3.5' +# PLAT: 'i686' +# NP_BUILD_DEP: 'numpy==1.9.3' +# py_3.6_64: +# MB_PYTHON_VERSION: '3.6' +# NP_BUILD_DEP: 'numpy==1.11.3' +# DAILY_BUILD: 'true' +# py_3.6_32: +# MB_PYTHON_VERSION: '3.6' +# PLAT: 'i686' +# NP_BUILD_DEP: 'numpy==1.11.3' +# DAILY_BUILD: 'true' +# py_3.7_64: +# MB_PYTHON_VERSION: '3.7' +# NP_BUILD_DEP: 'numpy==1.14.5' +# NP_TEST_DEP: 'numpy==1.14.5' +# DAILY_BUILD: 'true' +# py_3.7_32: +# MB_PYTHON_VERSION: '3.7' +# PLAT: 'i686' +# NP_BUILD_DEP: 'numpy==1.14.5' +# NP_TEST_DEP: 'numpy==1.14.5' +# DAILY_BUILD: 'true' + +# - template: azure/posix.yml +# parameters: +# name: macOS +# vmImage: xcode9-macos10.13 +# matrix: +# py_2.7_64: +# MB_PYTHON_VERSION: '2.7' +# py_3.4_64: +# MB_PYTHON_VERSION: '3.4' +# py_3.5_64: +# MB_PYTHON_VERSION: '3.5' +# NP_BUILD_DEP: 'numpy==1.9.3' +# py_3.6_64: +# MB_PYTHON_VERSION: '3.6' +# NP_BUILD_DEP: 'numpy==1.11.3' +# DAILY_BUILD: 'true' +# py_3.7_64: +# MB_PYTHON_VERSION: '3.7' +# NP_BUILD_DEP: 'numpy==1.14.5' +# NP_TEST_DEP: 'numpy==1.14.5' +# DAILY_BUILD: 'true' + + +- template: azure/windows.yml + parameters: + name: windows + vmImage: vs2017-win2016 + matrix: + # py_2.7_32: + # PYTHON_VERSION: '2.7.x' + # PYTHON_ARCH: 'x86' + # py_2.7_64: + # PYTHON_VERSION: '2.7.x' + py_3.4_32: + PYTHON_VERSION: '3.4.x' + PYTHON_ARCH: 'x86' + # py_3.4_64: + # PYTHON_VERSION: '3.4.x' + # py_3.5_32: + # PYTHON_VERSION: '3.5.x' + # PYTHON_ARCH: 'x86' + # py_3.5_64: + # PYTHON_VERSION: '3.5.x' + # py_3.6_32: + # PYTHON_VERSION: '3.6.x' + # PYTHON_ARCH: 'x86' + # NP_BUILD_DEP: '1.12.1' + # DAILY_BUILD: 'true' + # py_3.6_64: + # PYTHON_VERSION: '3.6.x' + # NP_BUILD_DEP: '1.12.1' + # DAILY_BUILD: 'true' + # py_3.7_32: + # PYTHON_VERSION: '3.7.x' + # PYTHON_ARCH: 'x86' + # NP_BUILD_DEP: '1.14.5' + # DAILY_BUILD: 'true' + # py_3.7_64: + # PYTHON_VERSION: '3.7.x' + # NP_BUILD_DEP: '1.14.5' + # DAILY_BUILD: 'true' diff --git a/azure/posix.yml b/azure/posix.yml new file mode 100644 index 00000000..957b5ff1 --- /dev/null +++ b/azure/posix.yml @@ -0,0 +1,92 @@ +parameters: + name: '' + vmImage: '' + matrix: [] + +jobs: +- job: ${{ parameters.name }} + pool: + vmImage: ${{ parameters.vmImage }} + variables: + REPO_DIR: 'scikit-learn' + BUILD_COMMIT: '0.20.3' + PLAT: 'x86_64' + UNICODE_WIDTH: '32' + NP_BUILD_DEP: 'numpy==1.8.2' + NP_TEST_DEP: 'numpy==1.13.1' + CYTHON_BUILD_DEP: 'cython==0.28.5' + CYTHON_TEST_DEP: 'cython' + SCIPY_BUILD_DEP: 'scipy' + SCIPY_TEST_DEP: 'scipy' + DAILY_COMMIT: 'master' + DAILY_BUILD: 'false' + strategy: + matrix: + ${{ insert }}: ${{ parameters.matrix }} + + steps: + - checkout: self + submodules: true + - task: UsePythonVersion@0 + inputs: + versionSpec: $(MB_PYTHON_VERSION) + displayName: Set python version + - script: | + if [ "$BUILD_REASON" == "Schedule" ]; then + if [ "$DAILY_BUILD" != "true" ]; then + exit 0 + fi + BUILD_COMMIT=$DAILY_COMMIT + fi + echo "Building scikit-learn-$BUILD_COMMIT" + + pip install virtualenv + BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $SCIPY_BUILD_DEP" + TEST_DEPENDS="$NP_TEST_DEP pytest $CYTHON_TEST_DEP $SCIPY_TEST_DEP" + + if [ `uname` == 'Darwin' ]; then + TRAVIS_OS_NAME='osx' + else + TRAVIS_OS_NAME='linux' + fi + + source multibuild/common_utils.sh + source multibuild/travis_steps.sh + before_install + + # OpenMP is not present on osx by default + if [ $TRAVIS_OS_NAME == "osx" ]; then + enable_openmp + fi + + clean_code $REPO_DIR $BUILD_COMMIT + build_wheel $REPO_DIR $PLAT + + if [ $TRAVIS_OS_NAME == "osx" ]; then + disable_system_openmp + fi + + install_run $PLAT + displayName: Build and Test + - script: | + if [ "$BUILD_REASON" == "Schedule" ]; then + if [ "$DAILY_BUILD" != "true" ]; then + exit 0 + fi + CONTAINER="sklearn-nightly" + BUILD_COMMIT="$DAILY_COMMIT" + else + CONTAINER="wheels" + UPLOAD_ARGS="--no-update-index" + fi + pip install wheelhouse-uploader + python -m wheelhouse_uploader upload --local-folder \ + $BUILD_REPOSITORY_LOCALPATH/wheelhouse/ \ + $UPLOAD_ARGS \ + $CONTAINER + condition: and(succeeded(), not(contains(variables['Build.SourceVersionMessage'], '[no upload]'))) + env: + WHEELHOUSE_UPLOADER_SECRET: $(WHEELHOUSE_UPLOADER_SECRET) + WHEELHOUSE_UPLOADER_USERNAME: $(WHEELHOUSE_UPLOADER_USERNAME) + displayName: Upload wheel + diff --git a/azure/windows.yml b/azure/windows.yml new file mode 100644 index 00000000..78e0cb41 --- /dev/null +++ b/azure/windows.yml @@ -0,0 +1,104 @@ +parameters: + name: '' + vmImage: '' + matrix: [] + +jobs: +- job: ${{ parameters.name }} + pool: + vmImage: ${{ parameters.vmImage }} + variables: + BUILD_COMMIT: '0.20.3' + SKLEARN_SKIP_NETWORK_TESTS: '1' + NP_BUILD_DEP: '1.10.4' + CYTHON_BUILD_DEP: '0.28.5' + SCIPY_BUILD_DEP: '1.1.0' + DAILY_COMMIT: 'master' + DAILY_BUILD: 'false' + PYTHON_ARCH: 'x64' + strategy: + matrix: + ${{ insert }}: ${{ parameters.matrix }} + steps: + - checkout: self + submodules: true + - task: UsePythonVersion@0 + inputs: + versionSpec: $(PYTHON_VERSION) + architecture: $(PYTHON_ARCH) + displayName: Set python version + - powershell: | + $wc = New-Object net.webclient + $wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi") + Start-Process "VCForPython27.msi" /qn -Wait + displayName: 'Install VC 9.0 only for Python 2.7' + condition: eq(variables['PYTHON_VERSION'], '2.7.x') + - script: | + echo PYTHON %PYTHON_VERSION% %PYTHON_ARCH% + echo Build Reason %BUILD_REASON% + python --version + python -c "import struct; print(struct.calcsize('P') * 8)" + pip --version + displayName: Check that we have the expected version and architecture for Python + - script: | + if "%BUILD_REASON%" == "Schedule" ( + if NOT "%DAILY_BUILD%" == "true" ( + exit 0 + ) + set BUILD_COMMIT=%DAILY_COMMIT% + ) + pushd scikit-learn + git checkout %BUILD_COMMIT% + git clean -fxd + git reset --hard + popd + displayName: Checkout commit + - script: | + @echo on + if "%BUILD_REASON%" == "Schedule" ( + if NOT "%DAILY_BUILD%" == "true" ( + exit 0 + ) + ) + + if "%PYTHON_VERSION%" == "3.4.x" ( + CALL "%VS140COMNTOOLS%/vsvars32.bat" + + set DISTUTILS_USE_SDK=1 + set MSSdk=1 + ) + + pip install --timeout=60 numpy==%NP_BUILD_DEP% + pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% + + pushd scikit-learn + python setup.py bdist_wheel + pip install --pre --no-index --find-links dist/ scikit-learn || exit 1 + popd + + mkdir tmp + cd tmp + + pip install -U --timeout=60 numpy + pytest -rs --pyargs sklearn + displayName: Build and Test + - script: | + @echo on + if "%BUILD_REASON%" == "Schedule" ( + if NOT "%DAILY_BUILD%" == "true" ( + exit 0 + ) + set CONTAINER="sklearn-nightly" + ) else ( + set CONTAINER="wheels" + set UPLOAD_ARGS="--no-update-index" + ) + pip install --timeout=60 wheelhouse_uploader + cd scikit-learn + python -m wheelhouse_uploader upload --no-ssl-check --local-folder=dist %UPLOAD_ARGS% %CONTAINER% + condition: and(succeeded(), not(contains(variables['Build.SourceVersionMessage'], '[no upload]'))) + env: + WHEELHOUSE_UPLOADER_SECRET: $(WHEELHOUSE_UPLOADER_SECRET) + WHEELHOUSE_UPLOADER_USERNAME: $(WHEELHOUSE_UPLOADER_USERNAME) + displayName: Upload wheel + From 6782b7664b6ebe9dec19853d7192b32e4a365631 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 13:48:31 -0500 Subject: [PATCH 072/194] Trigger CI [no upload] From f4c64d32aae47cd974319d9cd0ea854d96a41b13 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 14:11:53 -0500 Subject: [PATCH 073/194] BLD Trigger CI [no upload] --- azure-pipelines.yml | 204 ++++++++++++++++++++++---------------------- 1 file changed, 102 insertions(+), 102 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5eac6100..9e1fedf8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,77 +1,77 @@ jobs: -# - template: azure/posix.yml -# parameters: -# name: linux -# vmImage: ubuntu-16.04 -# matrix: -# py_2.7_64_uni_32: -# MB_PYTHON_VERSION: '2.7' -# py_2.7_64_uni_16: -# MB_PYTHON_VERSION: '2.7' -# UNICODE_WIDTH: '16' -# py_2.7_32_uni_32: -# MB_PYTHON_VERSION: '2.7' -# PLAT: 'i686' -# py_2.7_32_uni_16: -# MB_PYTHON_VERSION: '2.7' -# PLAT: 'i686' -# UNICODE_WIDTH: '16' -# py_3.4_64: -# MB_PYTHON_VERSION: '3.4' -# NP_BUILD_DEP: 'numpy==1.9.3' -# py_3.4_32: -# MB_PYTHON_VERSION: '3.4' -# PLAT: 'i686' -# NP_BUILD_DEP: 'numpy==1.9.3' -# py_3.5_64: -# MB_PYTHON_VERSION: '3.5' -# NP_BUILD_DEP: 'numpy==1.9.3' -# py_3.5_32: -# MB_PYTHON_VERSION: '3.5' -# PLAT: 'i686' -# NP_BUILD_DEP: 'numpy==1.9.3' -# py_3.6_64: -# MB_PYTHON_VERSION: '3.6' -# NP_BUILD_DEP: 'numpy==1.11.3' -# DAILY_BUILD: 'true' -# py_3.6_32: -# MB_PYTHON_VERSION: '3.6' -# PLAT: 'i686' -# NP_BUILD_DEP: 'numpy==1.11.3' -# DAILY_BUILD: 'true' -# py_3.7_64: -# MB_PYTHON_VERSION: '3.7' -# NP_BUILD_DEP: 'numpy==1.14.5' -# NP_TEST_DEP: 'numpy==1.14.5' -# DAILY_BUILD: 'true' -# py_3.7_32: -# MB_PYTHON_VERSION: '3.7' -# PLAT: 'i686' -# NP_BUILD_DEP: 'numpy==1.14.5' -# NP_TEST_DEP: 'numpy==1.14.5' -# DAILY_BUILD: 'true' +- template: azure/posix.yml + parameters: + name: linux + vmImage: ubuntu-16.04 + matrix: + py_2.7_64_uni_32: + MB_PYTHON_VERSION: '2.7' + py_2.7_64_uni_16: + MB_PYTHON_VERSION: '2.7' + UNICODE_WIDTH: '16' + py_2.7_32_uni_32: + MB_PYTHON_VERSION: '2.7' + PLAT: 'i686' + py_2.7_32_uni_16: + MB_PYTHON_VERSION: '2.7' + PLAT: 'i686' + UNICODE_WIDTH: '16' + py_3.4_64: + MB_PYTHON_VERSION: '3.4' + NP_BUILD_DEP: 'numpy==1.9.3' + py_3.4_32: + MB_PYTHON_VERSION: '3.4' + PLAT: 'i686' + NP_BUILD_DEP: 'numpy==1.9.3' + py_3.5_64: + MB_PYTHON_VERSION: '3.5' + NP_BUILD_DEP: 'numpy==1.9.3' + py_3.5_32: + MB_PYTHON_VERSION: '3.5' + PLAT: 'i686' + NP_BUILD_DEP: 'numpy==1.9.3' + py_3.6_64: + MB_PYTHON_VERSION: '3.6' + NP_BUILD_DEP: 'numpy==1.11.3' + DAILY_BUILD: 'true' + py_3.6_32: + MB_PYTHON_VERSION: '3.6' + PLAT: 'i686' + NP_BUILD_DEP: 'numpy==1.11.3' + DAILY_BUILD: 'true' + py_3.7_64: + MB_PYTHON_VERSION: '3.7' + NP_BUILD_DEP: 'numpy==1.14.5' + NP_TEST_DEP: 'numpy==1.14.5' + DAILY_BUILD: 'true' + py_3.7_32: + MB_PYTHON_VERSION: '3.7' + PLAT: 'i686' + NP_BUILD_DEP: 'numpy==1.14.5' + NP_TEST_DEP: 'numpy==1.14.5' + DAILY_BUILD: 'true' -# - template: azure/posix.yml -# parameters: -# name: macOS -# vmImage: xcode9-macos10.13 -# matrix: -# py_2.7_64: -# MB_PYTHON_VERSION: '2.7' -# py_3.4_64: -# MB_PYTHON_VERSION: '3.4' -# py_3.5_64: -# MB_PYTHON_VERSION: '3.5' -# NP_BUILD_DEP: 'numpy==1.9.3' -# py_3.6_64: -# MB_PYTHON_VERSION: '3.6' -# NP_BUILD_DEP: 'numpy==1.11.3' -# DAILY_BUILD: 'true' -# py_3.7_64: -# MB_PYTHON_VERSION: '3.7' -# NP_BUILD_DEP: 'numpy==1.14.5' -# NP_TEST_DEP: 'numpy==1.14.5' -# DAILY_BUILD: 'true' +- template: azure/posix.yml + parameters: + name: macOS + vmImage: xcode9-macos10.13 + matrix: + py_2.7_64: + MB_PYTHON_VERSION: '2.7' + py_3.4_64: + MB_PYTHON_VERSION: '3.4' + py_3.5_64: + MB_PYTHON_VERSION: '3.5' + NP_BUILD_DEP: 'numpy==1.9.3' + py_3.6_64: + MB_PYTHON_VERSION: '3.6' + NP_BUILD_DEP: 'numpy==1.11.3' + DAILY_BUILD: 'true' + py_3.7_64: + MB_PYTHON_VERSION: '3.7' + NP_BUILD_DEP: 'numpy==1.14.5' + NP_TEST_DEP: 'numpy==1.14.5' + DAILY_BUILD: 'true' - template: azure/windows.yml @@ -79,36 +79,36 @@ jobs: name: windows vmImage: vs2017-win2016 matrix: - # py_2.7_32: - # PYTHON_VERSION: '2.7.x' - # PYTHON_ARCH: 'x86' - # py_2.7_64: - # PYTHON_VERSION: '2.7.x' + py_2.7_32: + PYTHON_VERSION: '2.7.x' + PYTHON_ARCH: 'x86' + py_2.7_64: + PYTHON_VERSION: '2.7.x' py_3.4_32: PYTHON_VERSION: '3.4.x' PYTHON_ARCH: 'x86' - # py_3.4_64: - # PYTHON_VERSION: '3.4.x' - # py_3.5_32: - # PYTHON_VERSION: '3.5.x' - # PYTHON_ARCH: 'x86' - # py_3.5_64: - # PYTHON_VERSION: '3.5.x' - # py_3.6_32: - # PYTHON_VERSION: '3.6.x' - # PYTHON_ARCH: 'x86' - # NP_BUILD_DEP: '1.12.1' - # DAILY_BUILD: 'true' - # py_3.6_64: - # PYTHON_VERSION: '3.6.x' - # NP_BUILD_DEP: '1.12.1' - # DAILY_BUILD: 'true' - # py_3.7_32: - # PYTHON_VERSION: '3.7.x' - # PYTHON_ARCH: 'x86' - # NP_BUILD_DEP: '1.14.5' - # DAILY_BUILD: 'true' - # py_3.7_64: - # PYTHON_VERSION: '3.7.x' - # NP_BUILD_DEP: '1.14.5' - # DAILY_BUILD: 'true' + py_3.4_64: + PYTHON_VERSION: '3.4.x' + py_3.5_32: + PYTHON_VERSION: '3.5.x' + PYTHON_ARCH: 'x86' + py_3.5_64: + PYTHON_VERSION: '3.5.x' + py_3.6_32: + PYTHON_VERSION: '3.6.x' + PYTHON_ARCH: 'x86' + NP_BUILD_DEP: '1.12.1' + DAILY_BUILD: 'true' + py_3.6_64: + PYTHON_VERSION: '3.6.x' + NP_BUILD_DEP: '1.12.1' + DAILY_BUILD: 'true' + py_3.7_32: + PYTHON_VERSION: '3.7.x' + PYTHON_ARCH: 'x86' + NP_BUILD_DEP: '1.14.5' + DAILY_BUILD: 'true' + py_3.7_64: + PYTHON_VERSION: '3.7.x' + NP_BUILD_DEP: '1.14.5' + DAILY_BUILD: 'true' From 951dc539dcffd8d43967251ea4229eb0f00925c5 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 19:26:14 -0500 Subject: [PATCH 074/194] CLN Moves test to own step --- azure/posix.yml | 7 ++++++- azure/windows.yml | 20 +++++++++++++------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 957b5ff1..0add573a 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -32,6 +32,8 @@ jobs: versionSpec: $(MB_PYTHON_VERSION) displayName: Set python version - script: | + set -e + if [ "$BUILD_REASON" == "Schedule" ]; then if [ "$DAILY_BUILD" != "true" ]; then exit 0 @@ -67,8 +69,10 @@ jobs: fi install_run $PLAT - displayName: Build and Test + displayName: Build, install, and test - script: | + set -e + if [ "$BUILD_REASON" == "Schedule" ]; then if [ "$DAILY_BUILD" != "true" ]; then exit 0 @@ -79,6 +83,7 @@ jobs: CONTAINER="wheels" UPLOAD_ARGS="--no-update-index" fi + pip install wheelhouse-uploader python -m wheelhouse_uploader upload --local-folder \ $BUILD_REPOSITORY_LOCALPATH/wheelhouse/ \ diff --git a/azure/windows.yml b/azure/windows.yml index 78e0cb41..c6429db6 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -41,20 +41,22 @@ jobs: pip --version displayName: Check that we have the expected version and architecture for Python - script: | + @echo on + if "%BUILD_REASON%" == "Schedule" ( if NOT "%DAILY_BUILD%" == "true" ( exit 0 ) set BUILD_COMMIT=%DAILY_COMMIT% ) - pushd scikit-learn + cd scikit-learn git checkout %BUILD_COMMIT% git clean -fxd git reset --hard - popd displayName: Checkout commit - script: | @echo on + if "%BUILD_REASON%" == "Schedule" ( if NOT "%DAILY_BUILD%" == "true" ( exit 0 @@ -71,19 +73,22 @@ jobs: pip install --timeout=60 numpy==%NP_BUILD_DEP% pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% - pushd scikit-learn - python setup.py bdist_wheel - pip install --pre --no-index --find-links dist/ scikit-learn || exit 1 - popd + cd scikit-learn + python setup.py bdist_wheel || exit 1 + pip install --pre --no-index --find-links dist/ scikit-learn + displayName: Build and install + - script: | + @echo on mkdir tmp cd tmp pip install -U --timeout=60 numpy pytest -rs --pyargs sklearn - displayName: Build and Test + displayName: Run tests - script: | @echo on + if "%BUILD_REASON%" == "Schedule" ( if NOT "%DAILY_BUILD%" == "true" ( exit 0 @@ -93,6 +98,7 @@ jobs: set CONTAINER="wheels" set UPLOAD_ARGS="--no-update-index" ) + pip install --timeout=60 wheelhouse_uploader cd scikit-learn python -m wheelhouse_uploader upload --no-ssl-check --local-folder=dist %UPLOAD_ARGS% %CONTAINER% From 456294208449bc306efc26d58ed4b67846091205 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Thu, 7 Mar 2019 20:21:51 -0500 Subject: [PATCH 075/194] CLN Moves test back to step [no upload] --- azure/windows.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index c6429db6..c4d6a7fe 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -73,19 +73,17 @@ jobs: pip install --timeout=60 numpy==%NP_BUILD_DEP% pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% - cd scikit-learn + pushd scikit-learn python setup.py bdist_wheel || exit 1 pip install --pre --no-index --find-links dist/ scikit-learn - displayName: Build and install - - script: | - @echo on + popd mkdir tmp cd tmp pip install -U --timeout=60 numpy pytest -rs --pyargs sklearn - displayName: Run tests + displayName: Build, install, and test - script: | @echo on From 512a5f1b550807e98c6d5a758d1d3d303f108c07 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Fri, 8 Mar 2019 08:14:54 -0500 Subject: [PATCH 076/194] DEBUG --- azure/posix.yml | 112 ++++++++++++++++++++++++------------------------ 1 file changed, 57 insertions(+), 55 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 6ca14114..423634e0 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -25,72 +25,74 @@ jobs: ${{ insert }}: ${{ parameters.matrix }} steps: - - checkout: self - submodules: true + # - checkout: self + # submodules: true - task: UsePythonVersion@0 inputs: versionSpec: $(MB_PYTHON_VERSION) displayName: Set python version - - script: | - set -e + - bash: | + ls "C:\Program Files" + # - script: | + # set -e - if [ "$BUILD_REASON" == "Schedule" ]; then - if [ "$DAILY_BUILD" != "true" ]; then - exit 0 - fi - BUILD_COMMIT=$DAILY_COMMIT - fi - echo "Building scikit-learn-$BUILD_COMMIT" + # if [ "$BUILD_REASON" == "Schedule" ]; then + # if [ "$DAILY_BUILD" != "true" ]; then + # exit 0 + # fi + # BUILD_COMMIT=$DAILY_COMMIT + # fi + # echo "Building scikit-learn-$BUILD_COMMIT" - pip install virtualenv - BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $SCIPY_BUILD_DEP" - TEST_DEPENDS="$NP_TEST_DEP pytest $CYTHON_TEST_DEP $SCIPY_TEST_DEP" + # pip install virtualenv + # BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $SCIPY_BUILD_DEP" + # TEST_DEPENDS="$NP_TEST_DEP pytest $CYTHON_TEST_DEP $SCIPY_TEST_DEP" - if [ `uname` == 'Darwin' ]; then - TRAVIS_OS_NAME='osx' - else - TRAVIS_OS_NAME='linux' - fi + # if [ `uname` == 'Darwin' ]; then + # TRAVIS_OS_NAME='osx' + # else + # TRAVIS_OS_NAME='linux' + # fi - source multibuild/common_utils.sh - source multibuild/travis_steps.sh - before_install + # source multibuild/common_utils.sh + # source multibuild/travis_steps.sh + # before_install - # OpenMP is not present on osx by default - if [ $TRAVIS_OS_NAME == "osx" ]; then - enable_openmp - fi + # # OpenMP is not present on osx by default + # if [ $TRAVIS_OS_NAME == "osx" ]; then + # enable_openmp + # fi - clean_code $REPO_DIR $BUILD_COMMIT - build_wheel $REPO_DIR $PLAT + # clean_code $REPO_DIR $BUILD_COMMIT + # build_wheel $REPO_DIR $PLAT - if [ $TRAVIS_OS_NAME == "osx" ]; then - disable_system_openmp - fi + # if [ $TRAVIS_OS_NAME == "osx" ]; then + # disable_system_openmp + # fi - install_run $PLAT - displayName: Build, install, and test - - script: | - set -e + # install_run $PLAT + # displayName: Build, install, and test + # - script: | + # set -e - if [ "$BUILD_REASON" == "Schedule" ]; then - if [ "$DAILY_BUILD" != "true" ]; then - exit 0 - fi - CONTAINER="sklearn-nightly" - BUILD_COMMIT="$DAILY_COMMIT" - else - CONTAINER="wheels" - UPLOAD_ARGS="--no-update-index" - fi - pip install wheelhouse-uploader - python -m wheelhouse_uploader upload --local-folder \ - $BUILD_REPOSITORY_LOCALPATH/wheelhouse/ \ - $UPLOAD_ARGS \ - $CONTAINER - condition: and(succeeded(), not(contains(variables['Build.SourceVersionMessage'], '[no upload]'))) - env: - WHEELHOUSE_UPLOADER_SECRET: $(WHEELHOUSE_UPLOADER_SECRET) - WHEELHOUSE_UPLOADER_USERNAME: $(WHEELHOUSE_UPLOADER_USERNAME) - displayName: Upload wheel + # if [ "$BUILD_REASON" == "Schedule" ]; then + # if [ "$DAILY_BUILD" != "true" ]; then + # exit 0 + # fi + # CONTAINER="sklearn-nightly" + # BUILD_COMMIT="$DAILY_COMMIT" + # else + # CONTAINER="wheels" + # UPLOAD_ARGS="--no-update-index" + # fi + # pip install wheelhouse-uploader + # python -m wheelhouse_uploader upload --local-folder \ + # $BUILD_REPOSITORY_LOCALPATH/wheelhouse/ \ + # $UPLOAD_ARGS \ + # $CONTAINER + # condition: and(succeeded(), not(contains(variables['Build.SourceVersionMessage'], '[no upload]'))) + # env: + # WHEELHOUSE_UPLOADER_SECRET: $(WHEELHOUSE_UPLOADER_SECRET) + # WHEELHOUSE_UPLOADER_USERNAME: $(WHEELHOUSE_UPLOADER_USERNAME) + # displayName: Upload wheel From 89186fbe46533fba243b490e62275a74cda05cf6 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Fri, 8 Mar 2019 09:00:24 -0500 Subject: [PATCH 077/194] DEBUG --- azure/posix.yml | 112 ++++++++++++++++++------------------ azure/windows.yml | 142 +++++++++++++++++++++++----------------------- 2 files changed, 127 insertions(+), 127 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 423634e0..6ca14114 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -25,74 +25,72 @@ jobs: ${{ insert }}: ${{ parameters.matrix }} steps: - # - checkout: self - # submodules: true + - checkout: self + submodules: true - task: UsePythonVersion@0 inputs: versionSpec: $(MB_PYTHON_VERSION) displayName: Set python version - - bash: | - ls "C:\Program Files" - # - script: | - # set -e + - script: | + set -e - # if [ "$BUILD_REASON" == "Schedule" ]; then - # if [ "$DAILY_BUILD" != "true" ]; then - # exit 0 - # fi - # BUILD_COMMIT=$DAILY_COMMIT - # fi - # echo "Building scikit-learn-$BUILD_COMMIT" + if [ "$BUILD_REASON" == "Schedule" ]; then + if [ "$DAILY_BUILD" != "true" ]; then + exit 0 + fi + BUILD_COMMIT=$DAILY_COMMIT + fi + echo "Building scikit-learn-$BUILD_COMMIT" - # pip install virtualenv - # BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $SCIPY_BUILD_DEP" - # TEST_DEPENDS="$NP_TEST_DEP pytest $CYTHON_TEST_DEP $SCIPY_TEST_DEP" + pip install virtualenv + BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $SCIPY_BUILD_DEP" + TEST_DEPENDS="$NP_TEST_DEP pytest $CYTHON_TEST_DEP $SCIPY_TEST_DEP" - # if [ `uname` == 'Darwin' ]; then - # TRAVIS_OS_NAME='osx' - # else - # TRAVIS_OS_NAME='linux' - # fi + if [ `uname` == 'Darwin' ]; then + TRAVIS_OS_NAME='osx' + else + TRAVIS_OS_NAME='linux' + fi - # source multibuild/common_utils.sh - # source multibuild/travis_steps.sh - # before_install + source multibuild/common_utils.sh + source multibuild/travis_steps.sh + before_install - # # OpenMP is not present on osx by default - # if [ $TRAVIS_OS_NAME == "osx" ]; then - # enable_openmp - # fi + # OpenMP is not present on osx by default + if [ $TRAVIS_OS_NAME == "osx" ]; then + enable_openmp + fi - # clean_code $REPO_DIR $BUILD_COMMIT - # build_wheel $REPO_DIR $PLAT + clean_code $REPO_DIR $BUILD_COMMIT + build_wheel $REPO_DIR $PLAT - # if [ $TRAVIS_OS_NAME == "osx" ]; then - # disable_system_openmp - # fi + if [ $TRAVIS_OS_NAME == "osx" ]; then + disable_system_openmp + fi - # install_run $PLAT - # displayName: Build, install, and test - # - script: | - # set -e + install_run $PLAT + displayName: Build, install, and test + - script: | + set -e - # if [ "$BUILD_REASON" == "Schedule" ]; then - # if [ "$DAILY_BUILD" != "true" ]; then - # exit 0 - # fi - # CONTAINER="sklearn-nightly" - # BUILD_COMMIT="$DAILY_COMMIT" - # else - # CONTAINER="wheels" - # UPLOAD_ARGS="--no-update-index" - # fi - # pip install wheelhouse-uploader - # python -m wheelhouse_uploader upload --local-folder \ - # $BUILD_REPOSITORY_LOCALPATH/wheelhouse/ \ - # $UPLOAD_ARGS \ - # $CONTAINER - # condition: and(succeeded(), not(contains(variables['Build.SourceVersionMessage'], '[no upload]'))) - # env: - # WHEELHOUSE_UPLOADER_SECRET: $(WHEELHOUSE_UPLOADER_SECRET) - # WHEELHOUSE_UPLOADER_USERNAME: $(WHEELHOUSE_UPLOADER_USERNAME) - # displayName: Upload wheel + if [ "$BUILD_REASON" == "Schedule" ]; then + if [ "$DAILY_BUILD" != "true" ]; then + exit 0 + fi + CONTAINER="sklearn-nightly" + BUILD_COMMIT="$DAILY_COMMIT" + else + CONTAINER="wheels" + UPLOAD_ARGS="--no-update-index" + fi + pip install wheelhouse-uploader + python -m wheelhouse_uploader upload --local-folder \ + $BUILD_REPOSITORY_LOCALPATH/wheelhouse/ \ + $UPLOAD_ARGS \ + $CONTAINER + condition: and(succeeded(), not(contains(variables['Build.SourceVersionMessage'], '[no upload]'))) + env: + WHEELHOUSE_UPLOADER_SECRET: $(WHEELHOUSE_UPLOADER_SECRET) + WHEELHOUSE_UPLOADER_USERNAME: $(WHEELHOUSE_UPLOADER_USERNAME) + displayName: Upload wheel diff --git a/azure/windows.yml b/azure/windows.yml index 2193415d..1a6c441e 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -20,88 +20,90 @@ jobs: matrix: ${{ insert }}: ${{ parameters.matrix }} steps: - - checkout: self - submodules: true + # - checkout: self + # submodules: true - task: UsePythonVersion@0 inputs: versionSpec: $(PYTHON_VERSION) architecture: $(PYTHON_ARCH) displayName: Set python version - - powershell: | - $wc = New-Object net.webclient - $wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi") - Start-Process "VCForPython27.msi" /qn -Wait - displayName: 'Install VC 9.0 only for Python 2.7' - condition: eq(variables['PYTHON_VERSION'], '2.7.x') - - script: | - echo PYTHON %PYTHON_VERSION% %PYTHON_ARCH% - echo Build Reason %BUILD_REASON% - python --version - python -c "import struct; print(struct.calcsize('P') * 8)" - pip --version - displayName: Check that we have the expected version and architecture for Python - - script: | - @echo on + - bash: | + ls "C:\Program Files" + # - powershell: | + # $wc = New-Object net.webclient + # $wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi") + # Start-Process "VCForPython27.msi" /qn -Wait + # displayName: 'Install VC 9.0 only for Python 2.7' + # condition: eq(variables['PYTHON_VERSION'], '2.7.x') + # - script: | + # echo PYTHON %PYTHON_VERSION% %PYTHON_ARCH% + # echo Build Reason %BUILD_REASON% + # python --version + # python -c "import struct; print(struct.calcsize('P') * 8)" + # pip --version + # displayName: Check that we have the expected version and architecture for Python + # - script: | + # @echo on - if "%BUILD_REASON%" == "Schedule" ( - if NOT "%DAILY_BUILD%" == "true" ( - exit 0 - ) - set BUILD_COMMIT=%DAILY_COMMIT% - ) - cd scikit-learn - git checkout %BUILD_COMMIT% - git clean -fxd - git reset --hard - displayName: Checkout commit - - script: | - @echo on + # if "%BUILD_REASON%" == "Schedule" ( + # if NOT "%DAILY_BUILD%" == "true" ( + # exit 0 + # ) + # set BUILD_COMMIT=%DAILY_COMMIT% + # ) + # cd scikit-learn + # git checkout %BUILD_COMMIT% + # git clean -fxd + # git reset --hard + # displayName: Checkout commit + # - script: | + # @echo on - if "%BUILD_REASON%" == "Schedule" ( - if NOT "%DAILY_BUILD%" == "true" ( - exit 0 - ) - ) + # if "%BUILD_REASON%" == "Schedule" ( + # if NOT "%DAILY_BUILD%" == "true" ( + # exit 0 + # ) + # ) - if "%PYTHON_VERSION%" == "3.4.x" ( - CALL "%VS140COMNTOOLS%/vsvars32.bat" + # if "%PYTHON_VERSION%" == "3.4.x" ( + # CALL "%VS140COMNTOOLS%/vsvars32.bat" - set DISTUTILS_USE_SDK=1 - set MSSdk=1 - ) + # set DISTUTILS_USE_SDK=1 + # set MSSdk=1 + # ) - pip install --timeout=60 numpy==%NP_BUILD_DEP% - pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% + # pip install --timeout=60 numpy==%NP_BUILD_DEP% + # pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% - pushd scikit-learn - python setup.py bdist_wheel || exit 1 - pip install --pre --no-index --find-links dist/ scikit-learn - popd + # pushd scikit-learn + # python setup.py bdist_wheel || exit 1 + # pip install --pre --no-index --find-links dist/ scikit-learn + # popd - mkdir tmp - cd tmp + # mkdir tmp + # cd tmp - pip install -U --timeout=60 numpy - pytest -rs --pyargs sklearn - displayName: Build, install, and test - - script: | - @echo on + # pip install -U --timeout=60 numpy + # pytest -rs --pyargs sklearn + # displayName: Build, install, and test + # - script: | + # @echo on - if "%BUILD_REASON%" == "Schedule" ( - if NOT "%DAILY_BUILD%" == "true" ( - exit 0 - ) - set CONTAINER="sklearn-nightly" - ) else ( - set CONTAINER="wheels" - set UPLOAD_ARGS="--no-update-index" - ) - pip install --timeout=60 wheelhouse_uploader - cd scikit-learn - python -m wheelhouse_uploader upload --no-ssl-check --local-folder=dist %UPLOAD_ARGS% %CONTAINER% - condition: and(succeeded(), not(contains(variables['Build.SourceVersionMessage'], '[no upload]'))) - env: - WHEELHOUSE_UPLOADER_SECRET: $(WHEELHOUSE_UPLOADER_SECRET) - WHEELHOUSE_UPLOADER_USERNAME: $(WHEELHOUSE_UPLOADER_USERNAME) - displayName: Upload wheel + # if "%BUILD_REASON%" == "Schedule" ( + # if NOT "%DAILY_BUILD%" == "true" ( + # exit 0 + # ) + # set CONTAINER="sklearn-nightly" + # ) else ( + # set CONTAINER="wheels" + # set UPLOAD_ARGS="--no-update-index" + # ) + # pip install --timeout=60 wheelhouse_uploader + # cd scikit-learn + # python -m wheelhouse_uploader upload --no-ssl-check --local-folder=dist %UPLOAD_ARGS% %CONTAINER% + # condition: and(succeeded(), not(contains(variables['Build.SourceVersionMessage'], '[no upload]'))) + # env: + # WHEELHOUSE_UPLOADER_SECRET: $(WHEELHOUSE_UPLOADER_SECRET) + # WHEELHOUSE_UPLOADER_USERNAME: $(WHEELHOUSE_UPLOADER_USERNAME) + # displayName: Upload wheel From e9a032911e9b1373cacc9238a7605a7d2ab9a340 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Fri, 8 Mar 2019 09:08:27 -0500 Subject: [PATCH 078/194] DEBUG --- azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index 1a6c441e..4a5b928a 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -28,7 +28,7 @@ jobs: architecture: $(PYTHON_ARCH) displayName: Set python version - bash: | - ls "C:\Program Files" + ls "C:\Program Files\MSBuild" # - powershell: | # $wc = New-Object net.webclient # $wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi") From abf2a8fdcfe13bd7cd68f00c16a0570f88c5cb17 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Fri, 8 Mar 2019 09:09:53 -0500 Subject: [PATCH 079/194] DEBUG --- azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index 4a5b928a..63ea075f 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -28,7 +28,7 @@ jobs: architecture: $(PYTHON_ARCH) displayName: Set python version - bash: | - ls "C:\Program Files\MSBuild" + ls "C:\Program Files\MSBuild\Microsoft" # - powershell: | # $wc = New-Object net.webclient # $wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi") From 00ed30de3de085b46e84db7e0df9af01f4412edb Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Fri, 8 Mar 2019 09:18:22 -0500 Subject: [PATCH 080/194] DEBUG --- azure/windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure/windows.yml b/azure/windows.yml index 63ea075f..98b31fd5 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -29,6 +29,7 @@ jobs: displayName: Set python version - bash: | ls "C:\Program Files\MSBuild\Microsoft" + ls "$VS140COMNTOOLS" # - powershell: | # $wc = New-Object net.webclient # $wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi") From e9c13d5eb08d3aa826be6a659a6974d491a78934 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Fri, 8 Mar 2019 09:24:14 -0500 Subject: [PATCH 081/194] DEBUG --- azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index 98b31fd5..0a24bb42 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -28,8 +28,8 @@ jobs: architecture: $(PYTHON_ARCH) displayName: Set python version - bash: | - ls "C:\Program Files\MSBuild\Microsoft" ls "$VS140COMNTOOLS" + cat "$VS140COMNTOOLS/VCVarsQueryRegistry.bat" # - powershell: | # $wc = New-Object net.webclient # $wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi") From 066afad0e42b28f5ae921c6778100dcfa5551deb Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Fri, 8 Mar 2019 09:30:29 -0500 Subject: [PATCH 082/194] DEBUG --- azure/windows.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index 0a24bb42..c6a69500 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -28,8 +28,10 @@ jobs: architecture: $(PYTHON_ARCH) displayName: Set python version - bash: | + set -ex ls "$VS140COMNTOOLS" - cat "$VS140COMNTOOLS/VCVarsQueryRegistry.bat" + ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0" + ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7" # - powershell: | # $wc = New-Object net.webclient # $wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi") From 000f270843b4ae1a8ef1649590111fb52301bfc5 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Fri, 8 Mar 2019 09:33:58 -0500 Subject: [PATCH 083/194] DEBUG --- azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index c6a69500..45c0a1b0 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -30,7 +30,7 @@ jobs: - bash: | set -ex ls "$VS140COMNTOOLS" - ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0" + ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC" ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7" # - powershell: | # $wc = New-Object net.webclient From 912057a61f639a71ea4e87f8ec8de5a42743570a Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Fri, 8 Mar 2019 09:39:07 -0500 Subject: [PATCH 084/194] DEBUG --- azure/windows.yml | 149 +++++++++++++++++++++++----------------------- 1 file changed, 74 insertions(+), 75 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 45c0a1b0..6165a25f 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -20,93 +20,92 @@ jobs: matrix: ${{ insert }}: ${{ parameters.matrix }} steps: - # - checkout: self - # submodules: true + - checkout: self + submodules: true - task: UsePythonVersion@0 inputs: versionSpec: $(PYTHON_VERSION) architecture: $(PYTHON_ARCH) displayName: Set python version - - bash: | - set -ex - ls "$VS140COMNTOOLS" - ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC" - ls "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7" - # - powershell: | - # $wc = New-Object net.webclient - # $wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi") - # Start-Process "VCForPython27.msi" /qn -Wait - # displayName: 'Install VC 9.0 only for Python 2.7' - # condition: eq(variables['PYTHON_VERSION'], '2.7.x') - # - script: | - # echo PYTHON %PYTHON_VERSION% %PYTHON_ARCH% - # echo Build Reason %BUILD_REASON% - # python --version - # python -c "import struct; print(struct.calcsize('P') * 8)" - # pip --version - # displayName: Check that we have the expected version and architecture for Python - # - script: | - # @echo on + - powershell: | + $wc = New-Object net.webclient + $wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi") + Start-Process "VCForPython27.msi" /qn -Wait + displayName: 'Install VC 9.0 only for Python 2.7' + condition: eq(variables['PYTHON_VERSION'], '2.7.x') + - script: | + echo PYTHON %PYTHON_VERSION% %PYTHON_ARCH% + echo Build Reason %BUILD_REASON% + python --version + python -c "import struct; print(struct.calcsize('P') * 8)" + pip --version + displayName: Check that we have the expected version and architecture for Python + - script: | + @echo on - # if "%BUILD_REASON%" == "Schedule" ( - # if NOT "%DAILY_BUILD%" == "true" ( - # exit 0 - # ) - # set BUILD_COMMIT=%DAILY_COMMIT% - # ) - # cd scikit-learn - # git checkout %BUILD_COMMIT% - # git clean -fxd - # git reset --hard - # displayName: Checkout commit - # - script: | - # @echo on + if "%BUILD_REASON%" == "Schedule" ( + if NOT "%DAILY_BUILD%" == "true" ( + exit 0 + ) + set BUILD_COMMIT=%DAILY_COMMIT% + ) + cd scikit-learn + git checkout %BUILD_COMMIT% + git clean -fxd + git reset --hard + displayName: Checkout commit + - script: | + @echo on - # if "%BUILD_REASON%" == "Schedule" ( - # if NOT "%DAILY_BUILD%" == "true" ( - # exit 0 - # ) - # ) + if "%BUILD_REASON%" == "Schedule" ( + if NOT "%DAILY_BUILD%" == "true" ( + exit 0 + ) + ) - # if "%PYTHON_VERSION%" == "3.4.x" ( - # CALL "%VS140COMNTOOLS%/vsvars32.bat" + if "%PYTHON_VERSION%" == "3.4.x" ( + if "%PYTHON_ARCH%" == "x86" ( + CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" 32bit No64bit + ) else ( + CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" No32bit 64bit + ) - # set DISTUTILS_USE_SDK=1 - # set MSSdk=1 - # ) + set DISTUTILS_USE_SDK=1 + set MSSdk=1 + ) - # pip install --timeout=60 numpy==%NP_BUILD_DEP% - # pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% + pip install --timeout=60 numpy==%NP_BUILD_DEP% + pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% - # pushd scikit-learn - # python setup.py bdist_wheel || exit 1 - # pip install --pre --no-index --find-links dist/ scikit-learn - # popd + pushd scikit-learn + python setup.py bdist_wheel || exit 1 + pip install --pre --no-index --find-links dist/ scikit-learn + popd - # mkdir tmp - # cd tmp + mkdir tmp + cd tmp - # pip install -U --timeout=60 numpy - # pytest -rs --pyargs sklearn - # displayName: Build, install, and test - # - script: | - # @echo on + pip install -U --timeout=60 numpy + @REM pytest -rs --pyargs sklearn + displayName: Build, install, and test + - script: | + @echo on - # if "%BUILD_REASON%" == "Schedule" ( - # if NOT "%DAILY_BUILD%" == "true" ( - # exit 0 - # ) - # set CONTAINER="sklearn-nightly" - # ) else ( - # set CONTAINER="wheels" - # set UPLOAD_ARGS="--no-update-index" - # ) - # pip install --timeout=60 wheelhouse_uploader - # cd scikit-learn - # python -m wheelhouse_uploader upload --no-ssl-check --local-folder=dist %UPLOAD_ARGS% %CONTAINER% - # condition: and(succeeded(), not(contains(variables['Build.SourceVersionMessage'], '[no upload]'))) - # env: - # WHEELHOUSE_UPLOADER_SECRET: $(WHEELHOUSE_UPLOADER_SECRET) - # WHEELHOUSE_UPLOADER_USERNAME: $(WHEELHOUSE_UPLOADER_USERNAME) - # displayName: Upload wheel + if "%BUILD_REASON%" == "Schedule" ( + if NOT "%DAILY_BUILD%" == "true" ( + exit 0 + ) + set CONTAINER="sklearn-nightly" + ) else ( + set CONTAINER="wheels" + set UPLOAD_ARGS="--no-update-index" + ) + pip install --timeout=60 wheelhouse_uploader + cd scikit-learn + python -m wheelhouse_uploader upload --no-ssl-check --local-folder=dist %UPLOAD_ARGS% %CONTAINER% + condition: and(succeeded(), not(contains(variables['Build.SourceVersionMessage'], '[no upload]'))) + env: + WHEELHOUSE_UPLOADER_SECRET: $(WHEELHOUSE_UPLOADER_SECRET) + WHEELHOUSE_UPLOADER_USERNAME: $(WHEELHOUSE_UPLOADER_USERNAME) + displayName: Upload wheel From 35e9450cba36ca25b5f0c9f80882fd2b62d6dfe3 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Fri, 8 Mar 2019 09:44:42 -0500 Subject: [PATCH 085/194] DEBUG [no upload] --- azure/windows.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 6165a25f..d15c3825 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -64,10 +64,10 @@ jobs: ) if "%PYTHON_VERSION%" == "3.4.x" ( - if "%PYTHON_ARCH%" == "x86" ( - CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" 32bit No64bit + if "%PYTHON_ARCH%" == "x64" ( + CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 ) else ( - CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" No32bit 64bit + CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 ) set DISTUTILS_USE_SDK=1 From 9fd7b22bc7ff001f26c69803ff48b84298a7eda8 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Fri, 8 Mar 2019 09:51:21 -0500 Subject: [PATCH 086/194] ENH: Enable windows 32 [no upload] --- azure-pipelines.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d668de33..aac11931 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -84,9 +84,9 @@ jobs: # PYTHON_ARCH: 'x86' # py_2.7_64: # PYTHON_VERSION: '2.7.x' - # py_3.4_32: - # PYTHON_VERSION: '3.4.x' - # PYTHON_ARCH: 'x86' + py_3.4_32: + PYTHON_VERSION: '3.4.x' + PYTHON_ARCH: 'x86' py_3.4_64: PYTHON_VERSION: '3.4.x' # py_3.5_32: From 133d023087ee2e76b4fd4c3aa1ae51f177ba513e Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Fri, 8 Mar 2019 10:06:36 -0500 Subject: [PATCH 087/194] ENH: Enable windows 32 [no upload] --- azure/windows.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index d15c3825..5cee16e6 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -64,11 +64,7 @@ jobs: ) if "%PYTHON_VERSION%" == "3.4.x" ( - if "%PYTHON_ARCH%" == "x64" ( - CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 - ) else ( - CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 - ) + CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" "%PYTHON_ARCH%" set DISTUTILS_USE_SDK=1 set MSSdk=1 From 42fd5308ef759398514360d3c7f0dac0ea87efec Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Fri, 8 Mar 2019 10:10:54 -0500 Subject: [PATCH 088/194] ENH: Enable windows 32 [no upload] --- azure/windows.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index 5cee16e6..9663bbce 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -64,7 +64,11 @@ jobs: ) if "%PYTHON_VERSION%" == "3.4.x" ( - CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" "%PYTHON_ARCH%" + if "%PYTHON_ARCH%" == "x64" ( + CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 + ) else ( + CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 + ) set DISTUTILS_USE_SDK=1 set MSSdk=1 From ada8fd2f22e26fdd13b8fb0ef751dbeafa57946b Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Fri, 8 Mar 2019 10:16:38 -0500 Subject: [PATCH 089/194] ENH: Adds windows python 3.4 support [no upload] --- azure-pipelines.yml | 200 ++++++++++++++++++++++---------------------- azure/windows.yml | 2 +- 2 files changed, 101 insertions(+), 101 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index aac11931..9e1fedf8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,77 +1,77 @@ jobs: -# - template: azure/posix.yml -# parameters: -# name: linux -# vmImage: ubuntu-16.04 -# matrix: -# py_2.7_64_uni_32: -# MB_PYTHON_VERSION: '2.7' -# py_2.7_64_uni_16: -# MB_PYTHON_VERSION: '2.7' -# UNICODE_WIDTH: '16' -# py_2.7_32_uni_32: -# MB_PYTHON_VERSION: '2.7' -# PLAT: 'i686' -# py_2.7_32_uni_16: -# MB_PYTHON_VERSION: '2.7' -# PLAT: 'i686' -# UNICODE_WIDTH: '16' -# py_3.4_64: -# MB_PYTHON_VERSION: '3.4' -# NP_BUILD_DEP: 'numpy==1.9.3' -# py_3.4_32: -# MB_PYTHON_VERSION: '3.4' -# PLAT: 'i686' -# NP_BUILD_DEP: 'numpy==1.9.3' -# py_3.5_64: -# MB_PYTHON_VERSION: '3.5' -# NP_BUILD_DEP: 'numpy==1.9.3' -# py_3.5_32: -# MB_PYTHON_VERSION: '3.5' -# PLAT: 'i686' -# NP_BUILD_DEP: 'numpy==1.9.3' -# py_3.6_64: -# MB_PYTHON_VERSION: '3.6' -# NP_BUILD_DEP: 'numpy==1.11.3' -# DAILY_BUILD: 'true' -# py_3.6_32: -# MB_PYTHON_VERSION: '3.6' -# PLAT: 'i686' -# NP_BUILD_DEP: 'numpy==1.11.3' -# DAILY_BUILD: 'true' -# py_3.7_64: -# MB_PYTHON_VERSION: '3.7' -# NP_BUILD_DEP: 'numpy==1.14.5' -# NP_TEST_DEP: 'numpy==1.14.5' -# DAILY_BUILD: 'true' -# py_3.7_32: -# MB_PYTHON_VERSION: '3.7' -# PLAT: 'i686' -# NP_BUILD_DEP: 'numpy==1.14.5' -# NP_TEST_DEP: 'numpy==1.14.5' -# DAILY_BUILD: 'true' +- template: azure/posix.yml + parameters: + name: linux + vmImage: ubuntu-16.04 + matrix: + py_2.7_64_uni_32: + MB_PYTHON_VERSION: '2.7' + py_2.7_64_uni_16: + MB_PYTHON_VERSION: '2.7' + UNICODE_WIDTH: '16' + py_2.7_32_uni_32: + MB_PYTHON_VERSION: '2.7' + PLAT: 'i686' + py_2.7_32_uni_16: + MB_PYTHON_VERSION: '2.7' + PLAT: 'i686' + UNICODE_WIDTH: '16' + py_3.4_64: + MB_PYTHON_VERSION: '3.4' + NP_BUILD_DEP: 'numpy==1.9.3' + py_3.4_32: + MB_PYTHON_VERSION: '3.4' + PLAT: 'i686' + NP_BUILD_DEP: 'numpy==1.9.3' + py_3.5_64: + MB_PYTHON_VERSION: '3.5' + NP_BUILD_DEP: 'numpy==1.9.3' + py_3.5_32: + MB_PYTHON_VERSION: '3.5' + PLAT: 'i686' + NP_BUILD_DEP: 'numpy==1.9.3' + py_3.6_64: + MB_PYTHON_VERSION: '3.6' + NP_BUILD_DEP: 'numpy==1.11.3' + DAILY_BUILD: 'true' + py_3.6_32: + MB_PYTHON_VERSION: '3.6' + PLAT: 'i686' + NP_BUILD_DEP: 'numpy==1.11.3' + DAILY_BUILD: 'true' + py_3.7_64: + MB_PYTHON_VERSION: '3.7' + NP_BUILD_DEP: 'numpy==1.14.5' + NP_TEST_DEP: 'numpy==1.14.5' + DAILY_BUILD: 'true' + py_3.7_32: + MB_PYTHON_VERSION: '3.7' + PLAT: 'i686' + NP_BUILD_DEP: 'numpy==1.14.5' + NP_TEST_DEP: 'numpy==1.14.5' + DAILY_BUILD: 'true' -# - template: azure/posix.yml -# parameters: -# name: macOS -# vmImage: xcode9-macos10.13 -# matrix: -# py_2.7_64: -# MB_PYTHON_VERSION: '2.7' -# py_3.4_64: -# MB_PYTHON_VERSION: '3.4' -# py_3.5_64: -# MB_PYTHON_VERSION: '3.5' -# NP_BUILD_DEP: 'numpy==1.9.3' -# py_3.6_64: -# MB_PYTHON_VERSION: '3.6' -# NP_BUILD_DEP: 'numpy==1.11.3' -# DAILY_BUILD: 'true' -# py_3.7_64: -# MB_PYTHON_VERSION: '3.7' -# NP_BUILD_DEP: 'numpy==1.14.5' -# NP_TEST_DEP: 'numpy==1.14.5' -# DAILY_BUILD: 'true' +- template: azure/posix.yml + parameters: + name: macOS + vmImage: xcode9-macos10.13 + matrix: + py_2.7_64: + MB_PYTHON_VERSION: '2.7' + py_3.4_64: + MB_PYTHON_VERSION: '3.4' + py_3.5_64: + MB_PYTHON_VERSION: '3.5' + NP_BUILD_DEP: 'numpy==1.9.3' + py_3.6_64: + MB_PYTHON_VERSION: '3.6' + NP_BUILD_DEP: 'numpy==1.11.3' + DAILY_BUILD: 'true' + py_3.7_64: + MB_PYTHON_VERSION: '3.7' + NP_BUILD_DEP: 'numpy==1.14.5' + NP_TEST_DEP: 'numpy==1.14.5' + DAILY_BUILD: 'true' - template: azure/windows.yml @@ -79,36 +79,36 @@ jobs: name: windows vmImage: vs2017-win2016 matrix: - # py_2.7_32: - # PYTHON_VERSION: '2.7.x' - # PYTHON_ARCH: 'x86' - # py_2.7_64: - # PYTHON_VERSION: '2.7.x' + py_2.7_32: + PYTHON_VERSION: '2.7.x' + PYTHON_ARCH: 'x86' + py_2.7_64: + PYTHON_VERSION: '2.7.x' py_3.4_32: PYTHON_VERSION: '3.4.x' PYTHON_ARCH: 'x86' py_3.4_64: PYTHON_VERSION: '3.4.x' - # py_3.5_32: - # PYTHON_VERSION: '3.5.x' - # PYTHON_ARCH: 'x86' - # py_3.5_64: - # PYTHON_VERSION: '3.5.x' - # py_3.6_32: - # PYTHON_VERSION: '3.6.x' - # PYTHON_ARCH: 'x86' - # NP_BUILD_DEP: '1.12.1' - # DAILY_BUILD: 'true' - # py_3.6_64: - # PYTHON_VERSION: '3.6.x' - # NP_BUILD_DEP: '1.12.1' - # DAILY_BUILD: 'true' - # py_3.7_32: - # PYTHON_VERSION: '3.7.x' - # PYTHON_ARCH: 'x86' - # NP_BUILD_DEP: '1.14.5' - # DAILY_BUILD: 'true' - # py_3.7_64: - # PYTHON_VERSION: '3.7.x' - # NP_BUILD_DEP: '1.14.5' - # DAILY_BUILD: 'true' + py_3.5_32: + PYTHON_VERSION: '3.5.x' + PYTHON_ARCH: 'x86' + py_3.5_64: + PYTHON_VERSION: '3.5.x' + py_3.6_32: + PYTHON_VERSION: '3.6.x' + PYTHON_ARCH: 'x86' + NP_BUILD_DEP: '1.12.1' + DAILY_BUILD: 'true' + py_3.6_64: + PYTHON_VERSION: '3.6.x' + NP_BUILD_DEP: '1.12.1' + DAILY_BUILD: 'true' + py_3.7_32: + PYTHON_VERSION: '3.7.x' + PYTHON_ARCH: 'x86' + NP_BUILD_DEP: '1.14.5' + DAILY_BUILD: 'true' + py_3.7_64: + PYTHON_VERSION: '3.7.x' + NP_BUILD_DEP: '1.14.5' + DAILY_BUILD: 'true' diff --git a/azure/windows.yml b/azure/windows.yml index 9663bbce..295214c4 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -86,7 +86,7 @@ jobs: cd tmp pip install -U --timeout=60 numpy - @REM pytest -rs --pyargs sklearn + pytest -rs --pyargs sklearn displayName: Build, install, and test - script: | @echo on From d091b984243b3eec5388927dde956ff6d191da9b Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 15 May 2019 14:19:57 -0400 Subject: [PATCH 090/194] ENH Sync with travis and appveyor config --- azure-pipelines.yml | 42 +----------------------------------------- azure/posix.yml | 10 ++++++---- azure/windows.yml | 8 ++++---- 3 files changed, 11 insertions(+), 49 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9e1fedf8..38fc67ea 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,51 +4,26 @@ jobs: name: linux vmImage: ubuntu-16.04 matrix: - py_2.7_64_uni_32: - MB_PYTHON_VERSION: '2.7' - py_2.7_64_uni_16: - MB_PYTHON_VERSION: '2.7' - UNICODE_WIDTH: '16' - py_2.7_32_uni_32: - MB_PYTHON_VERSION: '2.7' - PLAT: 'i686' - py_2.7_32_uni_16: - MB_PYTHON_VERSION: '2.7' - PLAT: 'i686' - UNICODE_WIDTH: '16' - py_3.4_64: - MB_PYTHON_VERSION: '3.4' - NP_BUILD_DEP: 'numpy==1.9.3' - py_3.4_32: - MB_PYTHON_VERSION: '3.4' - PLAT: 'i686' - NP_BUILD_DEP: 'numpy==1.9.3' py_3.5_64: MB_PYTHON_VERSION: '3.5' - NP_BUILD_DEP: 'numpy==1.9.3' py_3.5_32: MB_PYTHON_VERSION: '3.5' PLAT: 'i686' - NP_BUILD_DEP: 'numpy==1.9.3' py_3.6_64: MB_PYTHON_VERSION: '3.6' - NP_BUILD_DEP: 'numpy==1.11.3' DAILY_BUILD: 'true' py_3.6_32: MB_PYTHON_VERSION: '3.6' PLAT: 'i686' - NP_BUILD_DEP: 'numpy==1.11.3' DAILY_BUILD: 'true' py_3.7_64: MB_PYTHON_VERSION: '3.7' NP_BUILD_DEP: 'numpy==1.14.5' - NP_TEST_DEP: 'numpy==1.14.5' DAILY_BUILD: 'true' py_3.7_32: MB_PYTHON_VERSION: '3.7' PLAT: 'i686' NP_BUILD_DEP: 'numpy==1.14.5' - NP_TEST_DEP: 'numpy==1.14.5' DAILY_BUILD: 'true' - template: azure/posix.yml @@ -56,13 +31,9 @@ jobs: name: macOS vmImage: xcode9-macos10.13 matrix: - py_2.7_64: - MB_PYTHON_VERSION: '2.7' - py_3.4_64: - MB_PYTHON_VERSION: '3.4' py_3.5_64: MB_PYTHON_VERSION: '3.5' - NP_BUILD_DEP: 'numpy==1.9.3' + SCIPY_BUILD_DEP: 'scipy==0.17.1' py_3.6_64: MB_PYTHON_VERSION: '3.6' NP_BUILD_DEP: 'numpy==1.11.3' @@ -70,7 +41,6 @@ jobs: py_3.7_64: MB_PYTHON_VERSION: '3.7' NP_BUILD_DEP: 'numpy==1.14.5' - NP_TEST_DEP: 'numpy==1.14.5' DAILY_BUILD: 'true' @@ -79,16 +49,6 @@ jobs: name: windows vmImage: vs2017-win2016 matrix: - py_2.7_32: - PYTHON_VERSION: '2.7.x' - PYTHON_ARCH: 'x86' - py_2.7_64: - PYTHON_VERSION: '2.7.x' - py_3.4_32: - PYTHON_VERSION: '3.4.x' - PYTHON_ARCH: 'x86' - py_3.4_64: - PYTHON_VERSION: '3.4.x' py_3.5_32: PYTHON_VERSION: '3.5.x' PYTHON_ARCH: 'x86' diff --git a/azure/posix.yml b/azure/posix.yml index 6ca14114..ba9ccdfd 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -9,15 +9,17 @@ jobs: vmImage: ${{ parameters.vmImage }} variables: REPO_DIR: 'scikit-learn' - BUILD_COMMIT: '0.20.3' + BUILD_COMMIT: '0.21.1' PLAT: 'x86_64' UNICODE_WIDTH: '32' - NP_BUILD_DEP: 'numpy==1.8.2' - NP_TEST_DEP: 'numpy==1.13.1' - CYTHON_BUILD_DEP: 'cython==0.28.5' + NP_BUILD_DEP: 'numpy==1.11.0' + NP_TEST_DEP: 'numpy' + CYTHON_BUILD_DEP: 'cython==0.29.7' CYTHON_TEST_DEP: 'cython' SCIPY_BUILD_DEP: 'scipy' SCIPY_TEST_DEP: 'scipy' + JOBLIB_BUILD_DEP: 'joblb==0.11' + JOBLIB_TEST_DEP: 'joblib' DAILY_COMMIT: 'master' DAILY_BUILD: 'false' strategy: diff --git a/azure/windows.yml b/azure/windows.yml index 295214c4..eeebd13c 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -8,10 +8,10 @@ jobs: pool: vmImage: ${{ parameters.vmImage }} variables: - BUILD_COMMIT: '0.20.3' + BUILD_COMMIT: '0.21.1' SKLEARN_SKIP_NETWORK_TESTS: '1' - NP_BUILD_DEP: '1.10.4' - CYTHON_BUILD_DEP: '0.28.5' + NP_BUILD_DEP: '1.11.0' + CYTHON_BUILD_DEP: '0.29.7' SCIPY_BUILD_DEP: '1.1.0' DAILY_COMMIT: 'master' DAILY_BUILD: 'false' @@ -75,7 +75,7 @@ jobs: ) pip install --timeout=60 numpy==%NP_BUILD_DEP% - pip install --timeout=60 pytest wheel scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% + pip install --timeout=60 pytest wheel joblib scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% pushd scikit-learn python setup.py bdist_wheel || exit 1 From 3164b08b9effde79e598bc1acf48e0f22419d13b Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Wed, 15 May 2019 14:45:29 -0400 Subject: [PATCH 091/194] CLN Comments out linux and osx --- azure-pipelines.yml | 89 ++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 45 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 38fc67ea..472a7bf6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,49 +1,4 @@ jobs: -- template: azure/posix.yml - parameters: - name: linux - vmImage: ubuntu-16.04 - matrix: - py_3.5_64: - MB_PYTHON_VERSION: '3.5' - py_3.5_32: - MB_PYTHON_VERSION: '3.5' - PLAT: 'i686' - py_3.6_64: - MB_PYTHON_VERSION: '3.6' - DAILY_BUILD: 'true' - py_3.6_32: - MB_PYTHON_VERSION: '3.6' - PLAT: 'i686' - DAILY_BUILD: 'true' - py_3.7_64: - MB_PYTHON_VERSION: '3.7' - NP_BUILD_DEP: 'numpy==1.14.5' - DAILY_BUILD: 'true' - py_3.7_32: - MB_PYTHON_VERSION: '3.7' - PLAT: 'i686' - NP_BUILD_DEP: 'numpy==1.14.5' - DAILY_BUILD: 'true' - -- template: azure/posix.yml - parameters: - name: macOS - vmImage: xcode9-macos10.13 - matrix: - py_3.5_64: - MB_PYTHON_VERSION: '3.5' - SCIPY_BUILD_DEP: 'scipy==0.17.1' - py_3.6_64: - MB_PYTHON_VERSION: '3.6' - NP_BUILD_DEP: 'numpy==1.11.3' - DAILY_BUILD: 'true' - py_3.7_64: - MB_PYTHON_VERSION: '3.7' - NP_BUILD_DEP: 'numpy==1.14.5' - DAILY_BUILD: 'true' - - - template: azure/windows.yml parameters: name: windows @@ -72,3 +27,47 @@ jobs: PYTHON_VERSION: '3.7.x' NP_BUILD_DEP: '1.14.5' DAILY_BUILD: 'true' + +# - template: azure/posix.yml +# parameters: +# name: linux +# vmImage: ubuntu-16.04 +# matrix: +# py_3.5_64: +# MB_PYTHON_VERSION: '3.5' +# py_3.5_32: +# MB_PYTHON_VERSION: '3.5' +# PLAT: 'i686' +# py_3.6_64: +# MB_PYTHON_VERSION: '3.6' +# DAILY_BUILD: 'true' +# py_3.6_32: +# MB_PYTHON_VERSION: '3.6' +# PLAT: 'i686' +# DAILY_BUILD: 'true' +# py_3.7_64: +# MB_PYTHON_VERSION: '3.7' +# NP_BUILD_DEP: 'numpy==1.14.5' +# DAILY_BUILD: 'true' +# py_3.7_32: +# MB_PYTHON_VERSION: '3.7' +# PLAT: 'i686' +# NP_BUILD_DEP: 'numpy==1.14.5' +# DAILY_BUILD: 'true' + +# - template: azure/posix.yml +# parameters: +# name: macOS +# vmImage: xcode9-macos10.13 +# matrix: +# py_3.5_64: +# MB_PYTHON_VERSION: '3.5' +# SCIPY_BUILD_DEP: 'scipy==0.17.1' +# py_3.6_64: +# MB_PYTHON_VERSION: '3.6' +# NP_BUILD_DEP: 'numpy==1.11.3' +# DAILY_BUILD: 'true' +# py_3.7_64: +# MB_PYTHON_VERSION: '3.7' +# NP_BUILD_DEP: 'numpy==1.14.5' +# DAILY_BUILD: 'true' From 06a16f2b20ffcad4f16c39ab3c8d0591fde5a631 Mon Sep 17 00:00:00 2001 From: Thomas Fan Date: Fri, 31 May 2019 18:09:06 -0400 Subject: [PATCH 092/194] BLD Trigger CI From e6dc026ed6de2b2dafd741801c2677277b2653f2 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 13:05:54 -0500 Subject: [PATCH 093/194] MNT Updates multibuild --- multibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multibuild b/multibuild index 68a4af04..6b0ddb52 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit 68a4af043e2adb0d9353d4a0e1f3d871203237aa +Subproject commit 6b0ddb5281f59d976c8026c082c9d73faf274790 From c0362ef22394aecbfa2fc223017aed272f15508c Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 13:16:43 -0500 Subject: [PATCH 094/194] CLN Removes wheelhouse --- azure-pipelines.yml | 140 +++++++++++++++++------------------ azure/posix.yml | 143 +++++++++++++++--------------------- azure/windows.yml | 173 +++++++++++++++++++------------------------- 3 files changed, 206 insertions(+), 250 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 472a7bf6..789040b3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,73 +1,73 @@ jobs: -- template: azure/windows.yml - parameters: - name: windows - vmImage: vs2017-win2016 - matrix: - py_3.5_32: - PYTHON_VERSION: '3.5.x' - PYTHON_ARCH: 'x86' - py_3.5_64: - PYTHON_VERSION: '3.5.x' - py_3.6_32: - PYTHON_VERSION: '3.6.x' - PYTHON_ARCH: 'x86' - NP_BUILD_DEP: '1.12.1' - DAILY_BUILD: 'true' - py_3.6_64: - PYTHON_VERSION: '3.6.x' - NP_BUILD_DEP: '1.12.1' - DAILY_BUILD: 'true' - py_3.7_32: - PYTHON_VERSION: '3.7.x' - PYTHON_ARCH: 'x86' - NP_BUILD_DEP: '1.14.5' - DAILY_BUILD: 'true' - py_3.7_64: - PYTHON_VERSION: '3.7.x' - NP_BUILD_DEP: '1.14.5' - DAILY_BUILD: 'true' + # - template: azure/windows.yml + # parameters: + # name: windows + # vmImage: vs2017-win2016 + # matrix: + # py_3.5_32: + # PYTHON_VERSION: "3.5.x" + # PYTHON_ARCH: "x86" + # py_3.5_64: + # PYTHON_VERSION: "3.5.x" + # py_3.6_32: + # PYTHON_VERSION: "3.6.x" + # PYTHON_ARCH: "x86" + # NP_BUILD_DEP: "1.12.1" + # DAILY_BUILD: "true" + # py_3.6_64: + # PYTHON_VERSION: "3.6.x" + # NP_BUILD_DEP: "1.12.1" + # DAILY_BUILD: "true" + # py_3.7_32: + # PYTHON_VERSION: "3.7.x" + # PYTHON_ARCH: "x86" + # NP_BUILD_DEP: "1.14.5" + # DAILY_BUILD: "true" + # py_3.7_64: + # PYTHON_VERSION: "3.7.x" + # NP_BUILD_DEP: "1.14.5" + # DAILY_BUILD: "true" -# - template: azure/posix.yml -# parameters: -# name: linux -# vmImage: ubuntu-16.04 -# matrix: -# py_3.5_64: -# MB_PYTHON_VERSION: '3.5' -# py_3.5_32: -# MB_PYTHON_VERSION: '3.5' -# PLAT: 'i686' -# py_3.6_64: -# MB_PYTHON_VERSION: '3.6' -# DAILY_BUILD: 'true' -# py_3.6_32: -# MB_PYTHON_VERSION: '3.6' -# PLAT: 'i686' -# DAILY_BUILD: 'true' -# py_3.7_64: -# MB_PYTHON_VERSION: '3.7' -# NP_BUILD_DEP: 'numpy==1.14.5' -# DAILY_BUILD: 'true' -# py_3.7_32: -# MB_PYTHON_VERSION: '3.7' -# PLAT: 'i686' -# NP_BUILD_DEP: 'numpy==1.14.5' -# DAILY_BUILD: 'true' + # - template: azure/posix.yml + # parameters: + # name: linux + # vmImage: ubuntu-16.04 + # matrix: + # py_3.5_64: + # MB_PYTHON_VERSION: "3.5" + # py_3.5_32: + # MB_PYTHON_VERSION: "3.5" + # PLAT: "i686" + # py_3.6_64: + # MB_PYTHON_VERSION: "3.6" + # DAILY_BUILD: "true" + # py_3.6_32: + # MB_PYTHON_VERSION: "3.6" + # PLAT: "i686" + # DAILY_BUILD: "true" + # py_3.7_64: + # MB_PYTHON_VERSION: "3.7" + # NP_BUILD_DEP: "numpy==1.14.5" + # DAILY_BUILD: "true" + # py_3.7_32: + # MB_PYTHON_VERSION: "3.7" + # PLAT: "i686" + # NP_BUILD_DEP: "numpy==1.14.5" + # DAILY_BUILD: "true" -# - template: azure/posix.yml -# parameters: -# name: macOS -# vmImage: xcode9-macos10.13 -# matrix: -# py_3.5_64: -# MB_PYTHON_VERSION: '3.5' -# SCIPY_BUILD_DEP: 'scipy==0.17.1' -# py_3.6_64: -# MB_PYTHON_VERSION: '3.6' -# NP_BUILD_DEP: 'numpy==1.11.3' -# DAILY_BUILD: 'true' -# py_3.7_64: -# MB_PYTHON_VERSION: '3.7' -# NP_BUILD_DEP: 'numpy==1.14.5' -# DAILY_BUILD: 'true' + - template: azure/posix.yml + parameters: + name: macOS + vmImage: xcode9-macos10.13 + matrix: + py_3.5_64: + MB_PYTHON_VERSION: "3.5" + SCIPY_BUILD_DEP: "scipy==0.17.1" + # py_3.6_64: + # MB_PYTHON_VERSION: "3.6" + # NP_BUILD_DEP: "numpy==1.11.3" + # DAILY_BUILD: "true" + py_3.7_64: + MB_PYTHON_VERSION: "3.7" + NP_BUILD_DEP: "numpy==1.14.5" + DAILY_BUILD: "true" diff --git a/azure/posix.yml b/azure/posix.yml index ba9ccdfd..3a53aece 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -1,98 +1,75 @@ parameters: - name: '' - vmImage: '' + name: "" + vmImage: "" matrix: [] jobs: -- job: ${{ parameters.name }} - pool: - vmImage: ${{ parameters.vmImage }} - variables: - REPO_DIR: 'scikit-learn' - BUILD_COMMIT: '0.21.1' - PLAT: 'x86_64' - UNICODE_WIDTH: '32' - NP_BUILD_DEP: 'numpy==1.11.0' - NP_TEST_DEP: 'numpy' - CYTHON_BUILD_DEP: 'cython==0.29.7' - CYTHON_TEST_DEP: 'cython' - SCIPY_BUILD_DEP: 'scipy' - SCIPY_TEST_DEP: 'scipy' - JOBLIB_BUILD_DEP: 'joblb==0.11' - JOBLIB_TEST_DEP: 'joblib' - DAILY_COMMIT: 'master' - DAILY_BUILD: 'false' - strategy: - matrix: - ${{ insert }}: ${{ parameters.matrix }} + - job: ${{ parameters.name }} + pool: + vmImage: ${{ parameters.vmImage }} + variables: + REPO_DIR: "scikit-learn" + BUILD_COMMIT: "0.22.1" + PLAT: "x86_64" + UNICODE_WIDTH: "32" + NP_BUILD_DEP: "numpy==1.11.0" + NP_TEST_DEP: "numpy" + CYTHON_BUILD_DEP: "cython==0.29.7" + CYTHON_TEST_DEP: "cython" + SCIPY_BUILD_DEP: "scipy" + SCIPY_TEST_DEP: "scipy" + JOBLIB_BUILD_DEP: "joblb==0.11" + JOBLIB_TEST_DEP: "joblib" + DAILY_COMMIT: "master" + DAILY_BUILD: "false" + strategy: + matrix: + ${{ insert }}: ${{ parameters.matrix }} - steps: - - checkout: self - submodules: true - - task: UsePythonVersion@0 - inputs: - versionSpec: $(MB_PYTHON_VERSION) - displayName: Set python version - - script: | - set -e + steps: + - checkout: self + submodules: true + - task: UsePythonVersion@0 + inputs: + versionSpec: $(MB_PYTHON_VERSION) + displayName: Set python version + - script: | + set -e - if [ "$BUILD_REASON" == "Schedule" ]; then - if [ "$DAILY_BUILD" != "true" ]; then - exit 0 + if [ "$BUILD_REASON" == "Schedule" ]; then + if [ "$DAILY_BUILD" != "true" ]; then + exit 0 + fi + BUILD_COMMIT=$DAILY_COMMIT fi - BUILD_COMMIT=$DAILY_COMMIT - fi - echo "Building scikit-learn-$BUILD_COMMIT" + echo "Building scikit-learn-$BUILD_COMMIT" - pip install virtualenv - BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $SCIPY_BUILD_DEP" - TEST_DEPENDS="$NP_TEST_DEP pytest $CYTHON_TEST_DEP $SCIPY_TEST_DEP" + pip install virtualenv + BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $SCIPY_BUILD_DEP" + TEST_DEPENDS="$NP_TEST_DEP pytest $CYTHON_TEST_DEP $SCIPY_TEST_DEP" - if [ `uname` == 'Darwin' ]; then - TRAVIS_OS_NAME='osx' - else - TRAVIS_OS_NAME='linux' - fi - - source multibuild/common_utils.sh - source multibuild/travis_steps.sh - before_install - - # OpenMP is not present on osx by default - if [ $TRAVIS_OS_NAME == "osx" ]; then - enable_openmp - fi + if [ `uname` == 'Darwin' ]; then + TRAVIS_OS_NAME='osx' + export MACOSX_DEPLOYMENT_TARGET=10.9 + else + TRAVIS_OS_NAME='linux' + fi - clean_code $REPO_DIR $BUILD_COMMIT - build_wheel $REPO_DIR $PLAT + source multibuild/common_utils.sh + source multibuild/travis_steps.sh + before_install - if [ $TRAVIS_OS_NAME == "osx" ]; then - disable_system_openmp - fi + # OpenMP is not present on osx by default + if [ $TRAVIS_OS_NAME == "osx" ]; then + enable_openmp + fi - install_run $PLAT - displayName: Build, install, and test - - script: | - set -e + clean_code $REPO_DIR $BUILD_COMMIT + build_wheel $REPO_DIR $PLAT - if [ "$BUILD_REASON" == "Schedule" ]; then - if [ "$DAILY_BUILD" != "true" ]; then - exit 0 + if [ $TRAVIS_OS_NAME == "osx" ]; then + disable_system_openmp fi - CONTAINER="sklearn-nightly" - BUILD_COMMIT="$DAILY_COMMIT" - else - CONTAINER="wheels" - UPLOAD_ARGS="--no-update-index" - fi - pip install wheelhouse-uploader - python -m wheelhouse_uploader upload --local-folder \ - $BUILD_REPOSITORY_LOCALPATH/wheelhouse/ \ - $UPLOAD_ARGS \ - $CONTAINER - condition: and(succeeded(), not(contains(variables['Build.SourceVersionMessage'], '[no upload]'))) - env: - WHEELHOUSE_UPLOADER_SECRET: $(WHEELHOUSE_UPLOADER_SECRET) - WHEELHOUSE_UPLOADER_USERNAME: $(WHEELHOUSE_UPLOADER_USERNAME) - displayName: Upload wheel + install_run $PLAT + displayName: Build, install, and test diff --git a/azure/windows.yml b/azure/windows.yml index eeebd13c..1f304d64 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -1,111 +1,90 @@ parameters: - name: '' - vmImage: '' + name: "" + vmImage: "" matrix: [] jobs: -- job: ${{ parameters.name }} - pool: - vmImage: ${{ parameters.vmImage }} - variables: - BUILD_COMMIT: '0.21.1' - SKLEARN_SKIP_NETWORK_TESTS: '1' - NP_BUILD_DEP: '1.11.0' - CYTHON_BUILD_DEP: '0.29.7' - SCIPY_BUILD_DEP: '1.1.0' - DAILY_COMMIT: 'master' - DAILY_BUILD: 'false' - PYTHON_ARCH: 'x64' - strategy: - matrix: - ${{ insert }}: ${{ parameters.matrix }} - steps: - - checkout: self - submodules: true - - task: UsePythonVersion@0 - inputs: - versionSpec: $(PYTHON_VERSION) - architecture: $(PYTHON_ARCH) - displayName: Set python version - - powershell: | - $wc = New-Object net.webclient - $wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi") - Start-Process "VCForPython27.msi" /qn -Wait - displayName: 'Install VC 9.0 only for Python 2.7' - condition: eq(variables['PYTHON_VERSION'], '2.7.x') - - script: | - echo PYTHON %PYTHON_VERSION% %PYTHON_ARCH% - echo Build Reason %BUILD_REASON% - python --version - python -c "import struct; print(struct.calcsize('P') * 8)" - pip --version - displayName: Check that we have the expected version and architecture for Python - - script: | - @echo on + - job: ${{ parameters.name }} + pool: + vmImage: ${{ parameters.vmImage }} + variables: + BUILD_COMMIT: "0.22.1" + SKLEARN_SKIP_NETWORK_TESTS: "1" + NP_BUILD_DEP: "1.11.0" + CYTHON_BUILD_DEP: "0.29.7" + SCIPY_BUILD_DEP: "1.1.0" + DAILY_COMMIT: "master" + DAILY_BUILD: "false" + PYTHON_ARCH: "x64" + strategy: + matrix: + ${{ insert }}: ${{ parameters.matrix }} + steps: + - checkout: self + submodules: true + - task: UsePythonVersion@0 + inputs: + versionSpec: $(PYTHON_VERSION) + architecture: $(PYTHON_ARCH) + displayName: Set python version + - powershell: | + $wc = New-Object net.webclient + $wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi") + Start-Process "VCForPython27.msi" /qn -Wait + displayName: "Install VC 9.0 only for Python 2.7" + condition: eq(variables['PYTHON_VERSION'], '2.7.x') + - script: | + echo PYTHON %PYTHON_VERSION% %PYTHON_ARCH% + echo Build Reason %BUILD_REASON% + python --version + python -c "import struct; print(struct.calcsize('P') * 8)" + pip --version + displayName: Check that we have the expected version and architecture for Python + - script: | + @echo on - if "%BUILD_REASON%" == "Schedule" ( - if NOT "%DAILY_BUILD%" == "true" ( - exit 0 + if "%BUILD_REASON%" == "Schedule" ( + if NOT "%DAILY_BUILD%" == "true" ( + exit 0 + ) + set BUILD_COMMIT=%DAILY_COMMIT% ) - set BUILD_COMMIT=%DAILY_COMMIT% - ) - cd scikit-learn - git checkout %BUILD_COMMIT% - git clean -fxd - git reset --hard - displayName: Checkout commit - - script: | - @echo on + cd scikit-learn + git checkout %BUILD_COMMIT% + git clean -fxd + git reset --hard + displayName: Checkout commit + - script: | + @echo on - if "%BUILD_REASON%" == "Schedule" ( - if NOT "%DAILY_BUILD%" == "true" ( - exit 0 + if "%BUILD_REASON%" == "Schedule" ( + if NOT "%DAILY_BUILD%" == "true" ( + exit 0 + ) ) - ) - if "%PYTHON_VERSION%" == "3.4.x" ( - if "%PYTHON_ARCH%" == "x64" ( - CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 - ) else ( - CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 - ) - - set DISTUTILS_USE_SDK=1 - set MSSdk=1 - ) - - pip install --timeout=60 numpy==%NP_BUILD_DEP% - pip install --timeout=60 pytest wheel joblib scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% + if "%PYTHON_VERSION%" == "3.4.x" ( + if "%PYTHON_ARCH%" == "x64" ( + CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 + ) else ( + CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 + ) - pushd scikit-learn - python setup.py bdist_wheel || exit 1 - pip install --pre --no-index --find-links dist/ scikit-learn - popd + set DISTUTILS_USE_SDK=1 + set MSSdk=1 + ) - mkdir tmp - cd tmp + pip install --timeout=60 numpy==%NP_BUILD_DEP% + pip install --timeout=60 pytest wheel joblib scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% - pip install -U --timeout=60 numpy - pytest -rs --pyargs sklearn - displayName: Build, install, and test - - script: | - @echo on + pushd scikit-learn + python setup.py bdist_wheel || exit 1 + pip install --pre --no-index --find-links dist/ scikit-learn + popd - if "%BUILD_REASON%" == "Schedule" ( - if NOT "%DAILY_BUILD%" == "true" ( - exit 0 - ) - set CONTAINER="sklearn-nightly" - ) else ( - set CONTAINER="wheels" - set UPLOAD_ARGS="--no-update-index" - ) - pip install --timeout=60 wheelhouse_uploader - cd scikit-learn - python -m wheelhouse_uploader upload --no-ssl-check --local-folder=dist %UPLOAD_ARGS% %CONTAINER% - condition: and(succeeded(), not(contains(variables['Build.SourceVersionMessage'], '[no upload]'))) - env: - WHEELHOUSE_UPLOADER_SECRET: $(WHEELHOUSE_UPLOADER_SECRET) - WHEELHOUSE_UPLOADER_USERNAME: $(WHEELHOUSE_UPLOADER_USERNAME) - displayName: Upload wheel + mkdir tmp + cd tmp + pip install -U --timeout=60 numpy + pytest -rs --pyargs sklearn + displayName: Build, install, and test From a60e8b849882b0a42464382bf4a3495f32ca2bb3 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 14:08:56 -0500 Subject: [PATCH 095/194] TST Just build --- azure-pipelines.yml | 108 ++++++++++++++++++++++---------------------- azure/posix.yml | 2 +- azure/windows.yml | 21 +-------- 3 files changed, 57 insertions(+), 74 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 789040b3..801ab869 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,59 +1,59 @@ jobs: - # - template: azure/windows.yml - # parameters: - # name: windows - # vmImage: vs2017-win2016 - # matrix: - # py_3.5_32: - # PYTHON_VERSION: "3.5.x" - # PYTHON_ARCH: "x86" - # py_3.5_64: - # PYTHON_VERSION: "3.5.x" - # py_3.6_32: - # PYTHON_VERSION: "3.6.x" - # PYTHON_ARCH: "x86" - # NP_BUILD_DEP: "1.12.1" - # DAILY_BUILD: "true" - # py_3.6_64: - # PYTHON_VERSION: "3.6.x" - # NP_BUILD_DEP: "1.12.1" - # DAILY_BUILD: "true" - # py_3.7_32: - # PYTHON_VERSION: "3.7.x" - # PYTHON_ARCH: "x86" - # NP_BUILD_DEP: "1.14.5" - # DAILY_BUILD: "true" - # py_3.7_64: - # PYTHON_VERSION: "3.7.x" - # NP_BUILD_DEP: "1.14.5" - # DAILY_BUILD: "true" + - template: azure/windows.yml + parameters: + name: windows + vmImage: vs2017-win2016 + matrix: + py_3.5_32: + PYTHON_VERSION: "3.5.x" + PYTHON_ARCH: "x86" + # py_3.5_64: + # PYTHON_VERSION: "3.5.x" + # py_3.6_32: + # PYTHON_VERSION: "3.6.x" + # PYTHON_ARCH: "x86" + # NP_BUILD_DEP: "1.12.1" + # DAILY_BUILD: "true" + # py_3.6_64: + # PYTHON_VERSION: "3.6.x" + # NP_BUILD_DEP: "1.12.1" + # DAILY_BUILD: "true" + # py_3.7_32: + # PYTHON_VERSION: "3.7.x" + # PYTHON_ARCH: "x86" + # NP_BUILD_DEP: "1.14.5" + # DAILY_BUILD: "true" + py_3.7_64: + PYTHON_VERSION: "3.7.x" + NP_BUILD_DEP: "1.14.5" + DAILY_BUILD: "true" - # - template: azure/posix.yml - # parameters: - # name: linux - # vmImage: ubuntu-16.04 - # matrix: - # py_3.5_64: - # MB_PYTHON_VERSION: "3.5" - # py_3.5_32: - # MB_PYTHON_VERSION: "3.5" - # PLAT: "i686" - # py_3.6_64: - # MB_PYTHON_VERSION: "3.6" - # DAILY_BUILD: "true" - # py_3.6_32: - # MB_PYTHON_VERSION: "3.6" - # PLAT: "i686" - # DAILY_BUILD: "true" - # py_3.7_64: - # MB_PYTHON_VERSION: "3.7" - # NP_BUILD_DEP: "numpy==1.14.5" - # DAILY_BUILD: "true" - # py_3.7_32: - # MB_PYTHON_VERSION: "3.7" - # PLAT: "i686" - # NP_BUILD_DEP: "numpy==1.14.5" - # DAILY_BUILD: "true" + - template: azure/posix.yml + parameters: + name: linux + vmImage: ubuntu-16.04 + matrix: + # py_3.5_64: + # MB_PYTHON_VERSION: "3.5" + py_3.5_32: + MB_PYTHON_VERSION: "3.5" + PLAT: "i686" + # py_3.6_64: + # MB_PYTHON_VERSION: "3.6" + # DAILY_BUILD: "true" + # py_3.6_32: + # MB_PYTHON_VERSION: "3.6" + # PLAT: "i686" + # DAILY_BUILD: "true" + py_3.7_64: + MB_PYTHON_VERSION: "3.7" + NP_BUILD_DEP: "numpy==1.14.5" + DAILY_BUILD: "true" + # py_3.7_32: + # MB_PYTHON_VERSION: "3.7" + # PLAT: "i686" + # NP_BUILD_DEP: "numpy==1.14.5" + # DAILY_BUILD: "true" - template: azure/posix.yml parameters: diff --git a/azure/posix.yml b/azure/posix.yml index 3a53aece..4a97de24 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -71,5 +71,5 @@ jobs: disable_system_openmp fi - install_run $PLAT + # install_run $PLAT displayName: Build, install, and test diff --git a/azure/windows.yml b/azure/windows.yml index 1f304d64..b76a07d5 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -27,12 +27,6 @@ jobs: versionSpec: $(PYTHON_VERSION) architecture: $(PYTHON_ARCH) displayName: Set python version - - powershell: | - $wc = New-Object net.webclient - $wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi") - Start-Process "VCForPython27.msi" /qn -Wait - displayName: "Install VC 9.0 only for Python 2.7" - condition: eq(variables['PYTHON_VERSION'], '2.7.x') - script: | echo PYTHON %PYTHON_VERSION% %PYTHON_ARCH% echo Build Reason %BUILD_REASON% @@ -63,17 +57,6 @@ jobs: ) ) - if "%PYTHON_VERSION%" == "3.4.x" ( - if "%PYTHON_ARCH%" == "x64" ( - CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 - ) else ( - CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 - ) - - set DISTUTILS_USE_SDK=1 - set MSSdk=1 - ) - pip install --timeout=60 numpy==%NP_BUILD_DEP% pip install --timeout=60 pytest wheel joblib scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% @@ -85,6 +68,6 @@ jobs: mkdir tmp cd tmp - pip install -U --timeout=60 numpy - pytest -rs --pyargs sklearn + # pip install -U --timeout=60 numpy + # pytest -rs --pyargs sklearn displayName: Build, install, and test From 61523affd5a479fc3ed56e12211b88c162bc4cd7 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 14:24:41 -0500 Subject: [PATCH 096/194] TST Just build --- azure-pipelines.yml | 68 ++++++++++++++++++++++----------------------- azure/windows.yml | 4 +-- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 801ab869..d6782a4f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,22 +7,22 @@ jobs: py_3.5_32: PYTHON_VERSION: "3.5.x" PYTHON_ARCH: "x86" - # py_3.5_64: - # PYTHON_VERSION: "3.5.x" - # py_3.6_32: - # PYTHON_VERSION: "3.6.x" - # PYTHON_ARCH: "x86" - # NP_BUILD_DEP: "1.12.1" - # DAILY_BUILD: "true" - # py_3.6_64: - # PYTHON_VERSION: "3.6.x" - # NP_BUILD_DEP: "1.12.1" - # DAILY_BUILD: "true" - # py_3.7_32: - # PYTHON_VERSION: "3.7.x" - # PYTHON_ARCH: "x86" - # NP_BUILD_DEP: "1.14.5" - # DAILY_BUILD: "true" + py_3.5_64: + PYTHON_VERSION: "3.5.x" + py_3.6_32: + PYTHON_VERSION: "3.6.x" + PYTHON_ARCH: "x86" + NP_BUILD_DEP: "1.12.1" + DAILY_BUILD: "true" + py_3.6_64: + PYTHON_VERSION: "3.6.x" + NP_BUILD_DEP: "1.12.1" + DAILY_BUILD: "true" + py_3.7_32: + PYTHON_VERSION: "3.7.x" + PYTHON_ARCH: "x86" + NP_BUILD_DEP: "1.14.5" + DAILY_BUILD: "true" py_3.7_64: PYTHON_VERSION: "3.7.x" NP_BUILD_DEP: "1.14.5" @@ -33,27 +33,27 @@ jobs: name: linux vmImage: ubuntu-16.04 matrix: - # py_3.5_64: - # MB_PYTHON_VERSION: "3.5" + py_3.5_64: + MB_PYTHON_VERSION: "3.5" py_3.5_32: MB_PYTHON_VERSION: "3.5" PLAT: "i686" - # py_3.6_64: - # MB_PYTHON_VERSION: "3.6" - # DAILY_BUILD: "true" - # py_3.6_32: - # MB_PYTHON_VERSION: "3.6" - # PLAT: "i686" - # DAILY_BUILD: "true" + py_3.6_64: + MB_PYTHON_VERSION: "3.6" + DAILY_BUILD: "true" + py_3.6_32: + MB_PYTHON_VERSION: "3.6" + PLAT: "i686" + DAILY_BUILD: "true" py_3.7_64: MB_PYTHON_VERSION: "3.7" NP_BUILD_DEP: "numpy==1.14.5" DAILY_BUILD: "true" - # py_3.7_32: - # MB_PYTHON_VERSION: "3.7" - # PLAT: "i686" - # NP_BUILD_DEP: "numpy==1.14.5" - # DAILY_BUILD: "true" + py_3.7_32: + MB_PYTHON_VERSION: "3.7" + PLAT: "i686" + NP_BUILD_DEP: "numpy==1.14.5" + DAILY_BUILD: "true" - template: azure/posix.yml parameters: @@ -63,10 +63,10 @@ jobs: py_3.5_64: MB_PYTHON_VERSION: "3.5" SCIPY_BUILD_DEP: "scipy==0.17.1" - # py_3.6_64: - # MB_PYTHON_VERSION: "3.6" - # NP_BUILD_DEP: "numpy==1.11.3" - # DAILY_BUILD: "true" + py_3.6_64: + MB_PYTHON_VERSION: "3.6" + NP_BUILD_DEP: "numpy==1.11.3" + DAILY_BUILD: "true" py_3.7_64: MB_PYTHON_VERSION: "3.7" NP_BUILD_DEP: "numpy==1.14.5" diff --git a/azure/windows.yml b/azure/windows.yml index b76a07d5..ce0359c0 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -68,6 +68,6 @@ jobs: mkdir tmp cd tmp - # pip install -U --timeout=60 numpy - # pytest -rs --pyargs sklearn + REM pip install -U --timeout=60 numpy + REM pytest -rs --pyargs sklearn displayName: Build, install, and test From 1bb2695270672191ddf18cbfe0278f8c63273f6a Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 15:37:25 -0500 Subject: [PATCH 097/194] TST Update to artifacts --- azure-pipelines.yml | 123 ++++++++++++++++++++++---------------------- azure/posix.yml | 8 +++ 2 files changed, 69 insertions(+), 62 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d6782a4f..16fdfeea 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,73 +1,72 @@ jobs: - - template: azure/windows.yml - parameters: - name: windows - vmImage: vs2017-win2016 - matrix: - py_3.5_32: - PYTHON_VERSION: "3.5.x" - PYTHON_ARCH: "x86" - py_3.5_64: - PYTHON_VERSION: "3.5.x" - py_3.6_32: - PYTHON_VERSION: "3.6.x" - PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.12.1" - DAILY_BUILD: "true" - py_3.6_64: - PYTHON_VERSION: "3.6.x" - NP_BUILD_DEP: "1.12.1" - DAILY_BUILD: "true" - py_3.7_32: - PYTHON_VERSION: "3.7.x" - PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.14.5" - DAILY_BUILD: "true" - py_3.7_64: - PYTHON_VERSION: "3.7.x" - NP_BUILD_DEP: "1.14.5" - DAILY_BUILD: "true" + # - template: azure/windows.yml + # parameters: + # name: windows + # vmImage: vs2017-win2016 + # matrix: + # py_3.5_32: + # PYTHON_VERSION: "3.5.x" + # PYTHON_ARCH: "x86" + # py_3.5_64: + # PYTHON_VERSION: "3.5.x" + # py_3.6_32: + # PYTHON_VERSION: "3.6.x" + # PYTHON_ARCH: "x86" + # NP_BUILD_DEP: "1.12.1" + # DAILY_BUILD: "true" + # py_3.6_64: + # PYTHON_VERSION: "3.6.x" + # NP_BUILD_DEP: "1.12.1" + # DAILY_BUILD: "true" + # py_3.7_32: + # PYTHON_VERSION: "3.7.x" + # PYTHON_ARCH: "x86" + # NP_BUILD_DEP: "1.14.5" + # DAILY_BUILD: "true" + # py_3.7_64: + # PYTHON_VERSION: "3.7.x" + # NP_BUILD_DEP: "1.14.5" + # DAILY_BUILD: "true" - template: azure/posix.yml parameters: name: linux vmImage: ubuntu-16.04 matrix: - py_3.5_64: - MB_PYTHON_VERSION: "3.5" - py_3.5_32: - MB_PYTHON_VERSION: "3.5" - PLAT: "i686" - py_3.6_64: - MB_PYTHON_VERSION: "3.6" - DAILY_BUILD: "true" - py_3.6_32: - MB_PYTHON_VERSION: "3.6" - PLAT: "i686" - DAILY_BUILD: "true" - py_3.7_64: - MB_PYTHON_VERSION: "3.7" - NP_BUILD_DEP: "numpy==1.14.5" - DAILY_BUILD: "true" - py_3.7_32: - MB_PYTHON_VERSION: "3.7" - PLAT: "i686" - NP_BUILD_DEP: "numpy==1.14.5" - DAILY_BUILD: "true" - - - template: azure/posix.yml - parameters: - name: macOS - vmImage: xcode9-macos10.13 - matrix: - py_3.5_64: - MB_PYTHON_VERSION: "3.5" - SCIPY_BUILD_DEP: "scipy==0.17.1" - py_3.6_64: - MB_PYTHON_VERSION: "3.6" - NP_BUILD_DEP: "numpy==1.11.3" - DAILY_BUILD: "true" + # py_3.5_64: + # MB_PYTHON_VERSION: "3.5" + # py_3.5_32: + # MB_PYTHON_VERSION: "3.5" + # PLAT: "i686" + # py_3.6_64: + # MB_PYTHON_VERSION: "3.6" + # DAILY_BUILD: "true" + # py_3.6_32: + # MB_PYTHON_VERSION: "3.6" + # PLAT: "i686" + # DAILY_BUILD: "true" py_3.7_64: MB_PYTHON_VERSION: "3.7" NP_BUILD_DEP: "numpy==1.14.5" DAILY_BUILD: "true" + # py_3.7_32: + # MB_PYTHON_VERSION: "3.7" + # PLAT: "i686" + # NP_BUILD_DEP: "numpy==1.14.5" + # DAILY_BUILD: "true" + # - template: azure/posix.yml + # parameters: + # name: macOS + # vmImage: xcode9-macos10.13 + # matrix: + # py_3.5_64: + # MB_PYTHON_VERSION: "3.5" + # SCIPY_BUILD_DEP: "scipy==0.17.1" + # py_3.6_64: + # MB_PYTHON_VERSION: "3.6" + # NP_BUILD_DEP: "numpy==1.11.3" + # DAILY_BUILD: "true" + # py_3.7_64: + # MB_PYTHON_VERSION: "3.7" + # NP_BUILD_DEP: "numpy==1.14.5" + # DAILY_BUILD: "true" diff --git a/azure/posix.yml b/azure/posix.yml index 4a97de24..88275f0c 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -73,3 +73,11 @@ jobs: # install_run $PLAT displayName: Build, install, and test + - script: pip install twine + displayName: Install twine + - task: TwineAuthenticate@0 + inputs: + artifactFeeds: "sklearn-nightly" + displayName: Authenticate twine with artifact feed + - script: | + twine upload -r sklearn-nightly dist/' From d3eb18e5be2fb318cc10d2fa20b781a6139c3b90 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 15:41:35 -0500 Subject: [PATCH 098/194] MNT Update to artifact feed --- azure/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/posix.yml b/azure/posix.yml index 88275f0c..d9020344 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -80,4 +80,4 @@ jobs: artifactFeeds: "sklearn-nightly" displayName: Authenticate twine with artifact feed - script: | - twine upload -r sklearn-nightly dist/' + twine upload -r sklearn-wheels-testing/_packaging/sklearn-nightly/pypi/simple/ dist/ From 37bd8467a5312c2cb145ca901445e394ec4d6588 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 16:34:52 -0500 Subject: [PATCH 099/194] Uses full url for fork --- .appveyor.yml | 300 ++++++++++++++++++++++++------------------------ .travis.yml | 268 +++++++++++++++++++++--------------------- azure/posix.yml | 2 +- 3 files changed, 285 insertions(+), 285 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 61af3be4..cb17a65b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,150 +1,150 @@ -# AppVeyor.com is a Continuous Integration service to build and run tests under -# Windows -# https://ci.appveyor.com/project/sklearn-ci/scikit-learn - -environment: - global: - BUILD_COMMIT: 0.22.1 - # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the - # /E:ON and /V:ON options are not enabled in the batch script interpreter - # See: http://stackoverflow.com/a/13751649/163740 - CMD_IN_ENV: "cmd /E:ON /V:ON /C ..\\appveyor\\run_with_env.cmd" - WHEELHOUSE_UPLOADER_USERNAME: sklearn-appveyor - WHEELHOUSE_UPLOADER_SECRET: - secure: P1/NpWGueg+26XlcS0P6kIKO1KbRw67S6ltwEjxb+vgf0F+zfNT6FRaMPKfHSXiR - - # Make sure we don't download large datasets when running the test on - # continuous integration platform - SKLEARN_SKIP_NETWORK_TESTS: 1 - APPVEYOR_SKIP_FINALIZE_ON_EXIT: true - # Minimum numpy version - NP_BUILD_DEP: "1.11.0" - DAILY_COMMIT: master - DAILY_BUILD: "false" - - matrix: - - PYTHON: "C:\\Python35" - PYTHON_VERSION: "3.5.2" - PYTHON_ARCH: "32" - - - PYTHON: "C:\\Python35-x64" - PYTHON_VERSION: "3.5.2" - PYTHON_ARCH: "64" - - - PYTHON: "C:\\Python36" - PYTHON_VERSION: "3.6.0" - PYTHON_ARCH: "32" - NP_BUILD_DEP: "1.12.1" - DAILY_BUILD: "true" - - - PYTHON: "C:\\Python36-x64" - PYTHON_VERSION: "3.6.0" - PYTHON_ARCH: "64" - NP_BUILD_DEP: "1.12.1" - DAILY_BUILD: "true" - - - PYTHON: "C:\\Python37" - PYTHON_VERSION: "3.7.0" - PYTHON_ARCH: "32" - NP_BUILD_DEP: "1.14.5" - DAILY_BUILD: "true" - - - PYTHON: "C:\\Python37-x64" - PYTHON_VERSION: "3.7.0" - PYTHON_ARCH: "64" - NP_BUILD_DEP: "1.14.5" - DAILY_BUILD: "true" - - - PYTHON: "C:\\Python38" - PYTHON_VERSION: "3.8.0" - PYTHON_ARCH: "32" - NP_BUILD_DEP: "1.17.4" - DAILY_BUILD: "true" - - - PYTHON: "C:\\Python38-x64" - PYTHON_VERSION: "3.8.0" - PYTHON_ARCH: "64" - NP_BUILD_DEP: "1.17.4" - DAILY_BUILD: "true" - -init: - - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%" - - "ECHO \"%APPVEYOR_SCHEDULED_BUILD%\"" - - ps: >- - if ($env:APPVEYOR_SCHEDULED_BUILD -eq "True") { - $env:CONTAINER = "sklearn-nightly" - if ($env:DAILY_COMMIT) { $env:BUILD_COMMIT = $env:DAILY_COMMIT } - if ($env:DAILY_BUILD -eq "false") { Exit-AppveyorBuild } - } else { - $env:CONTAINER = "wheels" - $env:UPLOAD_ARGS = "--no-update-index" - } - -install: - # Install Python (from the official .msi of http://python.org) and pip when - # not already installed. - - "powershell ./appveyor/install.ps1" - - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" - - "python -m pip install -U pip" - - # Check that we have the expected version and architecture for Python - - "python --version" - - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" - - "pip --version" - - # Checkout the request scikit-learn version in the submodule - - "git submodule update --init --recursive" - - "cd scikit-learn" - - "git checkout %BUILD_COMMIT%" - - "git clean -fxd" - - "git reset --hard" - - # Install the build and runtime dependencies of the project. - - "%CMD_IN_ENV% pip install --timeout=60 numpy==%NP_BUILD_DEP%" - - "%CMD_IN_ENV% pip install --timeout=60 -r ../appveyor/requirements.txt" - - "%CMD_IN_ENV% python setup.py build" - - "%CMD_IN_ENV% python ../appveyor/vendor_vcomp140.py" - - "%CMD_IN_ENV% python setup.py bdist_wheel" - - ps: "ls dist" - - "%CMD_IN_ENV% twine check dist/*" - - # Install the generated wheel package to test it - - "pip install --pre --no-index --find-links dist/ scikit-learn" - -# Not a .NET project, we build scikit-learn in the install step instead -build: false - -test_script: - # Remove the source dir to make sure we run the tests on the - # installed library. - - "rd /s /q \"sklearn\"" - # remove setup.cfg so as to not force --doctest-modules - - "del setup.cfg" - # Install the newest version of numpy for the tests: the goal is to ensure - # that the scikit-learn wheels are binary compatible both with the old numpy - # version against which they were built and the newest numpy version at the - # time of the release, that is the version of numpy that users are most - # likely to use. - - "%CMD_IN_ENV% pip install -U --timeout=60 numpy" - - "%CMD_IN_ENV% pytest -rs --pyargs sklearn" - -artifacts: - # Archive the generated wheel package in the ci.appveyor.com build report. - - path: 'scikit-learn\dist\*' - -on_success: - # Upload the generated wheel package to Rackspace - # On Windows, Apache Libcloud cannot find a standard CA cert bundle so we - # disable the ssl checks. - - python -m wheelhouse_uploader upload - --no-ssl-check - --local-folder=dist - %UPLOAD_ARGS% - %CONTAINER% - -cache: - # Use the appveyor cache to avoid re-downloading large archives such - # the MKL numpy and scipy wheels mirrored on a rackspace cloud - # container, speed up the appveyor jobs and reduce bandwidth - # usage on our rackspace account. - - '%APPDATA%\pip\Cache' +# # AppVeyor.com is a Continuous Integration service to build and run tests under +# # Windows +# # https://ci.appveyor.com/project/sklearn-ci/scikit-learn + +# environment: +# global: +# BUILD_COMMIT: 0.22.1 +# # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the +# # /E:ON and /V:ON options are not enabled in the batch script interpreter +# # See: http://stackoverflow.com/a/13751649/163740 +# CMD_IN_ENV: "cmd /E:ON /V:ON /C ..\\appveyor\\run_with_env.cmd" +# WHEELHOUSE_UPLOADER_USERNAME: sklearn-appveyor +# WHEELHOUSE_UPLOADER_SECRET: +# secure: P1/NpWGueg+26XlcS0P6kIKO1KbRw67S6ltwEjxb+vgf0F+zfNT6FRaMPKfHSXiR + +# # Make sure we don't download large datasets when running the test on +# # continuous integration platform +# SKLEARN_SKIP_NETWORK_TESTS: 1 +# APPVEYOR_SKIP_FINALIZE_ON_EXIT: true +# # Minimum numpy version +# NP_BUILD_DEP: "1.11.0" +# DAILY_COMMIT: master +# DAILY_BUILD: "false" + +# matrix: +# - PYTHON: "C:\\Python35" +# PYTHON_VERSION: "3.5.2" +# PYTHON_ARCH: "32" + +# - PYTHON: "C:\\Python35-x64" +# PYTHON_VERSION: "3.5.2" +# PYTHON_ARCH: "64" + +# - PYTHON: "C:\\Python36" +# PYTHON_VERSION: "3.6.0" +# PYTHON_ARCH: "32" +# NP_BUILD_DEP: "1.12.1" +# DAILY_BUILD: "true" + +# - PYTHON: "C:\\Python36-x64" +# PYTHON_VERSION: "3.6.0" +# PYTHON_ARCH: "64" +# NP_BUILD_DEP: "1.12.1" +# DAILY_BUILD: "true" + +# - PYTHON: "C:\\Python37" +# PYTHON_VERSION: "3.7.0" +# PYTHON_ARCH: "32" +# NP_BUILD_DEP: "1.14.5" +# DAILY_BUILD: "true" + +# - PYTHON: "C:\\Python37-x64" +# PYTHON_VERSION: "3.7.0" +# PYTHON_ARCH: "64" +# NP_BUILD_DEP: "1.14.5" +# DAILY_BUILD: "true" + +# - PYTHON: "C:\\Python38" +# PYTHON_VERSION: "3.8.0" +# PYTHON_ARCH: "32" +# NP_BUILD_DEP: "1.17.4" +# DAILY_BUILD: "true" + +# - PYTHON: "C:\\Python38-x64" +# PYTHON_VERSION: "3.8.0" +# PYTHON_ARCH: "64" +# NP_BUILD_DEP: "1.17.4" +# DAILY_BUILD: "true" + +# init: +# - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%" +# - "ECHO \"%APPVEYOR_SCHEDULED_BUILD%\"" +# - ps: >- +# if ($env:APPVEYOR_SCHEDULED_BUILD -eq "True") { +# $env:CONTAINER = "sklearn-nightly" +# if ($env:DAILY_COMMIT) { $env:BUILD_COMMIT = $env:DAILY_COMMIT } +# if ($env:DAILY_BUILD -eq "false") { Exit-AppveyorBuild } +# } else { +# $env:CONTAINER = "wheels" +# $env:UPLOAD_ARGS = "--no-update-index" +# } + +# install: +# # Install Python (from the official .msi of http://python.org) and pip when +# # not already installed. +# - "powershell ./appveyor/install.ps1" +# - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" +# - "python -m pip install -U pip" + +# # Check that we have the expected version and architecture for Python +# - "python --version" +# - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" +# - "pip --version" + +# # Checkout the request scikit-learn version in the submodule +# - "git submodule update --init --recursive" +# - "cd scikit-learn" +# - "git checkout %BUILD_COMMIT%" +# - "git clean -fxd" +# - "git reset --hard" + +# # Install the build and runtime dependencies of the project. +# - "%CMD_IN_ENV% pip install --timeout=60 numpy==%NP_BUILD_DEP%" +# - "%CMD_IN_ENV% pip install --timeout=60 -r ../appveyor/requirements.txt" +# - "%CMD_IN_ENV% python setup.py build" +# - "%CMD_IN_ENV% python ../appveyor/vendor_vcomp140.py" +# - "%CMD_IN_ENV% python setup.py bdist_wheel" +# - ps: "ls dist" +# - "%CMD_IN_ENV% twine check dist/*" + +# # Install the generated wheel package to test it +# - "pip install --pre --no-index --find-links dist/ scikit-learn" + +# # Not a .NET project, we build scikit-learn in the install step instead +# build: false + +# test_script: +# # Remove the source dir to make sure we run the tests on the +# # installed library. +# - "rd /s /q \"sklearn\"" +# # remove setup.cfg so as to not force --doctest-modules +# - "del setup.cfg" +# # Install the newest version of numpy for the tests: the goal is to ensure +# # that the scikit-learn wheels are binary compatible both with the old numpy +# # version against which they were built and the newest numpy version at the +# # time of the release, that is the version of numpy that users are most +# # likely to use. +# - "%CMD_IN_ENV% pip install -U --timeout=60 numpy" +# - "%CMD_IN_ENV% pytest -rs --pyargs sklearn" + +# artifacts: +# # Archive the generated wheel package in the ci.appveyor.com build report. +# - path: 'scikit-learn\dist\*' + +# on_success: +# # Upload the generated wheel package to Rackspace +# # On Windows, Apache Libcloud cannot find a standard CA cert bundle so we +# # disable the ssl checks. +# - python -m wheelhouse_uploader upload +# --no-ssl-check +# --local-folder=dist +# %UPLOAD_ARGS% +# %CONTAINER% + +# cache: +# # Use the appveyor cache to avoid re-downloading large archives such +# # the MKL numpy and scipy wheels mirrored on a rackspace cloud +# # container, speed up the appveyor jobs and reduce bandwidth +# # usage on our rackspace account. +# - '%APPDATA%\pip\Cache' diff --git a/.travis.yml b/.travis.yml index 9fbe9ec5..22c69b41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,140 +1,140 @@ -env: - global: - - REPO_DIR="scikit-learn" - - BUILD_COMMIT=0.22.1 - - PLAT=x86_64 - - UNICODE_WIDTH=32 - - NP_BUILD_DEP="numpy==1.11.0" - - NP_TEST_DEP="numpy==1.16.3" - - CYTHON_BUILD_DEP="cython==0.29.13" - - CYTHON_TEST_DEP="cython" - - SCIPY_BUILD_DEP="scipy" - - SCIPY_TEST_DEP="scipy==1.3.2" - - JOBLIB_BUILD_DEP="joblib==0.11" - - JOBLIB_TEST_DEP="joblib" - - DAILY_COMMIT=master - - DAILY_BUILD=false - - WHEELHOUSE_UPLOADER_USERNAME=travis-worker - # Following generated with - # travis encrypt -r MacPython/scikit-learn-wheels WHEELHOUSE_UPLOADER_SECRET= - - secure: "Lyhm6qFtf/hY5D3UHMANNhh8Ar/PARF1nH/ebArWLtb24prrSYt+AAVJqZ81I58AdQK12Kn8mmuZVyVJT+FrRd8q6OyMijQ/wKrsx8EH+lDTTgUueBJtLql01KsaMRTDpAd04bREh1MppIsFFCHKVNxY2mW17XwsNQ+MUka4Bos=" +# env: +# global: +# - REPO_DIR="scikit-learn" +# - BUILD_COMMIT=0.22.1 +# - PLAT=x86_64 +# - UNICODE_WIDTH=32 +# - NP_BUILD_DEP="numpy==1.11.0" +# - NP_TEST_DEP="numpy==1.16.3" +# - CYTHON_BUILD_DEP="cython==0.29.13" +# - CYTHON_TEST_DEP="cython" +# - SCIPY_BUILD_DEP="scipy" +# - SCIPY_TEST_DEP="scipy==1.3.2" +# - JOBLIB_BUILD_DEP="joblib==0.11" +# - JOBLIB_TEST_DEP="joblib" +# - DAILY_COMMIT=master +# - DAILY_BUILD=false +# - WHEELHOUSE_UPLOADER_USERNAME=travis-worker +# # Following generated with +# # travis encrypt -r MacPython/scikit-learn-wheels WHEELHOUSE_UPLOADER_SECRET= +# - secure: "Lyhm6qFtf/hY5D3UHMANNhh8Ar/PARF1nH/ebArWLtb24prrSYt+AAVJqZ81I58AdQK12Kn8mmuZVyVJT+FrRd8q6OyMijQ/wKrsx8EH+lDTTgUueBJtLql01KsaMRTDpAd04bREh1MppIsFFCHKVNxY2mW17XwsNQ+MUka4Bos=" -language: python -# Default Python version is usually 2.7 -python: 3.5 -sudo: required -dist: trusty +# language: python +# # Default Python version is usually 2.7 +# python: 3.5 +# sudo: required +# dist: trusty -matrix: - exclude: - # Exclude the default Python 3.5 build - - python: 3.5 - include: - - os: linux - env: - - MB_PYTHON_VERSION=3.5 - - SCIPY_BUILD_DEP="scipy==0.18.1" - - os: linux - env: - - MB_PYTHON_VERSION=3.5 - - PLAT=i686 - - SCIPY_BUILD_DEP="scipy==0.18.1" - - os: linux - env: - - MB_PYTHON_VERSION=3.6 - - DAILY_BUILD=true - - SCIPY_BUILD_DEP="scipy==0.18.1" - - os: linux - env: - - MB_PYTHON_VERSION=3.6 - - PLAT=i686 - - DAILY_BUILD=true - - SCIPY_BUILD_DEP="scipy==0.18.1" - - os: linux - env: - - MB_PYTHON_VERSION=3.7 - - NP_BUILD_DEP=numpy==1.14.5 - - DAILY_BUILD=true - - os: linux - env: - - MB_PYTHON_VERSION=3.8 - - NP_BUILD_DEP=numpy==1.17.4 - - NP_TEST_DEP=numpy==1.17.4 - - DAILY_BUILD=true - - os: linux - env: - - MB_PYTHON_VERSION=3.7 - - PLAT=i686 - - NP_BUILD_DEP=numpy==1.14.5 - - DAILY_BUILD=true - - os: linux - env: - - MB_PYTHON_VERSION=3.8 - - PLAT=i686 - - NP_BUILD_DEP=numpy==1.17.4 - - NP_TEST_DEP=numpy==1.17.4 - - DAILY_BUILD=true - - os: osx - language: generic - env: - - MB_PYTHON_VERSION=3.5 - - SCIPY_BUILD_DEP="scipy==0.18.1" - - os: osx - language: generic - env: - - MB_PYTHON_VERSION=3.6 - - NP_BUILD_DEP=numpy==1.11.3 - - DAILY_BUILD=true - - SCIPY_BUILD_DEP="scipy==0.18.1" - - os: osx - language: generic - env: - - MB_PYTHON_VERSION=3.7 - - NP_BUILD_DEP=numpy==1.14.5 - - DAILY_BUILD=true - - os: osx - language: generic - env: - - MB_PYTHON_VERSION=3.8 - - NP_BUILD_DEP=numpy==1.17.4 - - NP_TEST_DEP=numpy==1.17.4 - - DAILY_BUILD=true +# matrix: +# exclude: +# # Exclude the default Python 3.5 build +# - python: 3.5 +# include: +# - os: linux +# env: +# - MB_PYTHON_VERSION=3.5 +# - SCIPY_BUILD_DEP="scipy==0.18.1" +# - os: linux +# env: +# - MB_PYTHON_VERSION=3.5 +# - PLAT=i686 +# - SCIPY_BUILD_DEP="scipy==0.18.1" +# - os: linux +# env: +# - MB_PYTHON_VERSION=3.6 +# - DAILY_BUILD=true +# - SCIPY_BUILD_DEP="scipy==0.18.1" +# - os: linux +# env: +# - MB_PYTHON_VERSION=3.6 +# - PLAT=i686 +# - DAILY_BUILD=true +# - SCIPY_BUILD_DEP="scipy==0.18.1" +# - os: linux +# env: +# - MB_PYTHON_VERSION=3.7 +# - NP_BUILD_DEP=numpy==1.14.5 +# - DAILY_BUILD=true +# - os: linux +# env: +# - MB_PYTHON_VERSION=3.8 +# - NP_BUILD_DEP=numpy==1.17.4 +# - NP_TEST_DEP=numpy==1.17.4 +# - DAILY_BUILD=true +# - os: linux +# env: +# - MB_PYTHON_VERSION=3.7 +# - PLAT=i686 +# - NP_BUILD_DEP=numpy==1.14.5 +# - DAILY_BUILD=true +# - os: linux +# env: +# - MB_PYTHON_VERSION=3.8 +# - PLAT=i686 +# - NP_BUILD_DEP=numpy==1.17.4 +# - NP_TEST_DEP=numpy==1.17.4 +# - DAILY_BUILD=true +# - os: osx +# language: generic +# env: +# - MB_PYTHON_VERSION=3.5 +# - SCIPY_BUILD_DEP="scipy==0.18.1" +# - os: osx +# language: generic +# env: +# - MB_PYTHON_VERSION=3.6 +# - NP_BUILD_DEP=numpy==1.11.3 +# - DAILY_BUILD=true +# - SCIPY_BUILD_DEP="scipy==0.18.1" +# - os: osx +# language: generic +# env: +# - MB_PYTHON_VERSION=3.7 +# - NP_BUILD_DEP=numpy==1.14.5 +# - DAILY_BUILD=true +# - os: osx +# language: generic +# env: +# - MB_PYTHON_VERSION=3.8 +# - NP_BUILD_DEP=numpy==1.17.4 +# - NP_TEST_DEP=numpy==1.17.4 +# - DAILY_BUILD=true -before_install: - - | - if [ "$TRAVIS_EVENT_TYPE" == "cron" ]; then - if [ "$DAILY_BUILD" != "true" ]; then - exit 0 - fi - CONTAINER="sklearn-nightly" - BUILD_COMMIT=${DAILY_COMMIT:-$BUILD_COMMIT} - else - CONTAINER=wheels - UPLOAD_ARGS="--no-update-index" - fi - - echo "Building scikit-learn-$BUILD_COMMIT" - - BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $SCIPY_BUILD_DEP $JOBLIB_BUILD_DEP" - - TEST_DEPENDS="$NP_TEST_DEP pytest $CYTHON_TEST_DEP $SCIPY_TEST_DEP $JOBLIB_TEST_DEP" - - source multibuild/common_utils.sh - - source multibuild/travis_steps.sh - - before_install - # OpenMP is not present on osx by default - - if [[ $TRAVIS_OS_NAME = "osx" ]]; then enable_openmp; fi +# before_install: +# - | +# if [ "$TRAVIS_EVENT_TYPE" == "cron" ]; then +# if [ "$DAILY_BUILD" != "true" ]; then +# exit 0 +# fi +# CONTAINER="sklearn-nightly" +# BUILD_COMMIT=${DAILY_COMMIT:-$BUILD_COMMIT} +# else +# CONTAINER=wheels +# UPLOAD_ARGS="--no-update-index" +# fi +# - echo "Building scikit-learn-$BUILD_COMMIT" +# - BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $SCIPY_BUILD_DEP $JOBLIB_BUILD_DEP" +# - TEST_DEPENDS="$NP_TEST_DEP pytest $CYTHON_TEST_DEP $SCIPY_TEST_DEP $JOBLIB_TEST_DEP" +# - source multibuild/common_utils.sh +# - source multibuild/travis_steps.sh +# - before_install +# # OpenMP is not present on osx by default +# - if [[ $TRAVIS_OS_NAME = "osx" ]]; then enable_openmp; fi -install: - # Maybe get and clean and patch source - - clean_code $REPO_DIR $BUILD_COMMIT - - build_wheel $REPO_DIR $PLAT - - if [[ $TRAVIS_OS_NAME = "osx" ]]; then disable_system_openmp; fi +# install: +# # Maybe get and clean and patch source +# - clean_code $REPO_DIR $BUILD_COMMIT +# - build_wheel $REPO_DIR $PLAT +# - if [[ $TRAVIS_OS_NAME = "osx" ]]; then disable_system_openmp; fi -script: - - install_run $PLAT +# script: +# - install_run $PLAT -after_success: - # Upload wheels to Rackspace container - - pip install wheelhouse-uploader twine - - python -m twine check ${TRAVIS_BUILD_DIR}/wheelhouse/* - - python -m wheelhouse_uploader upload --local-folder - ${TRAVIS_BUILD_DIR}/wheelhouse/ - $UPLOAD_ARGS - $CONTAINER +# after_success: +# # Upload wheels to Rackspace container +# - pip install wheelhouse-uploader twine +# - python -m twine check ${TRAVIS_BUILD_DIR}/wheelhouse/* +# - python -m wheelhouse_uploader upload --local-folder +# ${TRAVIS_BUILD_DIR}/wheelhouse/ +# $UPLOAD_ARGS +# $CONTAINER diff --git a/azure/posix.yml b/azure/posix.yml index d9020344..09043832 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -80,4 +80,4 @@ jobs: artifactFeeds: "sklearn-nightly" displayName: Authenticate twine with artifact feed - script: | - twine upload -r sklearn-wheels-testing/_packaging/sklearn-nightly/pypi/simple/ dist/ + twine upload -r https://pkgs.dev.azure.com/thomasjpfan/sklearn-wheels-testing/_packaging/sklearn-nightly/pypi/upload dist/ From 6f7e3987c3d9d5b7bec7a20c8a9991d9f9cab74a Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 16:47:13 -0500 Subject: [PATCH 100/194] TST Upload sklearn-release --- .appveyor.yml | 150 --------------------------------------------- .appveyor.yml.back | 150 +++++++++++++++++++++++++++++++++++++++++++++ .travis.yml | 140 ------------------------------------------ .travis.yml.back | 140 ++++++++++++++++++++++++++++++++++++++++++ azure/posix.yml | 10 +-- azure/windows.yml | 2 +- 6 files changed, 296 insertions(+), 296 deletions(-) delete mode 100644 .appveyor.yml create mode 100644 .appveyor.yml.back delete mode 100644 .travis.yml create mode 100644 .travis.yml.back diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index cb17a65b..00000000 --- a/.appveyor.yml +++ /dev/null @@ -1,150 +0,0 @@ -# # AppVeyor.com is a Continuous Integration service to build and run tests under -# # Windows -# # https://ci.appveyor.com/project/sklearn-ci/scikit-learn - -# environment: -# global: -# BUILD_COMMIT: 0.22.1 -# # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the -# # /E:ON and /V:ON options are not enabled in the batch script interpreter -# # See: http://stackoverflow.com/a/13751649/163740 -# CMD_IN_ENV: "cmd /E:ON /V:ON /C ..\\appveyor\\run_with_env.cmd" -# WHEELHOUSE_UPLOADER_USERNAME: sklearn-appveyor -# WHEELHOUSE_UPLOADER_SECRET: -# secure: P1/NpWGueg+26XlcS0P6kIKO1KbRw67S6ltwEjxb+vgf0F+zfNT6FRaMPKfHSXiR - -# # Make sure we don't download large datasets when running the test on -# # continuous integration platform -# SKLEARN_SKIP_NETWORK_TESTS: 1 -# APPVEYOR_SKIP_FINALIZE_ON_EXIT: true -# # Minimum numpy version -# NP_BUILD_DEP: "1.11.0" -# DAILY_COMMIT: master -# DAILY_BUILD: "false" - -# matrix: -# - PYTHON: "C:\\Python35" -# PYTHON_VERSION: "3.5.2" -# PYTHON_ARCH: "32" - -# - PYTHON: "C:\\Python35-x64" -# PYTHON_VERSION: "3.5.2" -# PYTHON_ARCH: "64" - -# - PYTHON: "C:\\Python36" -# PYTHON_VERSION: "3.6.0" -# PYTHON_ARCH: "32" -# NP_BUILD_DEP: "1.12.1" -# DAILY_BUILD: "true" - -# - PYTHON: "C:\\Python36-x64" -# PYTHON_VERSION: "3.6.0" -# PYTHON_ARCH: "64" -# NP_BUILD_DEP: "1.12.1" -# DAILY_BUILD: "true" - -# - PYTHON: "C:\\Python37" -# PYTHON_VERSION: "3.7.0" -# PYTHON_ARCH: "32" -# NP_BUILD_DEP: "1.14.5" -# DAILY_BUILD: "true" - -# - PYTHON: "C:\\Python37-x64" -# PYTHON_VERSION: "3.7.0" -# PYTHON_ARCH: "64" -# NP_BUILD_DEP: "1.14.5" -# DAILY_BUILD: "true" - -# - PYTHON: "C:\\Python38" -# PYTHON_VERSION: "3.8.0" -# PYTHON_ARCH: "32" -# NP_BUILD_DEP: "1.17.4" -# DAILY_BUILD: "true" - -# - PYTHON: "C:\\Python38-x64" -# PYTHON_VERSION: "3.8.0" -# PYTHON_ARCH: "64" -# NP_BUILD_DEP: "1.17.4" -# DAILY_BUILD: "true" - -# init: -# - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%" -# - "ECHO \"%APPVEYOR_SCHEDULED_BUILD%\"" -# - ps: >- -# if ($env:APPVEYOR_SCHEDULED_BUILD -eq "True") { -# $env:CONTAINER = "sklearn-nightly" -# if ($env:DAILY_COMMIT) { $env:BUILD_COMMIT = $env:DAILY_COMMIT } -# if ($env:DAILY_BUILD -eq "false") { Exit-AppveyorBuild } -# } else { -# $env:CONTAINER = "wheels" -# $env:UPLOAD_ARGS = "--no-update-index" -# } - -# install: -# # Install Python (from the official .msi of http://python.org) and pip when -# # not already installed. -# - "powershell ./appveyor/install.ps1" -# - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" -# - "python -m pip install -U pip" - -# # Check that we have the expected version and architecture for Python -# - "python --version" -# - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" -# - "pip --version" - -# # Checkout the request scikit-learn version in the submodule -# - "git submodule update --init --recursive" -# - "cd scikit-learn" -# - "git checkout %BUILD_COMMIT%" -# - "git clean -fxd" -# - "git reset --hard" - -# # Install the build and runtime dependencies of the project. -# - "%CMD_IN_ENV% pip install --timeout=60 numpy==%NP_BUILD_DEP%" -# - "%CMD_IN_ENV% pip install --timeout=60 -r ../appveyor/requirements.txt" -# - "%CMD_IN_ENV% python setup.py build" -# - "%CMD_IN_ENV% python ../appveyor/vendor_vcomp140.py" -# - "%CMD_IN_ENV% python setup.py bdist_wheel" -# - ps: "ls dist" -# - "%CMD_IN_ENV% twine check dist/*" - -# # Install the generated wheel package to test it -# - "pip install --pre --no-index --find-links dist/ scikit-learn" - -# # Not a .NET project, we build scikit-learn in the install step instead -# build: false - -# test_script: -# # Remove the source dir to make sure we run the tests on the -# # installed library. -# - "rd /s /q \"sklearn\"" -# # remove setup.cfg so as to not force --doctest-modules -# - "del setup.cfg" -# # Install the newest version of numpy for the tests: the goal is to ensure -# # that the scikit-learn wheels are binary compatible both with the old numpy -# # version against which they were built and the newest numpy version at the -# # time of the release, that is the version of numpy that users are most -# # likely to use. -# - "%CMD_IN_ENV% pip install -U --timeout=60 numpy" -# - "%CMD_IN_ENV% pytest -rs --pyargs sklearn" - -# artifacts: -# # Archive the generated wheel package in the ci.appveyor.com build report. -# - path: 'scikit-learn\dist\*' - -# on_success: -# # Upload the generated wheel package to Rackspace -# # On Windows, Apache Libcloud cannot find a standard CA cert bundle so we -# # disable the ssl checks. -# - python -m wheelhouse_uploader upload -# --no-ssl-check -# --local-folder=dist -# %UPLOAD_ARGS% -# %CONTAINER% - -# cache: -# # Use the appveyor cache to avoid re-downloading large archives such -# # the MKL numpy and scipy wheels mirrored on a rackspace cloud -# # container, speed up the appveyor jobs and reduce bandwidth -# # usage on our rackspace account. -# - '%APPDATA%\pip\Cache' diff --git a/.appveyor.yml.back b/.appveyor.yml.back new file mode 100644 index 00000000..61af3be4 --- /dev/null +++ b/.appveyor.yml.back @@ -0,0 +1,150 @@ +# AppVeyor.com is a Continuous Integration service to build and run tests under +# Windows +# https://ci.appveyor.com/project/sklearn-ci/scikit-learn + +environment: + global: + BUILD_COMMIT: 0.22.1 + # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the + # /E:ON and /V:ON options are not enabled in the batch script interpreter + # See: http://stackoverflow.com/a/13751649/163740 + CMD_IN_ENV: "cmd /E:ON /V:ON /C ..\\appveyor\\run_with_env.cmd" + WHEELHOUSE_UPLOADER_USERNAME: sklearn-appveyor + WHEELHOUSE_UPLOADER_SECRET: + secure: P1/NpWGueg+26XlcS0P6kIKO1KbRw67S6ltwEjxb+vgf0F+zfNT6FRaMPKfHSXiR + + # Make sure we don't download large datasets when running the test on + # continuous integration platform + SKLEARN_SKIP_NETWORK_TESTS: 1 + APPVEYOR_SKIP_FINALIZE_ON_EXIT: true + # Minimum numpy version + NP_BUILD_DEP: "1.11.0" + DAILY_COMMIT: master + DAILY_BUILD: "false" + + matrix: + - PYTHON: "C:\\Python35" + PYTHON_VERSION: "3.5.2" + PYTHON_ARCH: "32" + + - PYTHON: "C:\\Python35-x64" + PYTHON_VERSION: "3.5.2" + PYTHON_ARCH: "64" + + - PYTHON: "C:\\Python36" + PYTHON_VERSION: "3.6.0" + PYTHON_ARCH: "32" + NP_BUILD_DEP: "1.12.1" + DAILY_BUILD: "true" + + - PYTHON: "C:\\Python36-x64" + PYTHON_VERSION: "3.6.0" + PYTHON_ARCH: "64" + NP_BUILD_DEP: "1.12.1" + DAILY_BUILD: "true" + + - PYTHON: "C:\\Python37" + PYTHON_VERSION: "3.7.0" + PYTHON_ARCH: "32" + NP_BUILD_DEP: "1.14.5" + DAILY_BUILD: "true" + + - PYTHON: "C:\\Python37-x64" + PYTHON_VERSION: "3.7.0" + PYTHON_ARCH: "64" + NP_BUILD_DEP: "1.14.5" + DAILY_BUILD: "true" + + - PYTHON: "C:\\Python38" + PYTHON_VERSION: "3.8.0" + PYTHON_ARCH: "32" + NP_BUILD_DEP: "1.17.4" + DAILY_BUILD: "true" + + - PYTHON: "C:\\Python38-x64" + PYTHON_VERSION: "3.8.0" + PYTHON_ARCH: "64" + NP_BUILD_DEP: "1.17.4" + DAILY_BUILD: "true" + +init: + - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%" + - "ECHO \"%APPVEYOR_SCHEDULED_BUILD%\"" + - ps: >- + if ($env:APPVEYOR_SCHEDULED_BUILD -eq "True") { + $env:CONTAINER = "sklearn-nightly" + if ($env:DAILY_COMMIT) { $env:BUILD_COMMIT = $env:DAILY_COMMIT } + if ($env:DAILY_BUILD -eq "false") { Exit-AppveyorBuild } + } else { + $env:CONTAINER = "wheels" + $env:UPLOAD_ARGS = "--no-update-index" + } + +install: + # Install Python (from the official .msi of http://python.org) and pip when + # not already installed. + - "powershell ./appveyor/install.ps1" + - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" + - "python -m pip install -U pip" + + # Check that we have the expected version and architecture for Python + - "python --version" + - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" + - "pip --version" + + # Checkout the request scikit-learn version in the submodule + - "git submodule update --init --recursive" + - "cd scikit-learn" + - "git checkout %BUILD_COMMIT%" + - "git clean -fxd" + - "git reset --hard" + + # Install the build and runtime dependencies of the project. + - "%CMD_IN_ENV% pip install --timeout=60 numpy==%NP_BUILD_DEP%" + - "%CMD_IN_ENV% pip install --timeout=60 -r ../appveyor/requirements.txt" + - "%CMD_IN_ENV% python setup.py build" + - "%CMD_IN_ENV% python ../appveyor/vendor_vcomp140.py" + - "%CMD_IN_ENV% python setup.py bdist_wheel" + - ps: "ls dist" + - "%CMD_IN_ENV% twine check dist/*" + + # Install the generated wheel package to test it + - "pip install --pre --no-index --find-links dist/ scikit-learn" + +# Not a .NET project, we build scikit-learn in the install step instead +build: false + +test_script: + # Remove the source dir to make sure we run the tests on the + # installed library. + - "rd /s /q \"sklearn\"" + # remove setup.cfg so as to not force --doctest-modules + - "del setup.cfg" + # Install the newest version of numpy for the tests: the goal is to ensure + # that the scikit-learn wheels are binary compatible both with the old numpy + # version against which they were built and the newest numpy version at the + # time of the release, that is the version of numpy that users are most + # likely to use. + - "%CMD_IN_ENV% pip install -U --timeout=60 numpy" + - "%CMD_IN_ENV% pytest -rs --pyargs sklearn" + +artifacts: + # Archive the generated wheel package in the ci.appveyor.com build report. + - path: 'scikit-learn\dist\*' + +on_success: + # Upload the generated wheel package to Rackspace + # On Windows, Apache Libcloud cannot find a standard CA cert bundle so we + # disable the ssl checks. + - python -m wheelhouse_uploader upload + --no-ssl-check + --local-folder=dist + %UPLOAD_ARGS% + %CONTAINER% + +cache: + # Use the appveyor cache to avoid re-downloading large archives such + # the MKL numpy and scipy wheels mirrored on a rackspace cloud + # container, speed up the appveyor jobs and reduce bandwidth + # usage on our rackspace account. + - '%APPDATA%\pip\Cache' diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 22c69b41..00000000 --- a/.travis.yml +++ /dev/null @@ -1,140 +0,0 @@ -# env: -# global: -# - REPO_DIR="scikit-learn" -# - BUILD_COMMIT=0.22.1 -# - PLAT=x86_64 -# - UNICODE_WIDTH=32 -# - NP_BUILD_DEP="numpy==1.11.0" -# - NP_TEST_DEP="numpy==1.16.3" -# - CYTHON_BUILD_DEP="cython==0.29.13" -# - CYTHON_TEST_DEP="cython" -# - SCIPY_BUILD_DEP="scipy" -# - SCIPY_TEST_DEP="scipy==1.3.2" -# - JOBLIB_BUILD_DEP="joblib==0.11" -# - JOBLIB_TEST_DEP="joblib" -# - DAILY_COMMIT=master -# - DAILY_BUILD=false -# - WHEELHOUSE_UPLOADER_USERNAME=travis-worker -# # Following generated with -# # travis encrypt -r MacPython/scikit-learn-wheels WHEELHOUSE_UPLOADER_SECRET= -# - secure: "Lyhm6qFtf/hY5D3UHMANNhh8Ar/PARF1nH/ebArWLtb24prrSYt+AAVJqZ81I58AdQK12Kn8mmuZVyVJT+FrRd8q6OyMijQ/wKrsx8EH+lDTTgUueBJtLql01KsaMRTDpAd04bREh1MppIsFFCHKVNxY2mW17XwsNQ+MUka4Bos=" - -# language: python -# # Default Python version is usually 2.7 -# python: 3.5 -# sudo: required -# dist: trusty - -# matrix: -# exclude: -# # Exclude the default Python 3.5 build -# - python: 3.5 -# include: -# - os: linux -# env: -# - MB_PYTHON_VERSION=3.5 -# - SCIPY_BUILD_DEP="scipy==0.18.1" -# - os: linux -# env: -# - MB_PYTHON_VERSION=3.5 -# - PLAT=i686 -# - SCIPY_BUILD_DEP="scipy==0.18.1" -# - os: linux -# env: -# - MB_PYTHON_VERSION=3.6 -# - DAILY_BUILD=true -# - SCIPY_BUILD_DEP="scipy==0.18.1" -# - os: linux -# env: -# - MB_PYTHON_VERSION=3.6 -# - PLAT=i686 -# - DAILY_BUILD=true -# - SCIPY_BUILD_DEP="scipy==0.18.1" -# - os: linux -# env: -# - MB_PYTHON_VERSION=3.7 -# - NP_BUILD_DEP=numpy==1.14.5 -# - DAILY_BUILD=true -# - os: linux -# env: -# - MB_PYTHON_VERSION=3.8 -# - NP_BUILD_DEP=numpy==1.17.4 -# - NP_TEST_DEP=numpy==1.17.4 -# - DAILY_BUILD=true -# - os: linux -# env: -# - MB_PYTHON_VERSION=3.7 -# - PLAT=i686 -# - NP_BUILD_DEP=numpy==1.14.5 -# - DAILY_BUILD=true -# - os: linux -# env: -# - MB_PYTHON_VERSION=3.8 -# - PLAT=i686 -# - NP_BUILD_DEP=numpy==1.17.4 -# - NP_TEST_DEP=numpy==1.17.4 -# - DAILY_BUILD=true -# - os: osx -# language: generic -# env: -# - MB_PYTHON_VERSION=3.5 -# - SCIPY_BUILD_DEP="scipy==0.18.1" -# - os: osx -# language: generic -# env: -# - MB_PYTHON_VERSION=3.6 -# - NP_BUILD_DEP=numpy==1.11.3 -# - DAILY_BUILD=true -# - SCIPY_BUILD_DEP="scipy==0.18.1" -# - os: osx -# language: generic -# env: -# - MB_PYTHON_VERSION=3.7 -# - NP_BUILD_DEP=numpy==1.14.5 -# - DAILY_BUILD=true -# - os: osx -# language: generic -# env: -# - MB_PYTHON_VERSION=3.8 -# - NP_BUILD_DEP=numpy==1.17.4 -# - NP_TEST_DEP=numpy==1.17.4 -# - DAILY_BUILD=true - -# before_install: -# - | -# if [ "$TRAVIS_EVENT_TYPE" == "cron" ]; then -# if [ "$DAILY_BUILD" != "true" ]; then -# exit 0 -# fi -# CONTAINER="sklearn-nightly" -# BUILD_COMMIT=${DAILY_COMMIT:-$BUILD_COMMIT} -# else -# CONTAINER=wheels -# UPLOAD_ARGS="--no-update-index" -# fi -# - echo "Building scikit-learn-$BUILD_COMMIT" -# - BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $SCIPY_BUILD_DEP $JOBLIB_BUILD_DEP" -# - TEST_DEPENDS="$NP_TEST_DEP pytest $CYTHON_TEST_DEP $SCIPY_TEST_DEP $JOBLIB_TEST_DEP" -# - source multibuild/common_utils.sh -# - source multibuild/travis_steps.sh -# - before_install -# # OpenMP is not present on osx by default -# - if [[ $TRAVIS_OS_NAME = "osx" ]]; then enable_openmp; fi - -# install: -# # Maybe get and clean and patch source -# - clean_code $REPO_DIR $BUILD_COMMIT -# - build_wheel $REPO_DIR $PLAT -# - if [[ $TRAVIS_OS_NAME = "osx" ]]; then disable_system_openmp; fi - -# script: -# - install_run $PLAT - -# after_success: -# # Upload wheels to Rackspace container -# - pip install wheelhouse-uploader twine -# - python -m twine check ${TRAVIS_BUILD_DIR}/wheelhouse/* -# - python -m wheelhouse_uploader upload --local-folder -# ${TRAVIS_BUILD_DIR}/wheelhouse/ -# $UPLOAD_ARGS -# $CONTAINER diff --git a/.travis.yml.back b/.travis.yml.back new file mode 100644 index 00000000..51a07588 --- /dev/null +++ b/.travis.yml.back @@ -0,0 +1,140 @@ +env: + global: + - REPO_DIR="scikit-learn" + - BUILD_COMMIT=0.22.1 + - PLAT=x86_64 + - UNICODE_WIDTH=32 + - NP_BUILD_DEP="numpy==1.11.0" + - NP_TEST_DEP="numpy==1.16.3" + - CYTHON_BUILD_DEP="cython==0.29.13" + - CYTHON_TEST_DEP="cython" + - SCIPY_BUILD_DEP="scipy" + - SCIPY_TEST_DEP="scipy==1.3.2" + - JOBLIB_BUILD_DEP="joblib==0.11" + - JOBLIB_TEST_DEP="joblib" + - DAILY_COMMIT=master + - DAILY_BUILD=false + - WHEELHOUSE_UPLOADER_USERNAME=travis-worker + # Following generated with + # travis encrypt -r MacPython/scikit-learn-wheels WHEELHOUSE_UPLOADER_SECRET= + - secure: "Lyhm6qFtf/hY5D3UHMANNhh8Ar/PARF1nH/ebArWLtb24prrSYt+AAVJqZ81I58AdQK12Kn8mmuZVyVJT+FrRd8q6OyMijQ/wKrsx8EH+lDTTgUueBJtLql01KsaMRTDpAd04bREh1MppIsFFCHKVNxY2mW17XwsNQ+MUka4Bos=" + +language: python +# Default Python version is usually 2.7 +python: 3.5 +sudo: required +dist: trusty + +matrix: + exclude: + # Exclude the default Python 3.5 build + - python: 3.5 + include: + - os: linux + env: + - MB_PYTHON_VERSION=3.5 + - SCIPY_BUILD_DEP="scipy==0.18.1" + - os: linux + env: + - MB_PYTHON_VERSION=3.5 + - PLAT=i686 + - SCIPY_BUILD_DEP="scipy==0.18.1" + - os: linux + env: + - MB_PYTHON_VERSION=3.6 + - DAILY_BUILD=true + - SCIPY_BUILD_DEP="scipy==0.18.1" + - os: linux + env: + - MB_PYTHON_VERSION=3.6 + - PLAT=i686 + - DAILY_BUILD=true + - SCIPY_BUILD_DEP="scipy==0.18.1" + - os: linux + env: + - MB_PYTHON_VERSION=3.7 + - NP_BUILD_DEP=numpy==1.14.5 + - DAILY_BUILD=true + - os: linux + env: + - MB_PYTHON_VERSION=3.8 + - NP_BUILD_DEP=numpy==1.17.4 + - NP_TEST_DEP=numpy==1.17.4 + - DAILY_BUILD=true + - os: linux + env: + - MB_PYTHON_VERSION=3.7 + - PLAT=i686 + - NP_BUILD_DEP=numpy==1.14.5 + - DAILY_BUILD=true + - os: linux + env: + - MB_PYTHON_VERSION=3.8 + - PLAT=i686 + - NP_BUILD_DEP=numpy==1.17.4 + - NP_TEST_DEP=numpy==1.17.4 + - DAILY_BUILD=true + - os: osx + language: generic + env: + - MB_PYTHON_VERSION=3.5 + - SCIPY_BUILD_DEP="scipy==0.18.1" + - os: osx + language: generic + env: + - MB_PYTHON_VERSION=3.6 + - NP_BUILD_DEP=numpy==1.11.3 + - DAILY_BUILD=true + - SCIPY_BUILD_DEP="scipy==0.18.1" + - os: osx + language: generic + env: + - MB_PYTHON_VERSION=3.7 + - NP_BUILD_DEP=numpy==1.14.5 + - DAILY_BUILD=true + - os: osx + language: generic + env: + - MB_PYTHON_VERSION=3.8 + - NP_BUILD_DEP=numpy==1.17.4 + - NP_TEST_DEP=numpy==1.17.4 + - DAILY_BUILD=true + +before_install: + - | + if [ "$TRAVIS_EVENT_TYPE" == "cron" ]; then + if [ "$DAILY_BUILD" != "true" ]; then + exit 0 + fi + CONTAINER="sklearn-nightly" + BUILD_COMMIT=${DAILY_COMMIT:-$BUILD_COMMIT} + else + CONTAINER=wheels + UPLOAD_ARGS="--no-update-index" + fi + - echo "Building scikit-learn-$BUILD_COMMIT" + - BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $SCIPY_BUILD_DEP $JOBLIB_BUILD_DEP" + - TEST_DEPENDS="$NP_TEST_DEP pytest $CYTHON_TEST_DEP $SCIPY_TEST_DEP $JOBLIB_TEST_DEP" + - source multibuild/common_utils.sh + - source multibuild/travis_steps.sh + - before_install + # OpenMP is not present on osx by default + - if [[ $TRAVIS_OS_NAME = "osx" ]]; then enable_openmp; fi + +install: + # Maybe get and clean and patch source + - clean_code $REPO_DIR $BUILD_COMMIT + - build_wheel $REPO_DIR $PLAT + - if [[ $TRAVIS_OS_NAME = "osx" ]]; then disable_system_openmp; fi + +script: + - install_run $PLAT + +after_success: + # Upload wheels to Rackspace container + - pip install wheelhouse-uploader twine + - python -m twine check ${TRAVIS_BUILD_DIR}/wheelhouse/* + - python -m wheelhouse_uploader upload --local-folder + ${TRAVIS_BUILD_DIR}/wheelhouse/ + $UPLOAD_ARGS + $CONTAINER diff --git a/azure/posix.yml b/azure/posix.yml index 09043832..8b022132 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -14,7 +14,7 @@ jobs: UNICODE_WIDTH: "32" NP_BUILD_DEP: "numpy==1.11.0" NP_TEST_DEP: "numpy" - CYTHON_BUILD_DEP: "cython==0.29.7" + CYTHON_BUILD_DEP: "cython==0.29.15" CYTHON_TEST_DEP: "cython" SCIPY_BUILD_DEP: "scipy" SCIPY_TEST_DEP: "scipy" @@ -73,11 +73,11 @@ jobs: # install_run $PLAT displayName: Build, install, and test - - script: pip install twine - displayName: Install twine + - script: pip install twine wheel + displayName: Install twine and wheel - task: TwineAuthenticate@0 inputs: - artifactFeeds: "sklearn-nightly" + artifactFeeds: sklearn-release displayName: Authenticate twine with artifact feed - script: | - twine upload -r https://pkgs.dev.azure.com/thomasjpfan/sklearn-wheels-testing/_packaging/sklearn-nightly/pypi/upload dist/ + twine upload -r "sklearn-release" --config-file $(PYPIRC_PATH) dist/*.whl diff --git a/azure/windows.yml b/azure/windows.yml index ce0359c0..86e7c6df 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -11,7 +11,7 @@ jobs: BUILD_COMMIT: "0.22.1" SKLEARN_SKIP_NETWORK_TESTS: "1" NP_BUILD_DEP: "1.11.0" - CYTHON_BUILD_DEP: "0.29.7" + CYTHON_BUILD_DEP: "0.29.15" SCIPY_BUILD_DEP: "1.1.0" DAILY_COMMIT: "master" DAILY_BUILD: "false" From 691f324ad7db1e68f1624f25622494ddd5e615a3 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 16:51:02 -0500 Subject: [PATCH 101/194] DEP Cython --- azure/posix.yml | 2 +- azure/windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 8b022132..86102e78 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -14,7 +14,7 @@ jobs: UNICODE_WIDTH: "32" NP_BUILD_DEP: "numpy==1.11.0" NP_TEST_DEP: "numpy" - CYTHON_BUILD_DEP: "cython==0.29.15" + CYTHON_BUILD_DEP: "cython==0.29.14" CYTHON_TEST_DEP: "cython" SCIPY_BUILD_DEP: "scipy" SCIPY_TEST_DEP: "scipy" diff --git a/azure/windows.yml b/azure/windows.yml index 86e7c6df..821b50af 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -11,7 +11,7 @@ jobs: BUILD_COMMIT: "0.22.1" SKLEARN_SKIP_NETWORK_TESTS: "1" NP_BUILD_DEP: "1.11.0" - CYTHON_BUILD_DEP: "0.29.15" + CYTHON_BUILD_DEP: "0.29.14" SCIPY_BUILD_DEP: "1.1.0" DAILY_COMMIT: "master" DAILY_BUILD: "false" From c102d033c9bcc5113b50e16259fe63015b620a87 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 16:58:05 -0500 Subject: [PATCH 102/194] BUG Fix --- azure/posix.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/azure/posix.yml b/azure/posix.yml index 86102e78..d7395cba 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -75,9 +75,13 @@ jobs: displayName: Build, install, and test - script: pip install twine wheel displayName: Install twine and wheel + condition: ne(variables['Build.Reason'], 'PullRequest') - task: TwineAuthenticate@0 inputs: artifactFeeds: sklearn-release displayName: Authenticate twine with artifact feed + condition: ne(variables['Build.Reason'], 'PullRequest') - script: | - twine upload -r "sklearn-release" --config-file $(PYPIRC_PATH) dist/*.whl + twine upload -r "sklearn-release" --config-file $(PYPIRC_PATH) dist/ + displayName: Upload to sklearn-release azure artifact feed + condition: ne(variables['Build.Reason'], 'PullRequest') From ba8e5d754c1bc190c5674ac4002a2f773d457b9b Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 16:58:18 -0500 Subject: [PATCH 103/194] BUG Fix --- azure/posix.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure/posix.yml b/azure/posix.yml index d7395cba..7f16452e 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -82,6 +82,7 @@ jobs: displayName: Authenticate twine with artifact feed condition: ne(variables['Build.Reason'], 'PullRequest') - script: | + ls dist/ twine upload -r "sklearn-release" --config-file $(PYPIRC_PATH) dist/ displayName: Upload to sklearn-release azure artifact feed condition: ne(variables['Build.Reason'], 'PullRequest') From 68c56ecbcf046e6e54c4d5cca6a0f7f4a7029742 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 17:10:41 -0500 Subject: [PATCH 104/194] explore fs --- azure/posix.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/azure/posix.yml b/azure/posix.yml index 7f16452e..82a36aed 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -71,6 +71,8 @@ jobs: disable_system_openmp fi + ls + # install_run $PLAT displayName: Build, install, and test - script: pip install twine wheel @@ -82,7 +84,7 @@ jobs: displayName: Authenticate twine with artifact feed condition: ne(variables['Build.Reason'], 'PullRequest') - script: | - ls dist/ + # ls twine upload -r "sklearn-release" --config-file $(PYPIRC_PATH) dist/ displayName: Upload to sklearn-release azure artifact feed condition: ne(variables['Build.Reason'], 'PullRequest') From 3d6b5d544f24a28593ec2b5ab0c78ceca098913b Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 17:12:09 -0500 Subject: [PATCH 105/194] ITS IN THE WHEELHOUSE --- azure/posix.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure/posix.yml b/azure/posix.yml index 82a36aed..ac933051 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -72,6 +72,7 @@ jobs: fi ls + ls wheelhouse # install_run $PLAT displayName: Build, install, and test From fc720ec0c5e8f2f207e55f56342982671d6d37f0 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 17:19:38 -0500 Subject: [PATCH 106/194] ITS IN THE WHEELHOUSE --- azure/posix.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index ac933051..e6ab2644 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -71,9 +71,6 @@ jobs: disable_system_openmp fi - ls - ls wheelhouse - # install_run $PLAT displayName: Build, install, and test - script: pip install twine wheel @@ -85,7 +82,6 @@ jobs: displayName: Authenticate twine with artifact feed condition: ne(variables['Build.Reason'], 'PullRequest') - script: | - # ls - twine upload -r "sklearn-release" --config-file $(PYPIRC_PATH) dist/ + twine upload -r "sklearn-release" --config-file $(PYPIRC_PATH) wheelhouse/ displayName: Upload to sklearn-release azure artifact feed condition: ne(variables['Build.Reason'], 'PullRequest') From 229df65a672f9cd582bdb038a599d051f6f5bd7d Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 17:26:51 -0500 Subject: [PATCH 107/194] Twine is great --- azure/posix.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure/posix.yml b/azure/posix.yml index e6ab2644..aa7aae13 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -82,6 +82,7 @@ jobs: displayName: Authenticate twine with artifact feed condition: ne(variables['Build.Reason'], 'PullRequest') - script: | - twine upload -r "sklearn-release" --config-file $(PYPIRC_PATH) wheelhouse/ + twine upload -r "sklearn-release" --config-file $(PYPIRC_PATH) \ + wheelhouse/* displayName: Upload to sklearn-release azure artifact feed condition: ne(variables['Build.Reason'], 'PullRequest') From de1923f88ee4c7fb5542fe9a02d6441b1b2c5aef Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 17:38:48 -0500 Subject: [PATCH 108/194] DEBUG .pypirc --- azure/posix.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index aa7aae13..ef395b15 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -65,7 +65,7 @@ jobs: fi clean_code $REPO_DIR $BUILD_COMMIT - build_wheel $REPO_DIR $PLAT + # build_wheel $REPO_DIR $PLAT if [ $TRAVIS_OS_NAME == "osx" ]; then disable_system_openmp @@ -82,7 +82,8 @@ jobs: displayName: Authenticate twine with artifact feed condition: ne(variables['Build.Reason'], 'PullRequest') - script: | - twine upload -r "sklearn-release" --config-file $(PYPIRC_PATH) \ - wheelhouse/* + cat .pypirc + # twine upload -r sklearn-release --config-file $(PYPIRC_PATH) \ + # wheelhouse/* displayName: Upload to sklearn-release azure artifact feed - condition: ne(variables['Build.Reason'], 'PullRequest') + # condition: ne(variables['Build.Reason'], 'PullRequest') From 5905e5db9d88f8872e7f7877bb166ed940d7d659 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 17:41:41 -0500 Subject: [PATCH 109/194] USE VERSION 1 --- azure/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/posix.yml b/azure/posix.yml index ef395b15..31c2ff6c 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -76,7 +76,7 @@ jobs: - script: pip install twine wheel displayName: Install twine and wheel condition: ne(variables['Build.Reason'], 'PullRequest') - - task: TwineAuthenticate@0 + - task: TwineAuthenticate@1 inputs: artifactFeeds: sklearn-release displayName: Authenticate twine with artifact feed From c36a65a9cda39bd37111f6b9aff0c6ef088a799a Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 17:45:36 -0500 Subject: [PATCH 110/194] ITS SINGULAr --- azure/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/posix.yml b/azure/posix.yml index 31c2ff6c..7816ea68 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -78,7 +78,7 @@ jobs: condition: ne(variables['Build.Reason'], 'PullRequest') - task: TwineAuthenticate@1 inputs: - artifactFeeds: sklearn-release + artifactFeed: sklearn-release displayName: Authenticate twine with artifact feed condition: ne(variables['Build.Reason'], 'PullRequest') - script: | From 4f07fc219cde836ca25f19fd00f8ea2e34393caa Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 17:47:50 -0500 Subject: [PATCH 111/194] USE ENV --- azure/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/posix.yml b/azure/posix.yml index 7816ea68..f50f086b 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -82,7 +82,7 @@ jobs: displayName: Authenticate twine with artifact feed condition: ne(variables['Build.Reason'], 'PullRequest') - script: | - cat .pypirc + cat $(PYPIRC_PATH) # twine upload -r sklearn-release --config-file $(PYPIRC_PATH) \ # wheelhouse/* displayName: Upload to sklearn-release azure artifact feed From e76cf99ed4985089415f415cab355dbdd0bf90a6 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 17:51:36 -0500 Subject: [PATCH 112/194] BUG Fix --- azure/posix.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index f50f086b..f070364d 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -65,7 +65,7 @@ jobs: fi clean_code $REPO_DIR $BUILD_COMMIT - # build_wheel $REPO_DIR $PLAT + build_wheel $REPO_DIR $PLAT if [ $TRAVIS_OS_NAME == "osx" ]; then disable_system_openmp @@ -82,8 +82,7 @@ jobs: displayName: Authenticate twine with artifact feed condition: ne(variables['Build.Reason'], 'PullRequest') - script: | - cat $(PYPIRC_PATH) - # twine upload -r sklearn-release --config-file $(PYPIRC_PATH) \ - # wheelhouse/* + twine upload -r sklearn-release --config-file $(PYPIRC_PATH) \ + wheelhouse/* displayName: Upload to sklearn-release azure artifact feed - # condition: ne(variables['Build.Reason'], 'PullRequest') + condition: ne(variables['Build.Reason'], 'PullRequest') From 574c86526fda2610dcbef01f2a21284797ae7814 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 18:34:43 -0500 Subject: [PATCH 113/194] MNT Install keyring --- azure/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/posix.yml b/azure/posix.yml index f070364d..90303ac7 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -73,7 +73,7 @@ jobs: # install_run $PLAT displayName: Build, install, and test - - script: pip install twine wheel + - script: pip install twine wheel keyring artifacts-keyring displayName: Install twine and wheel condition: ne(variables['Build.Reason'], 'PullRequest') - task: TwineAuthenticate@1 From 3c1909bdbd1725677c4f5205880e458f486e2a9c Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 18:52:27 -0500 Subject: [PATCH 114/194] Updates feed name --- azure/posix.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/azure/posix.yml b/azure/posix.yml index 90303ac7..36d0f107 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -78,10 +78,12 @@ jobs: condition: ne(variables['Build.Reason'], 'PullRequest') - task: TwineAuthenticate@1 inputs: - artifactFeed: sklearn-release + artifactFeed: sklearn-wheels-testing +/sklearn-release displayName: Authenticate twine with artifact feed condition: ne(variables['Build.Reason'], 'PullRequest') - script: | + cat $(PYPIRC_PATH) twine upload -r sklearn-release --config-file $(PYPIRC_PATH) \ wheelhouse/* displayName: Upload to sklearn-release azure artifact feed From 6dc8d2b20f5d26dd0ad3efb99a9c533a47ed5381 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 18:59:56 -0500 Subject: [PATCH 115/194] no newline --- azure/posix.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 36d0f107..d20a45e7 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -78,8 +78,7 @@ jobs: condition: ne(variables['Build.Reason'], 'PullRequest') - task: TwineAuthenticate@1 inputs: - artifactFeed: sklearn-wheels-testing -/sklearn-release + artifactFeed: sklearn-wheels-testing/sklearn-release displayName: Authenticate twine with artifact feed condition: ne(variables['Build.Reason'], 'PullRequest') - script: | From ee2ef4af04a206baf20736f0e0cc99d6f5737e0a Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 19:18:40 -0500 Subject: [PATCH 116/194] MNT Adds more artifacts --- azure-pipelines.yml | 67 +++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 16fdfeea..437f47d6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -33,40 +33,41 @@ jobs: name: linux vmImage: ubuntu-16.04 matrix: - # py_3.5_64: - # MB_PYTHON_VERSION: "3.5" - # py_3.5_32: - # MB_PYTHON_VERSION: "3.5" - # PLAT: "i686" - # py_3.6_64: - # MB_PYTHON_VERSION: "3.6" - # DAILY_BUILD: "true" - # py_3.6_32: - # MB_PYTHON_VERSION: "3.6" - # PLAT: "i686" - # DAILY_BUILD: "true" + py_3.5_32: + MB_PYTHON_VERSION: "3.5" + PLAT: "i686" + py_3.5_64: + MB_PYTHON_VERSION: "3.5" + py_3.6_32: + MB_PYTHON_VERSION: "3.6" + PLAT: "i686" + DAILY_BUILD: "true" + py_3.6_64: + MB_PYTHON_VERSION: "3.6" + DAILY_BUILD: "true" + py_3.7_32: + MB_PYTHON_VERSION: "3.7" + PLAT: "i686" + NP_BUILD_DEP: "numpy==1.14.5" + DAILY_BUILD: "true" + py_3.7_64: + MB_PYTHON_VERSION: "3.7" + NP_BUILD_DEP: "numpy==1.14.5" + DAILY_BUILD: "true" + + - template: azure/posix.yml + parameters: + name: macOS + vmImage: xcode9-macos10.13 + matrix: + py_3.5_64: + MB_PYTHON_VERSION: "3.5" + SCIPY_BUILD_DEP: "scipy==0.17.1" + py_3.6_64: + MB_PYTHON_VERSION: "3.6" + NP_BUILD_DEP: "numpy==1.11.3" + DAILY_BUILD: "true" py_3.7_64: MB_PYTHON_VERSION: "3.7" NP_BUILD_DEP: "numpy==1.14.5" DAILY_BUILD: "true" - # py_3.7_32: - # MB_PYTHON_VERSION: "3.7" - # PLAT: "i686" - # NP_BUILD_DEP: "numpy==1.14.5" - # DAILY_BUILD: "true" - # - template: azure/posix.yml - # parameters: - # name: macOS - # vmImage: xcode9-macos10.13 - # matrix: - # py_3.5_64: - # MB_PYTHON_VERSION: "3.5" - # SCIPY_BUILD_DEP: "scipy==0.17.1" - # py_3.6_64: - # MB_PYTHON_VERSION: "3.6" - # NP_BUILD_DEP: "numpy==1.11.3" - # DAILY_BUILD: "true" - # py_3.7_64: - # MB_PYTHON_VERSION: "3.7" - # NP_BUILD_DEP: "numpy==1.14.5" - # DAILY_BUILD: "true" From a56f6ddebf11c6ecb710138d7c6d1af8219e3461 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 19:26:44 -0500 Subject: [PATCH 117/194] BLD Build all the supported versions --- azure-pipelines.yml | 78 +++++++++++++++++++++++++++++---------------- azure/posix.yml | 1 - azure/windows.yml | 13 ++++++++ 3 files changed, 63 insertions(+), 29 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 437f47d6..9a710809 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,32 +1,41 @@ jobs: - # - template: azure/windows.yml - # parameters: - # name: windows - # vmImage: vs2017-win2016 - # matrix: - # py_3.5_32: - # PYTHON_VERSION: "3.5.x" - # PYTHON_ARCH: "x86" - # py_3.5_64: - # PYTHON_VERSION: "3.5.x" - # py_3.6_32: - # PYTHON_VERSION: "3.6.x" - # PYTHON_ARCH: "x86" - # NP_BUILD_DEP: "1.12.1" - # DAILY_BUILD: "true" - # py_3.6_64: - # PYTHON_VERSION: "3.6.x" - # NP_BUILD_DEP: "1.12.1" - # DAILY_BUILD: "true" - # py_3.7_32: - # PYTHON_VERSION: "3.7.x" - # PYTHON_ARCH: "x86" - # NP_BUILD_DEP: "1.14.5" - # DAILY_BUILD: "true" - # py_3.7_64: - # PYTHON_VERSION: "3.7.x" - # NP_BUILD_DEP: "1.14.5" - # DAILY_BUILD: "true" + - template: azure/windows.yml + parameters: + name: windows + vmImage: vs2017-win2016 + matrix: + py_3.5_32: + PYTHON_VERSION: "3.5.x" + PYTHON_ARCH: "x86" + py_3.5_64: + PYTHON_VERSION: "3.5.x" + py_3.6_32: + PYTHON_VERSION: "3.6.x" + PYTHON_ARCH: "x86" + NP_BUILD_DEP: "1.12.1" + DAILY_BUILD: "true" + py_3.6_64: + PYTHON_VERSION: "3.6.x" + NP_BUILD_DEP: "1.12.1" + DAILY_BUILD: "true" + py_3.7_32: + PYTHON_VERSION: "3.7.x" + PYTHON_ARCH: "x86" + NP_BUILD_DEP: "1.14.5" + DAILY_BUILD: "true" + py_3.7_64: + PYTHON_VERSION: "3.7.x" + NP_BUILD_DEP: "1.14.5" + DAILY_BUILD: "true" + py_3.8_32: + PYTHON_VERSION: "3.8.x" + PYTHON_ARCH: "x86" + NP_BUILD_DEP: "1.17.3" + DAILY_BUILD: "true" + py_3.8_64: + PYTHON_VERSION: "3.8.x" + NP_BUILD_DEP: "1.17.3" + DAILY_BUILD: "true" - template: azure/posix.yml parameters: @@ -54,6 +63,15 @@ jobs: MB_PYTHON_VERSION: "3.7" NP_BUILD_DEP: "numpy==1.14.5" DAILY_BUILD: "true" + py_3.8_32: + MB_PYTHON_VERSION: "3.8" + PLAT: "i686" + NP_BUILD_DEP: "numpy==1.17.3" + DAILY_BUILD: "true" + py_3.8_64: + MB_PYTHON_VERSION: "3.8" + NP_BUILD_DEP: "numpy==1.17.3" + DAILY_BUILD: "true" - template: azure/posix.yml parameters: @@ -71,3 +89,7 @@ jobs: MB_PYTHON_VERSION: "3.7" NP_BUILD_DEP: "numpy==1.14.5" DAILY_BUILD: "true" + py_3.8_64: + MB_PYTHON_VERSION: "3.8" + NP_BUILD_DEP: "numpy==1.17.3" + DAILY_BUILD: "true" diff --git a/azure/posix.yml b/azure/posix.yml index d20a45e7..5f49778d 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -82,7 +82,6 @@ jobs: displayName: Authenticate twine with artifact feed condition: ne(variables['Build.Reason'], 'PullRequest') - script: | - cat $(PYPIRC_PATH) twine upload -r sklearn-release --config-file $(PYPIRC_PATH) \ wheelhouse/* displayName: Upload to sklearn-release azure artifact feed diff --git a/azure/windows.yml b/azure/windows.yml index 821b50af..bf93ebd4 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -71,3 +71,16 @@ jobs: REM pip install -U --timeout=60 numpy REM pytest -rs --pyargs sklearn displayName: Build, install, and test + - script: pip install twine wheel keyring artifacts-keyring + displayName: Install twine and wheel + condition: ne(variables['Build.Reason'], 'PullRequest') + - task: TwineAuthenticate@1 + inputs: + artifactFeed: sklearn-wheels-testing/sklearn-release + displayName: Authenticate twine with artifact feed + condition: ne(variables['Build.Reason'], 'PullRequest') + - script: | + twine upload -r sklearn-release --config-file $(PYPIRC_PATH) \ + wheelhouse/* + displayName: Upload to sklearn-release azure artifact feed + condition: ne(variables['Build.Reason'], 'PullRequest') From 427442a745b92c000ee81b4556708db69b5cf835 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 19:29:13 -0500 Subject: [PATCH 118/194] BLD Build all the supported versions --- azure-pipelines.yml | 64 ++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9a710809..db125626 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,38 +4,38 @@ jobs: name: windows vmImage: vs2017-win2016 matrix: - py_3.5_32: - PYTHON_VERSION: "3.5.x" - PYTHON_ARCH: "x86" - py_3.5_64: - PYTHON_VERSION: "3.5.x" - py_3.6_32: - PYTHON_VERSION: "3.6.x" - PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.12.1" - DAILY_BUILD: "true" - py_3.6_64: - PYTHON_VERSION: "3.6.x" - NP_BUILD_DEP: "1.12.1" - DAILY_BUILD: "true" - py_3.7_32: - PYTHON_VERSION: "3.7.x" - PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.14.5" - DAILY_BUILD: "true" - py_3.7_64: - PYTHON_VERSION: "3.7.x" - NP_BUILD_DEP: "1.14.5" - DAILY_BUILD: "true" - py_3.8_32: - PYTHON_VERSION: "3.8.x" - PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.17.3" - DAILY_BUILD: "true" - py_3.8_64: - PYTHON_VERSION: "3.8.x" - NP_BUILD_DEP: "1.17.3" - DAILY_BUILD: "true" + py_3.5_32: + PYTHON_VERSION: "3.5.x" + PYTHON_ARCH: "x86" + py_3.5_64: + PYTHON_VERSION: "3.5.x" + py_3.6_32: + PYTHON_VERSION: "3.6.x" + PYTHON_ARCH: "x86" + NP_BUILD_DEP: "1.12.1" + DAILY_BUILD: "true" + py_3.6_64: + PYTHON_VERSION: "3.6.x" + NP_BUILD_DEP: "1.12.1" + DAILY_BUILD: "true" + py_3.7_32: + PYTHON_VERSION: "3.7.x" + PYTHON_ARCH: "x86" + NP_BUILD_DEP: "1.14.5" + DAILY_BUILD: "true" + py_3.7_64: + PYTHON_VERSION: "3.7.x" + NP_BUILD_DEP: "1.14.5" + DAILY_BUILD: "true" + py_3.8_32: + PYTHON_VERSION: "3.8.x" + PYTHON_ARCH: "x86" + NP_BUILD_DEP: "1.17.3" + DAILY_BUILD: "true" + py_3.8_64: + PYTHON_VERSION: "3.8.x" + NP_BUILD_DEP: "1.17.3" + DAILY_BUILD: "true" - template: azure/posix.yml parameters: From 8e6f95921eb930e0d9d070f30fabbe1c292e797c Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 19:42:57 -0500 Subject: [PATCH 119/194] BLD Only build windows --- azure-pipelines.yml | 112 ++++++++++++++++++++++---------------------- azure/windows.yml | 2 +- 2 files changed, 56 insertions(+), 58 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index db125626..542a7cdc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -36,60 +36,58 @@ jobs: PYTHON_VERSION: "3.8.x" NP_BUILD_DEP: "1.17.3" DAILY_BUILD: "true" - - - template: azure/posix.yml - parameters: - name: linux - vmImage: ubuntu-16.04 - matrix: - py_3.5_32: - MB_PYTHON_VERSION: "3.5" - PLAT: "i686" - py_3.5_64: - MB_PYTHON_VERSION: "3.5" - py_3.6_32: - MB_PYTHON_VERSION: "3.6" - PLAT: "i686" - DAILY_BUILD: "true" - py_3.6_64: - MB_PYTHON_VERSION: "3.6" - DAILY_BUILD: "true" - py_3.7_32: - MB_PYTHON_VERSION: "3.7" - PLAT: "i686" - NP_BUILD_DEP: "numpy==1.14.5" - DAILY_BUILD: "true" - py_3.7_64: - MB_PYTHON_VERSION: "3.7" - NP_BUILD_DEP: "numpy==1.14.5" - DAILY_BUILD: "true" - py_3.8_32: - MB_PYTHON_VERSION: "3.8" - PLAT: "i686" - NP_BUILD_DEP: "numpy==1.17.3" - DAILY_BUILD: "true" - py_3.8_64: - MB_PYTHON_VERSION: "3.8" - NP_BUILD_DEP: "numpy==1.17.3" - DAILY_BUILD: "true" - - - template: azure/posix.yml - parameters: - name: macOS - vmImage: xcode9-macos10.13 - matrix: - py_3.5_64: - MB_PYTHON_VERSION: "3.5" - SCIPY_BUILD_DEP: "scipy==0.17.1" - py_3.6_64: - MB_PYTHON_VERSION: "3.6" - NP_BUILD_DEP: "numpy==1.11.3" - DAILY_BUILD: "true" - py_3.7_64: - MB_PYTHON_VERSION: "3.7" - NP_BUILD_DEP: "numpy==1.14.5" - DAILY_BUILD: "true" - py_3.8_64: - MB_PYTHON_VERSION: "3.8" - NP_BUILD_DEP: "numpy==1.17.3" - DAILY_BUILD: "true" + # - template: azure/posix.yml + # parameters: + # name: linux + # vmImage: ubuntu-16.04 + # matrix: + # py_3.5_32: + # MB_PYTHON_VERSION: "3.5" + # PLAT: "i686" + # py_3.5_64: + # MB_PYTHON_VERSION: "3.5" + # py_3.6_32: + # MB_PYTHON_VERSION: "3.6" + # PLAT: "i686" + # DAILY_BUILD: "true" + # py_3.6_64: + # MB_PYTHON_VERSION: "3.6" + # DAILY_BUILD: "true" + # py_3.7_32: + # MB_PYTHON_VERSION: "3.7" + # PLAT: "i686" + # NP_BUILD_DEP: "numpy==1.14.5" + # DAILY_BUILD: "true" + # py_3.7_64: + # MB_PYTHON_VERSION: "3.7" + # NP_BUILD_DEP: "numpy==1.14.5" + # DAILY_BUILD: "true" + # py_3.8_32: + # MB_PYTHON_VERSION: "3.8" + # PLAT: "i686" + # NP_BUILD_DEP: "numpy==1.17.3" + # DAILY_BUILD: "true" + # py_3.8_64: + # MB_PYTHON_VERSION: "3.8" + # NP_BUILD_DEP: "numpy==1.17.3" + # DAILY_BUILD: "true" + # - template: azure/posix.yml + # parameters: + # name: macOS + # vmImage: xcode9-macos10.13 + # matrix: + # py_3.5_64: + # MB_PYTHON_VERSION: "3.5" + # SCIPY_BUILD_DEP: "scipy==0.17.1" + # py_3.6_64: + # MB_PYTHON_VERSION: "3.6" + # NP_BUILD_DEP: "numpy==1.11.3" + # DAILY_BUILD: "true" + # py_3.7_64: + # MB_PYTHON_VERSION: "3.7" + # NP_BUILD_DEP: "numpy==1.14.5" + # DAILY_BUILD: "true" + # py_3.8_64: + # MB_PYTHON_VERSION: "3.8" + # NP_BUILD_DEP: "numpy==1.17.3" + # DAILY_BUILD: "true" diff --git a/azure/windows.yml b/azure/windows.yml index bf93ebd4..dcb3663f 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -81,6 +81,6 @@ jobs: condition: ne(variables['Build.Reason'], 'PullRequest') - script: | twine upload -r sklearn-release --config-file $(PYPIRC_PATH) \ - wheelhouse/* + dist/* displayName: Upload to sklearn-release azure artifact feed condition: ne(variables['Build.Reason'], 'PullRequest') From 37e47e0ec4e43baadc6108e23853f144ab22d249 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 20:00:54 -0500 Subject: [PATCH 120/194] BLD Use bash --- azure/windows.yml | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index dcb3663f..d223cc76 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -48,38 +48,50 @@ jobs: git clean -fxd git reset --hard displayName: Checkout commit - - script: | - @echo on + - bash: | + set -e - if "%BUILD_REASON%" == "Schedule" ( - if NOT "%DAILY_BUILD%" == "true" ( + if [ "$BUILD_REASON" == "Schedule" ]; then + if [ "$DAILY_BUILD" != "true" ]; then exit 0 - ) - ) + fi + BUILD_COMMIT=$DAILY_COMMIT + fi + echo "Building scikit-learn-$BUILD_COMMIT" pip install --timeout=60 numpy==%NP_BUILD_DEP% pip install --timeout=60 pytest wheel joblib scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% + pip install twine wheel pushd scikit-learn + python setup.py build || exit 1 + python appveyor/vendor_vcomp140.py || exit 1 python setup.py bdist_wheel || exit 1 + ls dist + twine check dist/* pip install --pre --no-index --find-links dist/ scikit-learn popd mkdir tmp cd tmp - REM pip install -U --timeout=60 numpy - REM pytest -rs --pyargs sklearn + # Install the newest version of numpy for the tests: the goal is to ensure + # REM that the scikit-learn wheels are binary compatible both with the old numpy + version against which they were built and the newest numpy version at the + # time of the release, that is the version of numpy that users are most + # likely to use. + # pip install -U --timeout=60 numpy + # pytest -rs --pyargs sklearn displayName: Build, install, and test - - script: pip install twine wheel keyring artifacts-keyring - displayName: Install twine and wheel + - script: pip install keyring artifacts-keyring + displayName: Install keyring and artifacts-keyring condition: ne(variables['Build.Reason'], 'PullRequest') - task: TwineAuthenticate@1 inputs: artifactFeed: sklearn-wheels-testing/sklearn-release displayName: Authenticate twine with artifact feed condition: ne(variables['Build.Reason'], 'PullRequest') - - script: | + - bash: | twine upload -r sklearn-release --config-file $(PYPIRC_PATH) \ dist/* displayName: Upload to sklearn-release azure artifact feed From 08551e5e7feaa1574d9504bf34d57837911492f9 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 20:06:00 -0500 Subject: [PATCH 121/194] BLD Uses bash --- azure/windows.yml | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index d223cc76..1704337a 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -27,24 +27,25 @@ jobs: versionSpec: $(PYTHON_VERSION) architecture: $(PYTHON_ARCH) displayName: Set python version - - script: | - echo PYTHON %PYTHON_VERSION% %PYTHON_ARCH% - echo Build Reason %BUILD_REASON% + - bash: | + echo PYTHON $PYTHON_VERSION $PYTHON_ARCH + echo Build Reason $BUILD_REASON python --version python -c "import struct; print(struct.calcsize('P') * 8)" pip --version displayName: Check that we have the expected version and architecture for Python - - script: | - @echo on + - bash: | + set -e - if "%BUILD_REASON%" == "Schedule" ( - if NOT "%DAILY_BUILD%" == "true" ( + if [ "$BUILD_REASON" == "Schedule" ]; then + if [ "$DAILY_BUILD" != "true" ]; then exit 0 - ) - set BUILD_COMMIT=%DAILY_COMMIT% - ) + fi + BUILD_COMMIT=$DAILY_COMMIT + fi + cd scikit-learn - git checkout %BUILD_COMMIT% + git checkout $BUILD_COMMIT git clean -fxd git reset --hard displayName: Checkout commit @@ -59,14 +60,14 @@ jobs: fi echo "Building scikit-learn-$BUILD_COMMIT" - pip install --timeout=60 numpy==%NP_BUILD_DEP% - pip install --timeout=60 pytest wheel joblib scipy==%SCIPY_BUILD_DEP% Cython==%CYTHON_BUILD_DEP% + pip install --timeout=60 numpy==$NP_BUILD_DEP + pip install --timeout=60 pytest wheel joblib scipy==$SCIPY_BUILD_DEP Cython==$CYTHON_BUILD_DEP pip install twine wheel pushd scikit-learn - python setup.py build || exit 1 - python appveyor/vendor_vcomp140.py || exit 1 - python setup.py bdist_wheel || exit 1 + python setup.py build + python appveyor/vendor_vcomp140.py + python setup.py bdist_wheel ls dist twine check dist/* pip install --pre --no-index --find-links dist/ scikit-learn From 8be82241d8e6cfd4dae8ea755a2e4e95ad4812ad Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 20:11:22 -0500 Subject: [PATCH 122/194] DEBUG --- azure/windows.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 1704337a..f39075ee 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -35,7 +35,7 @@ jobs: pip --version displayName: Check that we have the expected version and architecture for Python - bash: | - set -e + set -xe if [ "$BUILD_REASON" == "Schedule" ]; then if [ "$DAILY_BUILD" != "true" ]; then @@ -50,7 +50,7 @@ jobs: git reset --hard displayName: Checkout commit - bash: | - set -e + set -xe if [ "$BUILD_REASON" == "Schedule" ]; then if [ "$DAILY_BUILD" != "true" ]; then @@ -62,7 +62,7 @@ jobs: pip install --timeout=60 numpy==$NP_BUILD_DEP pip install --timeout=60 pytest wheel joblib scipy==$SCIPY_BUILD_DEP Cython==$CYTHON_BUILD_DEP - pip install twine wheel + pip install twine pushd scikit-learn python setup.py build @@ -84,14 +84,18 @@ jobs: # pip install -U --timeout=60 numpy # pytest -rs --pyargs sklearn displayName: Build, install, and test - - script: pip install keyring artifacts-keyring - displayName: Install keyring and artifacts-keyring + - bash: | + set -xe + pip install twine wheel keyring artifacts-keyring + displayName: Install twine keyring and artifacts-keyring condition: ne(variables['Build.Reason'], 'PullRequest') + - task: TwineAuthenticate@1 inputs: artifactFeed: sklearn-wheels-testing/sklearn-release displayName: Authenticate twine with artifact feed condition: ne(variables['Build.Reason'], 'PullRequest') + - bash: | twine upload -r sklearn-release --config-file $(PYPIRC_PATH) \ dist/* From f4df20b9eff7dda61e7f99c3ef3dd76f6d3e63aa Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 20:16:30 -0500 Subject: [PATCH 123/194] DEBUG --- azure-pipelines.yml | 1 + azure/windows.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 542a7cdc..b536b25a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -35,6 +35,7 @@ jobs: py_3.8_64: PYTHON_VERSION: "3.8.x" NP_BUILD_DEP: "1.17.3" + SCIPY_BUILD_DEP: "1.2.3" DAILY_BUILD: "true" # - template: azure/posix.yml # parameters: diff --git a/azure/windows.yml b/azure/windows.yml index f39075ee..153ef4dc 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -66,7 +66,7 @@ jobs: pushd scikit-learn python setup.py build - python appveyor/vendor_vcomp140.py + python ../appveyor/vendor_vcomp140.py python setup.py bdist_wheel ls dist twine check dist/* From 0840a317d5331fc452483312ca634944095481e4 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 20:19:58 -0500 Subject: [PATCH 124/194] DEBUG --- azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b536b25a..ebf8c585 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -31,11 +31,12 @@ jobs: PYTHON_VERSION: "3.8.x" PYTHON_ARCH: "x86" NP_BUILD_DEP: "1.17.3" + SCIPY_BUILD_DEP: "1.4.1" DAILY_BUILD: "true" py_3.8_64: PYTHON_VERSION: "3.8.x" NP_BUILD_DEP: "1.17.3" - SCIPY_BUILD_DEP: "1.2.3" + SCIPY_BUILD_DEP: "1.4.1" DAILY_BUILD: "true" # - template: azure/posix.yml # parameters: From 345431e0585455fc8f35217fa1f3e15e4078968e Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 20:20:54 -0500 Subject: [PATCH 125/194] BUG Fix comments --- azure/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 153ef4dc..f1c6c31a 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -77,8 +77,8 @@ jobs: cd tmp # Install the newest version of numpy for the tests: the goal is to ensure - # REM that the scikit-learn wheels are binary compatible both with the old numpy - version against which they were built and the newest numpy version at the + # that the scikit-learn wheels are binary compatible both with the old numpy + # version against which they were built and the newest numpy version at the # time of the release, that is the version of numpy that users are most # likely to use. # pip install -U --timeout=60 numpy From 9f63a1a9233eafa3ee3f2ed3026448fe586e6ae4 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 20:29:27 -0500 Subject: [PATCH 126/194] BUG check artifacts --- azure/windows.yml | 63 ++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index f1c6c31a..6a18a8d8 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -49,41 +49,41 @@ jobs: git clean -fxd git reset --hard displayName: Checkout commit - - bash: | - set -xe + # - bash: | + # set -xe - if [ "$BUILD_REASON" == "Schedule" ]; then - if [ "$DAILY_BUILD" != "true" ]; then - exit 0 - fi - BUILD_COMMIT=$DAILY_COMMIT - fi - echo "Building scikit-learn-$BUILD_COMMIT" + # if [ "$BUILD_REASON" == "Schedule" ]; then + # if [ "$DAILY_BUILD" != "true" ]; then + # exit 0 + # fi + # BUILD_COMMIT=$DAILY_COMMIT + # fi + # echo "Building scikit-learn-$BUILD_COMMIT" - pip install --timeout=60 numpy==$NP_BUILD_DEP - pip install --timeout=60 pytest wheel joblib scipy==$SCIPY_BUILD_DEP Cython==$CYTHON_BUILD_DEP - pip install twine + # pip install --timeout=60 numpy==$NP_BUILD_DEP + # pip install --timeout=60 pytest wheel joblib scipy==$SCIPY_BUILD_DEP Cython==$CYTHON_BUILD_DEP + # pip install twine - pushd scikit-learn - python setup.py build - python ../appveyor/vendor_vcomp140.py - python setup.py bdist_wheel - ls dist - twine check dist/* - pip install --pre --no-index --find-links dist/ scikit-learn - popd + # pushd scikit-learn + # python setup.py build + # python ../appveyor/vendor_vcomp140.py + # python setup.py bdist_wheel + # ls dist + # twine check dist/* + # pip install --pre --no-index --find-links dist/ scikit-learn + # popd - mkdir tmp - cd tmp + # mkdir tmp + # cd tmp - # Install the newest version of numpy for the tests: the goal is to ensure - # that the scikit-learn wheels are binary compatible both with the old numpy - # version against which they were built and the newest numpy version at the - # time of the release, that is the version of numpy that users are most - # likely to use. - # pip install -U --timeout=60 numpy - # pytest -rs --pyargs sklearn - displayName: Build, install, and test + # # Install the newest version of numpy for the tests: the goal is to ensure + # # that the scikit-learn wheels are binary compatible both with the old numpy + # # version against which they were built and the newest numpy version at the + # # time of the release, that is the version of numpy that users are most + # # likely to use. + # # pip install -U --timeout=60 numpy + # # pytest -rs --pyargs sklearn + # displayName: Build, install, and test - bash: | set -xe pip install twine wheel keyring artifacts-keyring @@ -97,7 +97,8 @@ jobs: condition: ne(variables['Build.Reason'], 'PullRequest') - bash: | - twine upload -r sklearn-release --config-file $(PYPIRC_PATH) \ + cat $PYPIRC_PATH + twine upload -r sklearn-release --config-file $PYPIRC_PATH \ dist/* displayName: Upload to sklearn-release azure artifact feed condition: ne(variables['Build.Reason'], 'PullRequest') From 3e9bb814da274856a4c3328d372aa0703e3754e7 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 20:33:27 -0500 Subject: [PATCH 127/194] DEBUG --- azure-pipelines.yml | 58 +++++++++++++++++++++--------------------- azure/windows.yml | 62 +++++++++++++++++++++++---------------------- 2 files changed, 61 insertions(+), 59 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ebf8c585..a955fe91 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,35 +4,35 @@ jobs: name: windows vmImage: vs2017-win2016 matrix: - py_3.5_32: - PYTHON_VERSION: "3.5.x" - PYTHON_ARCH: "x86" - py_3.5_64: - PYTHON_VERSION: "3.5.x" - py_3.6_32: - PYTHON_VERSION: "3.6.x" - PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.12.1" - DAILY_BUILD: "true" - py_3.6_64: - PYTHON_VERSION: "3.6.x" - NP_BUILD_DEP: "1.12.1" - DAILY_BUILD: "true" - py_3.7_32: - PYTHON_VERSION: "3.7.x" - PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.14.5" - DAILY_BUILD: "true" - py_3.7_64: - PYTHON_VERSION: "3.7.x" - NP_BUILD_DEP: "1.14.5" - DAILY_BUILD: "true" - py_3.8_32: - PYTHON_VERSION: "3.8.x" - PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.17.3" - SCIPY_BUILD_DEP: "1.4.1" - DAILY_BUILD: "true" + # py_3.5_32: + # PYTHON_VERSION: "3.5.x" + # PYTHON_ARCH: "x86" + # py_3.5_64: + # PYTHON_VERSION: "3.5.x" + # py_3.6_32: + # PYTHON_VERSION: "3.6.x" + # PYTHON_ARCH: "x86" + # NP_BUILD_DEP: "1.12.1" + # DAILY_BUILD: "true" + # py_3.6_64: + # PYTHON_VERSION: "3.6.x" + # NP_BUILD_DEP: "1.12.1" + # DAILY_BUILD: "true" + # py_3.7_32: + # PYTHON_VERSION: "3.7.x" + # PYTHON_ARCH: "x86" + # NP_BUILD_DEP: "1.14.5" + # DAILY_BUILD: "true" + # py_3.7_64: + # PYTHON_VERSION: "3.7.x" + # NP_BUILD_DEP: "1.14.5" + # DAILY_BUILD: "true" + # py_3.8_32: + # PYTHON_VERSION: "3.8.x" + # PYTHON_ARCH: "x86" + # NP_BUILD_DEP: "1.17.3" + # SCIPY_BUILD_DEP: "1.4.1" + # DAILY_BUILD: "true" py_3.8_64: PYTHON_VERSION: "3.8.x" NP_BUILD_DEP: "1.17.3" diff --git a/azure/windows.yml b/azure/windows.yml index 6a18a8d8..9125f4e5 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -49,41 +49,41 @@ jobs: git clean -fxd git reset --hard displayName: Checkout commit - # - bash: | - # set -xe + - bash: | + set -xe - # if [ "$BUILD_REASON" == "Schedule" ]; then - # if [ "$DAILY_BUILD" != "true" ]; then - # exit 0 - # fi - # BUILD_COMMIT=$DAILY_COMMIT - # fi - # echo "Building scikit-learn-$BUILD_COMMIT" + if [ "$BUILD_REASON" == "Schedule" ]; then + if [ "$DAILY_BUILD" != "true" ]; then + exit 0 + fi + BUILD_COMMIT=$DAILY_COMMIT + fi + echo "Building scikit-learn-$BUILD_COMMIT" - # pip install --timeout=60 numpy==$NP_BUILD_DEP - # pip install --timeout=60 pytest wheel joblib scipy==$SCIPY_BUILD_DEP Cython==$CYTHON_BUILD_DEP - # pip install twine + pip install --timeout=60 numpy==$NP_BUILD_DEP + pip install --timeout=60 pytest wheel joblib scipy==$SCIPY_BUILD_DEP Cython==$CYTHON_BUILD_DEP + pip install twine - # pushd scikit-learn - # python setup.py build - # python ../appveyor/vendor_vcomp140.py - # python setup.py bdist_wheel - # ls dist - # twine check dist/* - # pip install --pre --no-index --find-links dist/ scikit-learn - # popd + pushd scikit-learn + python setup.py build + python ../appveyor/vendor_vcomp140.py + python setup.py bdist_wheel + ls dist + twine check dist/* + pip install --pre --no-index --find-links dist/ scikit-learn + popd - # mkdir tmp - # cd tmp + mkdir tmp + cd tmp - # # Install the newest version of numpy for the tests: the goal is to ensure - # # that the scikit-learn wheels are binary compatible both with the old numpy - # # version against which they were built and the newest numpy version at the - # # time of the release, that is the version of numpy that users are most - # # likely to use. - # # pip install -U --timeout=60 numpy - # # pytest -rs --pyargs sklearn - # displayName: Build, install, and test + # Install the newest version of numpy for the tests: the goal is to ensure + # that the scikit-learn wheels are binary compatible both with the old numpy + # version against which they were built and the newest numpy version at the + # time of the release, that is the version of numpy that users are most + # likely to use. + # pip install -U --timeout=60 numpy + # pytest -rs --pyargs sklearn + displayName: Build, install, and test - bash: | set -xe pip install twine wheel keyring artifacts-keyring @@ -98,6 +98,8 @@ jobs: - bash: | cat $PYPIRC_PATH + ls dist + twine upload -r sklearn-release --config-file $PYPIRC_PATH \ dist/* displayName: Upload to sklearn-release azure artifact feed From 9319b9abeaabd981ed04f4ae1c09d24f3cdbaad6 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 20:39:00 -0500 Subject: [PATCH 128/194] DEBUG build windows 3.8 --- azure/posix.yml | 3 +++ azure/windows.yml | 7 ++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 5f49778d..e84a7832 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -73,14 +73,17 @@ jobs: # install_run $PLAT displayName: Build, install, and test + - script: pip install twine wheel keyring artifacts-keyring displayName: Install twine and wheel condition: ne(variables['Build.Reason'], 'PullRequest') + - task: TwineAuthenticate@1 inputs: artifactFeed: sklearn-wheels-testing/sklearn-release displayName: Authenticate twine with artifact feed condition: ne(variables['Build.Reason'], 'PullRequest') + - script: | twine upload -r sklearn-release --config-file $(PYPIRC_PATH) \ wheelhouse/* diff --git a/azure/windows.yml b/azure/windows.yml index 9125f4e5..40fd6a2e 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -84,6 +84,7 @@ jobs: # pip install -U --timeout=60 numpy # pytest -rs --pyargs sklearn displayName: Build, install, and test + - bash: | set -xe pip install twine wheel keyring artifacts-keyring @@ -97,10 +98,6 @@ jobs: condition: ne(variables['Build.Reason'], 'PullRequest') - bash: | - cat $PYPIRC_PATH - ls dist - - twine upload -r sklearn-release --config-file $PYPIRC_PATH \ - dist/* + twine upload -r sklearn-release --config-file $PYPIRC_PATH scikit-learn/dist/* displayName: Upload to sklearn-release azure artifact feed condition: ne(variables['Build.Reason'], 'PullRequest') From d3d76c378a82a3e09137e7fbed4c578faca42586 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 20:44:25 -0500 Subject: [PATCH 129/194] BLD Builds all of windows --- azure-pipelines.yml | 58 ++++++++++++++++++++++----------------------- azure/posix.yml | 8 ++----- azure/windows.yml | 10 ++++---- 3 files changed, 36 insertions(+), 40 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a955fe91..ebf8c585 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,35 +4,35 @@ jobs: name: windows vmImage: vs2017-win2016 matrix: - # py_3.5_32: - # PYTHON_VERSION: "3.5.x" - # PYTHON_ARCH: "x86" - # py_3.5_64: - # PYTHON_VERSION: "3.5.x" - # py_3.6_32: - # PYTHON_VERSION: "3.6.x" - # PYTHON_ARCH: "x86" - # NP_BUILD_DEP: "1.12.1" - # DAILY_BUILD: "true" - # py_3.6_64: - # PYTHON_VERSION: "3.6.x" - # NP_BUILD_DEP: "1.12.1" - # DAILY_BUILD: "true" - # py_3.7_32: - # PYTHON_VERSION: "3.7.x" - # PYTHON_ARCH: "x86" - # NP_BUILD_DEP: "1.14.5" - # DAILY_BUILD: "true" - # py_3.7_64: - # PYTHON_VERSION: "3.7.x" - # NP_BUILD_DEP: "1.14.5" - # DAILY_BUILD: "true" - # py_3.8_32: - # PYTHON_VERSION: "3.8.x" - # PYTHON_ARCH: "x86" - # NP_BUILD_DEP: "1.17.3" - # SCIPY_BUILD_DEP: "1.4.1" - # DAILY_BUILD: "true" + py_3.5_32: + PYTHON_VERSION: "3.5.x" + PYTHON_ARCH: "x86" + py_3.5_64: + PYTHON_VERSION: "3.5.x" + py_3.6_32: + PYTHON_VERSION: "3.6.x" + PYTHON_ARCH: "x86" + NP_BUILD_DEP: "1.12.1" + DAILY_BUILD: "true" + py_3.6_64: + PYTHON_VERSION: "3.6.x" + NP_BUILD_DEP: "1.12.1" + DAILY_BUILD: "true" + py_3.7_32: + PYTHON_VERSION: "3.7.x" + PYTHON_ARCH: "x86" + NP_BUILD_DEP: "1.14.5" + DAILY_BUILD: "true" + py_3.7_64: + PYTHON_VERSION: "3.7.x" + NP_BUILD_DEP: "1.14.5" + DAILY_BUILD: "true" + py_3.8_32: + PYTHON_VERSION: "3.8.x" + PYTHON_ARCH: "x86" + NP_BUILD_DEP: "1.17.3" + SCIPY_BUILD_DEP: "1.4.1" + DAILY_BUILD: "true" py_3.8_64: PYTHON_VERSION: "3.8.x" NP_BUILD_DEP: "1.17.3" diff --git a/azure/posix.yml b/azure/posix.yml index e84a7832..c5fc0138 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -60,16 +60,12 @@ jobs: before_install # OpenMP is not present on osx by default - if [ $TRAVIS_OS_NAME == "osx" ]; then - enable_openmp - fi + if [ $TRAVIS_OS_NAME == "osx" ]; then enable_openmp fi clean_code $REPO_DIR $BUILD_COMMIT build_wheel $REPO_DIR $PLAT - if [ $TRAVIS_OS_NAME == "osx" ]; then - disable_system_openmp - fi + if [ $TRAVIS_OS_NAME == "osx" ]; then disable_system_openmp fi # install_run $PLAT displayName: Build, install, and test diff --git a/azure/windows.yml b/azure/windows.yml index 40fd6a2e..4945f712 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -87,17 +87,17 @@ jobs: - bash: | set -xe - pip install twine wheel keyring artifacts-keyring - displayName: Install twine keyring and artifacts-keyring - condition: ne(variables['Build.Reason'], 'PullRequest') + pip install wheel keyring artifacts-keyring + displayName: Install wheel keyring and artifacts-keyring + condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) - task: TwineAuthenticate@1 inputs: artifactFeed: sklearn-wheels-testing/sklearn-release displayName: Authenticate twine with artifact feed - condition: ne(variables['Build.Reason'], 'PullRequest') + condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) - bash: | twine upload -r sklearn-release --config-file $PYPIRC_PATH scikit-learn/dist/* displayName: Upload to sklearn-release azure artifact feed - condition: ne(variables['Build.Reason'], 'PullRequest') + condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) From f9bb937f7947b7a1f1310c74e7598c2f0511a40b Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 21:31:16 -0500 Subject: [PATCH 130/194] BLD --- azure/posix.yml | 10 +++++----- azure/windows.yml | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index c5fc0138..d59a36a5 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -72,16 +72,16 @@ jobs: - script: pip install twine wheel keyring artifacts-keyring displayName: Install twine and wheel - condition: ne(variables['Build.Reason'], 'PullRequest') + condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) - task: TwineAuthenticate@1 inputs: artifactFeed: sklearn-wheels-testing/sklearn-release displayName: Authenticate twine with artifact feed - condition: ne(variables['Build.Reason'], 'PullRequest') + condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) - script: | - twine upload -r sklearn-release --config-file $(PYPIRC_PATH) \ - wheelhouse/* + twine upload -r sklearn-release --config-file $PYPIRC_PATH \ + wheelhouse/* || exit 0 displayName: Upload to sklearn-release azure artifact feed - condition: ne(variables['Build.Reason'], 'PullRequest') + condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) diff --git a/azure/windows.yml b/azure/windows.yml index 4945f712..f77f90f4 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -86,7 +86,6 @@ jobs: displayName: Build, install, and test - bash: | - set -xe pip install wheel keyring artifacts-keyring displayName: Install wheel keyring and artifacts-keyring condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) @@ -98,6 +97,6 @@ jobs: condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) - bash: | - twine upload -r sklearn-release --config-file $PYPIRC_PATH scikit-learn/dist/* + twine upload -r sklearn-release --config-file $PYPIRC_PATH scikit-learn/dist/* || exit 0 displayName: Upload to sklearn-release azure artifact feed condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) From e01ceeb63113897486613a0ee7ad1b98f7f49136 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 21:42:29 -0500 Subject: [PATCH 131/194] REV --- azure-pipelines.yml | 110 ++++++++++++++++++++++---------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ebf8c585..28c3b48c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -38,58 +38,58 @@ jobs: NP_BUILD_DEP: "1.17.3" SCIPY_BUILD_DEP: "1.4.1" DAILY_BUILD: "true" - # - template: azure/posix.yml - # parameters: - # name: linux - # vmImage: ubuntu-16.04 - # matrix: - # py_3.5_32: - # MB_PYTHON_VERSION: "3.5" - # PLAT: "i686" - # py_3.5_64: - # MB_PYTHON_VERSION: "3.5" - # py_3.6_32: - # MB_PYTHON_VERSION: "3.6" - # PLAT: "i686" - # DAILY_BUILD: "true" - # py_3.6_64: - # MB_PYTHON_VERSION: "3.6" - # DAILY_BUILD: "true" - # py_3.7_32: - # MB_PYTHON_VERSION: "3.7" - # PLAT: "i686" - # NP_BUILD_DEP: "numpy==1.14.5" - # DAILY_BUILD: "true" - # py_3.7_64: - # MB_PYTHON_VERSION: "3.7" - # NP_BUILD_DEP: "numpy==1.14.5" - # DAILY_BUILD: "true" - # py_3.8_32: - # MB_PYTHON_VERSION: "3.8" - # PLAT: "i686" - # NP_BUILD_DEP: "numpy==1.17.3" - # DAILY_BUILD: "true" - # py_3.8_64: - # MB_PYTHON_VERSION: "3.8" - # NP_BUILD_DEP: "numpy==1.17.3" - # DAILY_BUILD: "true" - # - template: azure/posix.yml - # parameters: - # name: macOS - # vmImage: xcode9-macos10.13 - # matrix: - # py_3.5_64: - # MB_PYTHON_VERSION: "3.5" - # SCIPY_BUILD_DEP: "scipy==0.17.1" - # py_3.6_64: - # MB_PYTHON_VERSION: "3.6" - # NP_BUILD_DEP: "numpy==1.11.3" - # DAILY_BUILD: "true" - # py_3.7_64: - # MB_PYTHON_VERSION: "3.7" - # NP_BUILD_DEP: "numpy==1.14.5" - # DAILY_BUILD: "true" - # py_3.8_64: - # MB_PYTHON_VERSION: "3.8" - # NP_BUILD_DEP: "numpy==1.17.3" - # DAILY_BUILD: "true" + - template: azure/posix.yml + parameters: + name: linux + vmImage: ubuntu-16.04 + matrix: + py_3.5_32: + MB_PYTHON_VERSION: "3.5" + PLAT: "i686" + py_3.5_64: + MB_PYTHON_VERSION: "3.5" + py_3.6_32: + MB_PYTHON_VERSION: "3.6" + PLAT: "i686" + DAILY_BUILD: "true" + py_3.6_64: + MB_PYTHON_VERSION: "3.6" + DAILY_BUILD: "true" + py_3.7_32: + MB_PYTHON_VERSION: "3.7" + PLAT: "i686" + NP_BUILD_DEP: "numpy==1.14.5" + DAILY_BUILD: "true" + py_3.7_64: + MB_PYTHON_VERSION: "3.7" + NP_BUILD_DEP: "numpy==1.14.5" + DAILY_BUILD: "true" + py_3.8_32: + MB_PYTHON_VERSION: "3.8" + PLAT: "i686" + NP_BUILD_DEP: "numpy==1.17.3" + DAILY_BUILD: "true" + py_3.8_64: + MB_PYTHON_VERSION: "3.8" + NP_BUILD_DEP: "numpy==1.17.3" + DAILY_BUILD: "true" + - template: azure/posix.yml + parameters: + name: macOS + vmImage: xcode9-macos10.13 + matrix: + py_3.5_64: + MB_PYTHON_VERSION: "3.5" + SCIPY_BUILD_DEP: "scipy==0.17.1" + py_3.6_64: + MB_PYTHON_VERSION: "3.6" + NP_BUILD_DEP: "numpy==1.11.3" + DAILY_BUILD: "true" + py_3.7_64: + MB_PYTHON_VERSION: "3.7" + NP_BUILD_DEP: "numpy==1.14.5" + DAILY_BUILD: "true" + py_3.8_64: + MB_PYTHON_VERSION: "3.8" + NP_BUILD_DEP: "numpy==1.17.3" + DAILY_BUILD: "true" From c1e94fd111302ab4a1cdb4df552531c06cbec822 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 21:43:04 -0500 Subject: [PATCH 132/194] STY Whitespace --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 28c3b48c..758b47c7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -38,6 +38,7 @@ jobs: NP_BUILD_DEP: "1.17.3" SCIPY_BUILD_DEP: "1.4.1" DAILY_BUILD: "true" + - template: azure/posix.yml parameters: name: linux @@ -73,6 +74,7 @@ jobs: MB_PYTHON_VERSION: "3.8" NP_BUILD_DEP: "numpy==1.17.3" DAILY_BUILD: "true" + - template: azure/posix.yml parameters: name: macOS From c849f8e97c89d984fd21a573366e4b9ae7b0b305 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 22:01:25 -0500 Subject: [PATCH 133/194] sty update --- azure/posix.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index d59a36a5..b8c571c7 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -60,12 +60,16 @@ jobs: before_install # OpenMP is not present on osx by default - if [ $TRAVIS_OS_NAME == "osx" ]; then enable_openmp fi + if [ $TRAVIS_OS_NAME == "osx" ]; then + enable_openmp + fi clean_code $REPO_DIR $BUILD_COMMIT build_wheel $REPO_DIR $PLAT - if [ $TRAVIS_OS_NAME == "osx" ]; then disable_system_openmp fi + if [ $TRAVIS_OS_NAME == "osx" ]; then + disable_system_openmp + fi # install_run $PLAT displayName: Build, install, and test From b2d60c22604dc27aba22ca870139f166b5ec2210 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 8 Feb 2020 23:53:41 -0500 Subject: [PATCH 134/194] TST Enable tests --- azure-pipelines.yml | 152 ++++++++++++++++++++++---------------------- azure/posix.yml | 2 +- 2 files changed, 77 insertions(+), 77 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 758b47c7..ad2e30c7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,75 +1,75 @@ jobs: - - template: azure/windows.yml - parameters: - name: windows - vmImage: vs2017-win2016 - matrix: - py_3.5_32: - PYTHON_VERSION: "3.5.x" - PYTHON_ARCH: "x86" - py_3.5_64: - PYTHON_VERSION: "3.5.x" - py_3.6_32: - PYTHON_VERSION: "3.6.x" - PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.12.1" - DAILY_BUILD: "true" - py_3.6_64: - PYTHON_VERSION: "3.6.x" - NP_BUILD_DEP: "1.12.1" - DAILY_BUILD: "true" - py_3.7_32: - PYTHON_VERSION: "3.7.x" - PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.14.5" - DAILY_BUILD: "true" - py_3.7_64: - PYTHON_VERSION: "3.7.x" - NP_BUILD_DEP: "1.14.5" - DAILY_BUILD: "true" - py_3.8_32: - PYTHON_VERSION: "3.8.x" - PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.17.3" - SCIPY_BUILD_DEP: "1.4.1" - DAILY_BUILD: "true" - py_3.8_64: - PYTHON_VERSION: "3.8.x" - NP_BUILD_DEP: "1.17.3" - SCIPY_BUILD_DEP: "1.4.1" - DAILY_BUILD: "true" + # - template: azure/windows.yml + # parameters: + # name: windows + # vmImage: vs2017-win2016 + # matrix: + # py_3.5_32: + # PYTHON_VERSION: "3.5.x" + # PYTHON_ARCH: "x86" + # py_3.5_64: + # PYTHON_VERSION: "3.5.x" + # py_3.6_32: + # PYTHON_VERSION: "3.6.x" + # PYTHON_ARCH: "x86" + # NP_BUILD_DEP: "1.12.1" + # DAILY_BUILD: "true" + # py_3.6_64: + # PYTHON_VERSION: "3.6.x" + # NP_BUILD_DEP: "1.12.1" + # DAILY_BUILD: "true" + # py_3.7_32: + # PYTHON_VERSION: "3.7.x" + # PYTHON_ARCH: "x86" + # NP_BUILD_DEP: "1.14.5" + # DAILY_BUILD: "true" + # py_3.7_64: + # PYTHON_VERSION: "3.7.x" + # NP_BUILD_DEP: "1.14.5" + # DAILY_BUILD: "true" + # py_3.8_32: + # PYTHON_VERSION: "3.8.x" + # PYTHON_ARCH: "x86" + # NP_BUILD_DEP: "1.17.3" + # SCIPY_BUILD_DEP: "1.4.1" + # DAILY_BUILD: "true" + # py_3.8_64: + # PYTHON_VERSION: "3.8.x" + # NP_BUILD_DEP: "1.17.3" + # SCIPY_BUILD_DEP: "1.4.1" + # DAILY_BUILD: "true" - template: azure/posix.yml parameters: name: linux vmImage: ubuntu-16.04 matrix: - py_3.5_32: - MB_PYTHON_VERSION: "3.5" - PLAT: "i686" - py_3.5_64: - MB_PYTHON_VERSION: "3.5" - py_3.6_32: - MB_PYTHON_VERSION: "3.6" - PLAT: "i686" - DAILY_BUILD: "true" - py_3.6_64: - MB_PYTHON_VERSION: "3.6" - DAILY_BUILD: "true" - py_3.7_32: - MB_PYTHON_VERSION: "3.7" - PLAT: "i686" - NP_BUILD_DEP: "numpy==1.14.5" - DAILY_BUILD: "true" - py_3.7_64: - MB_PYTHON_VERSION: "3.7" - NP_BUILD_DEP: "numpy==1.14.5" - DAILY_BUILD: "true" - py_3.8_32: - MB_PYTHON_VERSION: "3.8" - PLAT: "i686" - NP_BUILD_DEP: "numpy==1.17.3" - DAILY_BUILD: "true" + # py_3.5_32: + # MB_PYTHON_VERSION: "3.5" + # PLAT: "i686" + # py_3.5_64: + # MB_PYTHON_VERSION: "3.5" + # py_3.6_32: + # MB_PYTHON_VERSION: "3.6" + # PLAT: "i686" + # DAILY_BUILD: "true" + # py_3.6_64: + # MB_PYTHON_VERSION: "3.6" + # DAILY_BUILD: "true" + # py_3.7_32: + # MB_PYTHON_VERSION: "3.7" + # PLAT: "i686" + # NP_BUILD_DEP: "numpy==1.14.5" + # DAILY_BUILD: "true" + # py_3.7_64: + # MB_PYTHON_VERSION: "3.7" + # NP_BUILD_DEP: "numpy==1.14.5" + # DAILY_BUILD: "true" + # py_3.8_32: + # MB_PYTHON_VERSION: "3.8" + # PLAT: "i686" + # NP_BUILD_DEP: "numpy==1.17.3" + # DAILY_BUILD: "true" py_3.8_64: MB_PYTHON_VERSION: "3.8" NP_BUILD_DEP: "numpy==1.17.3" @@ -80,17 +80,17 @@ jobs: name: macOS vmImage: xcode9-macos10.13 matrix: - py_3.5_64: - MB_PYTHON_VERSION: "3.5" - SCIPY_BUILD_DEP: "scipy==0.17.1" - py_3.6_64: - MB_PYTHON_VERSION: "3.6" - NP_BUILD_DEP: "numpy==1.11.3" - DAILY_BUILD: "true" - py_3.7_64: - MB_PYTHON_VERSION: "3.7" - NP_BUILD_DEP: "numpy==1.14.5" - DAILY_BUILD: "true" + # py_3.5_64: + # MB_PYTHON_VERSION: "3.5" + # SCIPY_BUILD_DEP: "scipy==0.17.1" + # py_3.6_64: + # MB_PYTHON_VERSION: "3.6" + # NP_BUILD_DEP: "numpy==1.11.3" + # DAILY_BUILD: "true" + # py_3.7_64: + # MB_PYTHON_VERSION: "3.7" + # NP_BUILD_DEP: "numpy==1.14.5" + # DAILY_BUILD: "true" py_3.8_64: MB_PYTHON_VERSION: "3.8" NP_BUILD_DEP: "numpy==1.17.3" diff --git a/azure/posix.yml b/azure/posix.yml index b8c571c7..9520f03b 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -71,7 +71,7 @@ jobs: disable_system_openmp fi - # install_run $PLAT + install_run $PLAT displayName: Build, install, and test - script: pip install twine wheel keyring artifacts-keyring From 3c72a5f199aba94b27f8c4935091e76312d6e216 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sun, 9 Feb 2020 01:03:35 -0500 Subject: [PATCH 135/194] TST Enable all tests --- azure-pipelines.yml | 152 ++++++++++++++++++++++---------------------- 1 file changed, 76 insertions(+), 76 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ad2e30c7..758b47c7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,75 +1,75 @@ jobs: - # - template: azure/windows.yml - # parameters: - # name: windows - # vmImage: vs2017-win2016 - # matrix: - # py_3.5_32: - # PYTHON_VERSION: "3.5.x" - # PYTHON_ARCH: "x86" - # py_3.5_64: - # PYTHON_VERSION: "3.5.x" - # py_3.6_32: - # PYTHON_VERSION: "3.6.x" - # PYTHON_ARCH: "x86" - # NP_BUILD_DEP: "1.12.1" - # DAILY_BUILD: "true" - # py_3.6_64: - # PYTHON_VERSION: "3.6.x" - # NP_BUILD_DEP: "1.12.1" - # DAILY_BUILD: "true" - # py_3.7_32: - # PYTHON_VERSION: "3.7.x" - # PYTHON_ARCH: "x86" - # NP_BUILD_DEP: "1.14.5" - # DAILY_BUILD: "true" - # py_3.7_64: - # PYTHON_VERSION: "3.7.x" - # NP_BUILD_DEP: "1.14.5" - # DAILY_BUILD: "true" - # py_3.8_32: - # PYTHON_VERSION: "3.8.x" - # PYTHON_ARCH: "x86" - # NP_BUILD_DEP: "1.17.3" - # SCIPY_BUILD_DEP: "1.4.1" - # DAILY_BUILD: "true" - # py_3.8_64: - # PYTHON_VERSION: "3.8.x" - # NP_BUILD_DEP: "1.17.3" - # SCIPY_BUILD_DEP: "1.4.1" - # DAILY_BUILD: "true" + - template: azure/windows.yml + parameters: + name: windows + vmImage: vs2017-win2016 + matrix: + py_3.5_32: + PYTHON_VERSION: "3.5.x" + PYTHON_ARCH: "x86" + py_3.5_64: + PYTHON_VERSION: "3.5.x" + py_3.6_32: + PYTHON_VERSION: "3.6.x" + PYTHON_ARCH: "x86" + NP_BUILD_DEP: "1.12.1" + DAILY_BUILD: "true" + py_3.6_64: + PYTHON_VERSION: "3.6.x" + NP_BUILD_DEP: "1.12.1" + DAILY_BUILD: "true" + py_3.7_32: + PYTHON_VERSION: "3.7.x" + PYTHON_ARCH: "x86" + NP_BUILD_DEP: "1.14.5" + DAILY_BUILD: "true" + py_3.7_64: + PYTHON_VERSION: "3.7.x" + NP_BUILD_DEP: "1.14.5" + DAILY_BUILD: "true" + py_3.8_32: + PYTHON_VERSION: "3.8.x" + PYTHON_ARCH: "x86" + NP_BUILD_DEP: "1.17.3" + SCIPY_BUILD_DEP: "1.4.1" + DAILY_BUILD: "true" + py_3.8_64: + PYTHON_VERSION: "3.8.x" + NP_BUILD_DEP: "1.17.3" + SCIPY_BUILD_DEP: "1.4.1" + DAILY_BUILD: "true" - template: azure/posix.yml parameters: name: linux vmImage: ubuntu-16.04 matrix: - # py_3.5_32: - # MB_PYTHON_VERSION: "3.5" - # PLAT: "i686" - # py_3.5_64: - # MB_PYTHON_VERSION: "3.5" - # py_3.6_32: - # MB_PYTHON_VERSION: "3.6" - # PLAT: "i686" - # DAILY_BUILD: "true" - # py_3.6_64: - # MB_PYTHON_VERSION: "3.6" - # DAILY_BUILD: "true" - # py_3.7_32: - # MB_PYTHON_VERSION: "3.7" - # PLAT: "i686" - # NP_BUILD_DEP: "numpy==1.14.5" - # DAILY_BUILD: "true" - # py_3.7_64: - # MB_PYTHON_VERSION: "3.7" - # NP_BUILD_DEP: "numpy==1.14.5" - # DAILY_BUILD: "true" - # py_3.8_32: - # MB_PYTHON_VERSION: "3.8" - # PLAT: "i686" - # NP_BUILD_DEP: "numpy==1.17.3" - # DAILY_BUILD: "true" + py_3.5_32: + MB_PYTHON_VERSION: "3.5" + PLAT: "i686" + py_3.5_64: + MB_PYTHON_VERSION: "3.5" + py_3.6_32: + MB_PYTHON_VERSION: "3.6" + PLAT: "i686" + DAILY_BUILD: "true" + py_3.6_64: + MB_PYTHON_VERSION: "3.6" + DAILY_BUILD: "true" + py_3.7_32: + MB_PYTHON_VERSION: "3.7" + PLAT: "i686" + NP_BUILD_DEP: "numpy==1.14.5" + DAILY_BUILD: "true" + py_3.7_64: + MB_PYTHON_VERSION: "3.7" + NP_BUILD_DEP: "numpy==1.14.5" + DAILY_BUILD: "true" + py_3.8_32: + MB_PYTHON_VERSION: "3.8" + PLAT: "i686" + NP_BUILD_DEP: "numpy==1.17.3" + DAILY_BUILD: "true" py_3.8_64: MB_PYTHON_VERSION: "3.8" NP_BUILD_DEP: "numpy==1.17.3" @@ -80,17 +80,17 @@ jobs: name: macOS vmImage: xcode9-macos10.13 matrix: - # py_3.5_64: - # MB_PYTHON_VERSION: "3.5" - # SCIPY_BUILD_DEP: "scipy==0.17.1" - # py_3.6_64: - # MB_PYTHON_VERSION: "3.6" - # NP_BUILD_DEP: "numpy==1.11.3" - # DAILY_BUILD: "true" - # py_3.7_64: - # MB_PYTHON_VERSION: "3.7" - # NP_BUILD_DEP: "numpy==1.14.5" - # DAILY_BUILD: "true" + py_3.5_64: + MB_PYTHON_VERSION: "3.5" + SCIPY_BUILD_DEP: "scipy==0.17.1" + py_3.6_64: + MB_PYTHON_VERSION: "3.6" + NP_BUILD_DEP: "numpy==1.11.3" + DAILY_BUILD: "true" + py_3.7_64: + MB_PYTHON_VERSION: "3.7" + NP_BUILD_DEP: "numpy==1.14.5" + DAILY_BUILD: "true" py_3.8_64: MB_PYTHON_VERSION: "3.8" NP_BUILD_DEP: "numpy==1.17.3" From 6baf3324d179a9d918e8ca5f1108065fd9cf69ea Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sun, 9 Feb 2020 01:03:48 -0500 Subject: [PATCH 136/194] TST Enable all tests --- azure/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index f77f90f4..4ffaea08 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -81,8 +81,8 @@ jobs: # version against which they were built and the newest numpy version at the # time of the release, that is the version of numpy that users are most # likely to use. - # pip install -U --timeout=60 numpy - # pytest -rs --pyargs sklearn + pip install -U --timeout=60 numpy + pytest -rs --pyargs sklearn displayName: Build, install, and test - bash: | From 969d40b30db802afd86edcee092aef61e390b49a Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sun, 9 Feb 2020 09:30:01 -0500 Subject: [PATCH 137/194] TST Only tests osx --- azure-pipelines.yml | 150 ++++++++++++++++++++++---------------------- 1 file changed, 75 insertions(+), 75 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 758b47c7..6001965b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,79 +1,79 @@ jobs: - - template: azure/windows.yml - parameters: - name: windows - vmImage: vs2017-win2016 - matrix: - py_3.5_32: - PYTHON_VERSION: "3.5.x" - PYTHON_ARCH: "x86" - py_3.5_64: - PYTHON_VERSION: "3.5.x" - py_3.6_32: - PYTHON_VERSION: "3.6.x" - PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.12.1" - DAILY_BUILD: "true" - py_3.6_64: - PYTHON_VERSION: "3.6.x" - NP_BUILD_DEP: "1.12.1" - DAILY_BUILD: "true" - py_3.7_32: - PYTHON_VERSION: "3.7.x" - PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.14.5" - DAILY_BUILD: "true" - py_3.7_64: - PYTHON_VERSION: "3.7.x" - NP_BUILD_DEP: "1.14.5" - DAILY_BUILD: "true" - py_3.8_32: - PYTHON_VERSION: "3.8.x" - PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.17.3" - SCIPY_BUILD_DEP: "1.4.1" - DAILY_BUILD: "true" - py_3.8_64: - PYTHON_VERSION: "3.8.x" - NP_BUILD_DEP: "1.17.3" - SCIPY_BUILD_DEP: "1.4.1" - DAILY_BUILD: "true" + # - template: azure/windows.yml + # parameters: + # name: windows + # vmImage: vs2017-win2016 + # matrix: + # py_3.5_32: + # PYTHON_VERSION: "3.5.x" + # PYTHON_ARCH: "x86" + # py_3.5_64: + # PYTHON_VERSION: "3.5.x" + # py_3.6_32: + # PYTHON_VERSION: "3.6.x" + # PYTHON_ARCH: "x86" + # NP_BUILD_DEP: "1.12.1" + # DAILY_BUILD: "true" + # py_3.6_64: + # PYTHON_VERSION: "3.6.x" + # NP_BUILD_DEP: "1.12.1" + # DAILY_BUILD: "true" + # py_3.7_32: + # PYTHON_VERSION: "3.7.x" + # PYTHON_ARCH: "x86" + # NP_BUILD_DEP: "1.14.5" + # DAILY_BUILD: "true" + # py_3.7_64: + # PYTHON_VERSION: "3.7.x" + # NP_BUILD_DEP: "1.14.5" + # DAILY_BUILD: "true" + # py_3.8_32: + # PYTHON_VERSION: "3.8.x" + # PYTHON_ARCH: "x86" + # NP_BUILD_DEP: "1.17.3" + # SCIPY_BUILD_DEP: "1.4.1" + # DAILY_BUILD: "true" + # py_3.8_64: + # PYTHON_VERSION: "3.8.x" + # NP_BUILD_DEP: "1.17.3" + # SCIPY_BUILD_DEP: "1.4.1" + # DAILY_BUILD: "true" - - template: azure/posix.yml - parameters: - name: linux - vmImage: ubuntu-16.04 - matrix: - py_3.5_32: - MB_PYTHON_VERSION: "3.5" - PLAT: "i686" - py_3.5_64: - MB_PYTHON_VERSION: "3.5" - py_3.6_32: - MB_PYTHON_VERSION: "3.6" - PLAT: "i686" - DAILY_BUILD: "true" - py_3.6_64: - MB_PYTHON_VERSION: "3.6" - DAILY_BUILD: "true" - py_3.7_32: - MB_PYTHON_VERSION: "3.7" - PLAT: "i686" - NP_BUILD_DEP: "numpy==1.14.5" - DAILY_BUILD: "true" - py_3.7_64: - MB_PYTHON_VERSION: "3.7" - NP_BUILD_DEP: "numpy==1.14.5" - DAILY_BUILD: "true" - py_3.8_32: - MB_PYTHON_VERSION: "3.8" - PLAT: "i686" - NP_BUILD_DEP: "numpy==1.17.3" - DAILY_BUILD: "true" - py_3.8_64: - MB_PYTHON_VERSION: "3.8" - NP_BUILD_DEP: "numpy==1.17.3" - DAILY_BUILD: "true" + # - template: azure/posix.yml + # parameters: + # name: linux + # vmImage: ubuntu-16.04 + # matrix: + # py_3.5_32: + # MB_PYTHON_VERSION: "3.5" + # PLAT: "i686" + # py_3.5_64: + # MB_PYTHON_VERSION: "3.5" + # py_3.6_32: + # MB_PYTHON_VERSION: "3.6" + # PLAT: "i686" + # DAILY_BUILD: "true" + # py_3.6_64: + # MB_PYTHON_VERSION: "3.6" + # DAILY_BUILD: "true" + # py_3.7_32: + # MB_PYTHON_VERSION: "3.7" + # PLAT: "i686" + # NP_BUILD_DEP: "numpy==1.14.5" + # DAILY_BUILD: "true" + # py_3.7_64: + # MB_PYTHON_VERSION: "3.7" + # NP_BUILD_DEP: "numpy==1.14.5" + # DAILY_BUILD: "true" + # py_3.8_32: + # MB_PYTHON_VERSION: "3.8" + # PLAT: "i686" + # NP_BUILD_DEP: "numpy==1.17.3" + # DAILY_BUILD: "true" + # py_3.8_64: + # MB_PYTHON_VERSION: "3.8" + # NP_BUILD_DEP: "numpy==1.17.3" + # DAILY_BUILD: "true" - template: azure/posix.yml parameters: @@ -85,7 +85,7 @@ jobs: SCIPY_BUILD_DEP: "scipy==0.17.1" py_3.6_64: MB_PYTHON_VERSION: "3.6" - NP_BUILD_DEP: "numpy==1.11.3" + NP_BUILD_DEP: "numpy==1.13.3" DAILY_BUILD: "true" py_3.7_64: MB_PYTHON_VERSION: "3.7" From 7a7aeb0908d962ef2d2de060546d1fcf54463724 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sun, 9 Feb 2020 18:32:18 -0500 Subject: [PATCH 138/194] MNT Makes PR mergable --- azure-pipelines.yml | 148 ++++++++++++++++++++++---------------------- azure/posix.yml | 1 + azure/windows.yml | 1 + 3 files changed, 76 insertions(+), 74 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6001965b..dcef5fb8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,79 +1,79 @@ jobs: - # - template: azure/windows.yml - # parameters: - # name: windows - # vmImage: vs2017-win2016 - # matrix: - # py_3.5_32: - # PYTHON_VERSION: "3.5.x" - # PYTHON_ARCH: "x86" - # py_3.5_64: - # PYTHON_VERSION: "3.5.x" - # py_3.6_32: - # PYTHON_VERSION: "3.6.x" - # PYTHON_ARCH: "x86" - # NP_BUILD_DEP: "1.12.1" - # DAILY_BUILD: "true" - # py_3.6_64: - # PYTHON_VERSION: "3.6.x" - # NP_BUILD_DEP: "1.12.1" - # DAILY_BUILD: "true" - # py_3.7_32: - # PYTHON_VERSION: "3.7.x" - # PYTHON_ARCH: "x86" - # NP_BUILD_DEP: "1.14.5" - # DAILY_BUILD: "true" - # py_3.7_64: - # PYTHON_VERSION: "3.7.x" - # NP_BUILD_DEP: "1.14.5" - # DAILY_BUILD: "true" - # py_3.8_32: - # PYTHON_VERSION: "3.8.x" - # PYTHON_ARCH: "x86" - # NP_BUILD_DEP: "1.17.3" - # SCIPY_BUILD_DEP: "1.4.1" - # DAILY_BUILD: "true" - # py_3.8_64: - # PYTHON_VERSION: "3.8.x" - # NP_BUILD_DEP: "1.17.3" - # SCIPY_BUILD_DEP: "1.4.1" - # DAILY_BUILD: "true" + - template: azure/windows.yml + parameters: + name: windows + vmImage: vs2017-win2016 + matrix: + py_3.5_32: + PYTHON_VERSION: "3.5.x" + PYTHON_ARCH: "x86" + py_3.5_64: + PYTHON_VERSION: "3.5.x" + py_3.6_32: + PYTHON_VERSION: "3.6.x" + PYTHON_ARCH: "x86" + NP_BUILD_DEP: "1.12.1" + DAILY_BUILD: "true" + py_3.6_64: + PYTHON_VERSION: "3.6.x" + NP_BUILD_DEP: "1.12.1" + DAILY_BUILD: "true" + py_3.7_32: + PYTHON_VERSION: "3.7.x" + PYTHON_ARCH: "x86" + NP_BUILD_DEP: "1.14.5" + DAILY_BUILD: "true" + py_3.7_64: + PYTHON_VERSION: "3.7.x" + NP_BUILD_DEP: "1.14.5" + DAILY_BUILD: "true" + py_3.8_32: + PYTHON_VERSION: "3.8.x" + PYTHON_ARCH: "x86" + NP_BUILD_DEP: "1.17.3" + SCIPY_BUILD_DEP: "1.4.1" + DAILY_BUILD: "true" + py_3.8_64: + PYTHON_VERSION: "3.8.x" + NP_BUILD_DEP: "1.17.3" + SCIPY_BUILD_DEP: "1.4.1" + DAILY_BUILD: "true" - # - template: azure/posix.yml - # parameters: - # name: linux - # vmImage: ubuntu-16.04 - # matrix: - # py_3.5_32: - # MB_PYTHON_VERSION: "3.5" - # PLAT: "i686" - # py_3.5_64: - # MB_PYTHON_VERSION: "3.5" - # py_3.6_32: - # MB_PYTHON_VERSION: "3.6" - # PLAT: "i686" - # DAILY_BUILD: "true" - # py_3.6_64: - # MB_PYTHON_VERSION: "3.6" - # DAILY_BUILD: "true" - # py_3.7_32: - # MB_PYTHON_VERSION: "3.7" - # PLAT: "i686" - # NP_BUILD_DEP: "numpy==1.14.5" - # DAILY_BUILD: "true" - # py_3.7_64: - # MB_PYTHON_VERSION: "3.7" - # NP_BUILD_DEP: "numpy==1.14.5" - # DAILY_BUILD: "true" - # py_3.8_32: - # MB_PYTHON_VERSION: "3.8" - # PLAT: "i686" - # NP_BUILD_DEP: "numpy==1.17.3" - # DAILY_BUILD: "true" - # py_3.8_64: - # MB_PYTHON_VERSION: "3.8" - # NP_BUILD_DEP: "numpy==1.17.3" - # DAILY_BUILD: "true" + - template: azure/posix.yml + parameters: + name: linux + vmImage: ubuntu-16.04 + matrix: + py_3.5_32: + MB_PYTHON_VERSION: "3.5" + PLAT: "i686" + py_3.5_64: + MB_PYTHON_VERSION: "3.5" + py_3.6_32: + MB_PYTHON_VERSION: "3.6" + PLAT: "i686" + DAILY_BUILD: "true" + py_3.6_64: + MB_PYTHON_VERSION: "3.6" + DAILY_BUILD: "true" + py_3.7_32: + MB_PYTHON_VERSION: "3.7" + PLAT: "i686" + NP_BUILD_DEP: "numpy==1.14.5" + DAILY_BUILD: "true" + py_3.7_64: + MB_PYTHON_VERSION: "3.7" + NP_BUILD_DEP: "numpy==1.14.5" + DAILY_BUILD: "true" + py_3.8_32: + MB_PYTHON_VERSION: "3.8" + PLAT: "i686" + NP_BUILD_DEP: "numpy==1.17.3" + DAILY_BUILD: "true" + py_3.8_64: + MB_PYTHON_VERSION: "3.8" + NP_BUILD_DEP: "numpy==1.17.3" + DAILY_BUILD: "true" - template: azure/posix.yml parameters: diff --git a/azure/posix.yml b/azure/posix.yml index 9520f03b..41884887 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -85,6 +85,7 @@ jobs: condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) - script: | + # If wheel was already uploaded then the twine command will error twine upload -r sklearn-release --config-file $PYPIRC_PATH \ wheelhouse/* || exit 0 displayName: Upload to sklearn-release azure artifact feed diff --git a/azure/windows.yml b/azure/windows.yml index 4ffaea08..632465ba 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -97,6 +97,7 @@ jobs: condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) - bash: | + # If wheel was already uploaded then the twine command will error twine upload -r sklearn-release --config-file $PYPIRC_PATH scikit-learn/dist/* || exit 0 displayName: Upload to sklearn-release azure artifact feed condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) From 592ea7bfef106a6eacb8c74a02d8714262103c0a Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 08:50:00 +0100 Subject: [PATCH 139/194] Typo in JOBLIB_BUILD_DEP --- azure/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/posix.yml b/azure/posix.yml index 41884887..74cd2e32 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -18,7 +18,7 @@ jobs: CYTHON_TEST_DEP: "cython" SCIPY_BUILD_DEP: "scipy" SCIPY_TEST_DEP: "scipy" - JOBLIB_BUILD_DEP: "joblb==0.11" + JOBLIB_BUILD_DEP: "joblib==0.11" JOBLIB_TEST_DEP: "joblib" DAILY_COMMIT: "master" DAILY_BUILD: "false" From 65d275bb479adafe85adbd5d94cdc92b91275dca Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 08:50:51 +0100 Subject: [PATCH 140/194] UNICODE_WIDTH is only useful for Python 2 --- azure/posix.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure/posix.yml b/azure/posix.yml index 74cd2e32..419c2d59 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -11,7 +11,6 @@ jobs: REPO_DIR: "scikit-learn" BUILD_COMMIT: "0.22.1" PLAT: "x86_64" - UNICODE_WIDTH: "32" NP_BUILD_DEP: "numpy==1.11.0" NP_TEST_DEP: "numpy" CYTHON_BUILD_DEP: "cython==0.29.14" From e828aedc39823d02a55b33903379c55fa79b6022 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 10:09:03 +0100 Subject: [PATCH 141/194] Isolate tests in empty venv and let pip install latest runtime deps --- azure/posix.yml | 8 +++----- config.sh | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 419c2d59..7f26c8ec 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -12,13 +12,9 @@ jobs: BUILD_COMMIT: "0.22.1" PLAT: "x86_64" NP_BUILD_DEP: "numpy==1.11.0" - NP_TEST_DEP: "numpy" CYTHON_BUILD_DEP: "cython==0.29.14" - CYTHON_TEST_DEP: "cython" SCIPY_BUILD_DEP: "scipy" - SCIPY_TEST_DEP: "scipy" JOBLIB_BUILD_DEP: "joblib==0.11" - JOBLIB_TEST_DEP: "joblib" DAILY_COMMIT: "master" DAILY_BUILD: "false" strategy: @@ -45,7 +41,7 @@ jobs: pip install virtualenv BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $SCIPY_BUILD_DEP" - TEST_DEPENDS="$NP_TEST_DEP pytest $CYTHON_TEST_DEP $SCIPY_TEST_DEP" + TEST_DEPENDS="pytest" if [ `uname` == 'Darwin' ]; then TRAVIS_OS_NAME='osx' @@ -70,7 +66,9 @@ jobs: disable_system_openmp fi + setup_test_venv install_run $PLAT + teardown_test_venv displayName: Build, install, and test - script: pip install twine wheel keyring artifacts-keyring diff --git a/config.sh b/config.sh index ef85678d..89b26c13 100644 --- a/config.sh +++ b/config.sh @@ -26,3 +26,23 @@ function run_tests { function disable_system_openmp { brew uninstall libomp } + +function setup_test_venv { + # Create a new empty venv dedicated to testing for non-Linux platforms. On + # Linux the tests are run in a Docker container. + if [ $(uname) != "Linux" ]; then + source deactivate + virtualenv --python=python test_venv + source test_venv/bin/activate + python --version # just to check + pip install --upgrade pip wheel + pip install $TEST_DEPENDS + fi +} + +function teardown_test_venv { + if [ $(uname) != "Linux" ]; then + source deactivate + source venv/bin/activate + fi +} From 45b9d29d0dd7e731e11063700fd4ae0c9ced4004 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 10:51:12 +0100 Subject: [PATCH 142/194] Use additional shell functions to be used directly in main posix.yml scripts --- azure/posix.yml | 11 +++-------- config.sh | 34 ---------------------------------- extra_functions.sh | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 42 deletions(-) create mode 100644 extra_functions.sh diff --git a/azure/posix.yml b/azure/posix.yml index 7f26c8ec..f91b9c53 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -52,19 +52,14 @@ jobs: source multibuild/common_utils.sh source multibuild/travis_steps.sh + source extra_functions.sh before_install # OpenMP is not present on osx by default - if [ $TRAVIS_OS_NAME == "osx" ]; then - enable_openmp - fi - + setup_compiler clean_code $REPO_DIR $BUILD_COMMIT build_wheel $REPO_DIR $PLAT - - if [ $TRAVIS_OS_NAME == "osx" ]; then - disable_system_openmp - fi + teardown_compiler setup_test_venv install_run $PLAT diff --git a/config.sh b/config.sh index 89b26c13..4522410b 100644 --- a/config.sh +++ b/config.sh @@ -12,37 +12,3 @@ function run_tests { python --version pytest -l --pyargs sklearn } - - function enable_openmp { - # Install OpenMP - brew install libomp - export CPPFLAGS="$CPPFLAGS -Xpreprocessor -fopenmp" - export CFLAGS="$CFLAGS -I/usr/local/opt/libomp/include" - export CXXFLAGS="$CXXFLAGS -I/usr/local/opt/libomp/include" - export LDFLAGS="$LDFLAGS -L/usr/local/opt/libomp/lib -lomp" - export DYLD_LIBRARY_PATH=/usr/local/opt/libomp/lib -} - -function disable_system_openmp { - brew uninstall libomp -} - -function setup_test_venv { - # Create a new empty venv dedicated to testing for non-Linux platforms. On - # Linux the tests are run in a Docker container. - if [ $(uname) != "Linux" ]; then - source deactivate - virtualenv --python=python test_venv - source test_venv/bin/activate - python --version # just to check - pip install --upgrade pip wheel - pip install $TEST_DEPENDS - fi -} - -function teardown_test_venv { - if [ $(uname) != "Linux" ]; then - source deactivate - source venv/bin/activate - fi -} diff --git a/extra_functions.sh b/extra_functions.sh new file mode 100644 index 00000000..77582d78 --- /dev/null +++ b/extra_functions.sh @@ -0,0 +1,38 @@ + + function setup_compiler { + # Install OpenMP support on macOS + if [ $(uname) == "Darwin" ]; then + brew install libomp + export CPPFLAGS="$CPPFLAGS -Xpreprocessor -fopenmp" + export CFLAGS="$CFLAGS -I/usr/local/opt/libomp/include" + export CXXFLAGS="$CXXFLAGS -I/usr/local/opt/libomp/include" + export LDFLAGS="$LDFLAGS -L/usr/local/opt/libomp/lib -lomp" + export DYLD_LIBRARY_PATH=/usr/local/opt/libomp/lib + fi +} + +function disable_system_openmp { + if [ $(uname) == "Darwin" ]; then + brew uninstall libomp + fi +} + +function setup_test_venv { + # Create a new empty venv dedicated to testing for non-Linux platforms. On + # Linux the tests are run in a Docker container. + if [ $(uname) != "Linux" ]; then + deactivate + virtualenv --python=python test_venv + source test_venv/bin/activate + python --version # just to check + pip install --upgrade pip wheel + pip install $TEST_DEPENDS + fi +} + +function teardown_test_venv { + if [ $(uname) != "Linux" ]; then + deactivate + source venv/bin/activate + fi +} From 1ff4d3bee58b379a712e8f997ae6da1bc16219fe Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 10:59:55 +0100 Subject: [PATCH 143/194] typo --- extra_functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra_functions.sh b/extra_functions.sh index 77582d78..41433451 100644 --- a/extra_functions.sh +++ b/extra_functions.sh @@ -11,7 +11,7 @@ fi } -function disable_system_openmp { +function teardown_compiler { if [ $(uname) == "Darwin" ]; then brew uninstall libomp fi From a3cf875918d6933d8bcaeb3646d24916c90c30db Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 11:09:35 +0100 Subject: [PATCH 144/194] Split main script in posix.yml --- azure/posix.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/azure/posix.yml b/azure/posix.yml index f91b9c53..73732375 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -54,17 +54,23 @@ jobs: source multibuild/travis_steps.sh source extra_functions.sh before_install + displayName: Install build environment + - script: | + set -e # OpenMP is not present on osx by default setup_compiler clean_code $REPO_DIR $BUILD_COMMIT build_wheel $REPO_DIR $PLAT teardown_compiler + displayName: Build wheel + - script: | + set -e setup_test_venv install_run $PLAT teardown_test_venv - displayName: Build, install, and test + displayName: Install wheel and test - script: pip install twine wheel keyring artifacts-keyring displayName: Install twine and wheel From f4537acf1630ddbb3040331a48bda664e9933810 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 11:09:59 +0100 Subject: [PATCH 145/194] Temporary disable older Python versions to iterate faster --- azure-pipelines.yml | 84 ++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index dcef5fb8..6d31ff91 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,29 +4,29 @@ jobs: name: windows vmImage: vs2017-win2016 matrix: - py_3.5_32: - PYTHON_VERSION: "3.5.x" - PYTHON_ARCH: "x86" - py_3.5_64: - PYTHON_VERSION: "3.5.x" - py_3.6_32: - PYTHON_VERSION: "3.6.x" - PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.12.1" - DAILY_BUILD: "true" - py_3.6_64: - PYTHON_VERSION: "3.6.x" - NP_BUILD_DEP: "1.12.1" - DAILY_BUILD: "true" - py_3.7_32: - PYTHON_VERSION: "3.7.x" - PYTHON_ARCH: "x86" - NP_BUILD_DEP: "1.14.5" - DAILY_BUILD: "true" - py_3.7_64: - PYTHON_VERSION: "3.7.x" - NP_BUILD_DEP: "1.14.5" - DAILY_BUILD: "true" + # py_3.5_32: + # PYTHON_VERSION: "3.5.x" + # PYTHON_ARCH: "x86" + # py_3.5_64: + # PYTHON_VERSION: "3.5.x" + # py_3.6_32: + # PYTHON_VERSION: "3.6.x" + # PYTHON_ARCH: "x86" + # NP_BUILD_DEP: "1.12.1" + # DAILY_BUILD: "true" + # py_3.6_64: + # PYTHON_VERSION: "3.6.x" + # NP_BUILD_DEP: "1.12.1" + # DAILY_BUILD: "true" + # py_3.7_32: + # PYTHON_VERSION: "3.7.x" + # PYTHON_ARCH: "x86" + # NP_BUILD_DEP: "1.14.5" + # DAILY_BUILD: "true" + # py_3.7_64: + # PYTHON_VERSION: "3.7.x" + # NP_BUILD_DEP: "1.14.5" + # DAILY_BUILD: "true" py_3.8_32: PYTHON_VERSION: "3.8.x" PYTHON_ARCH: "x86" @@ -44,18 +44,18 @@ jobs: name: linux vmImage: ubuntu-16.04 matrix: - py_3.5_32: - MB_PYTHON_VERSION: "3.5" - PLAT: "i686" - py_3.5_64: - MB_PYTHON_VERSION: "3.5" - py_3.6_32: - MB_PYTHON_VERSION: "3.6" - PLAT: "i686" - DAILY_BUILD: "true" - py_3.6_64: - MB_PYTHON_VERSION: "3.6" - DAILY_BUILD: "true" + # py_3.5_32: + # MB_PYTHON_VERSION: "3.5" + # PLAT: "i686" + # py_3.5_64: + # MB_PYTHON_VERSION: "3.5" + # py_3.6_32: + # MB_PYTHON_VERSION: "3.6" + # PLAT: "i686" + # DAILY_BUILD: "true" + # py_3.6_64: + # MB_PYTHON_VERSION: "3.6" + # DAILY_BUILD: "true" py_3.7_32: MB_PYTHON_VERSION: "3.7" PLAT: "i686" @@ -80,13 +80,13 @@ jobs: name: macOS vmImage: xcode9-macos10.13 matrix: - py_3.5_64: - MB_PYTHON_VERSION: "3.5" - SCIPY_BUILD_DEP: "scipy==0.17.1" - py_3.6_64: - MB_PYTHON_VERSION: "3.6" - NP_BUILD_DEP: "numpy==1.13.3" - DAILY_BUILD: "true" + # py_3.5_64: + # MB_PYTHON_VERSION: "3.5" + # SCIPY_BUILD_DEP: "scipy==0.17.1" + # py_3.6_64: + # MB_PYTHON_VERSION: "3.6" + # NP_BUILD_DEP: "numpy==1.13.3" + # DAILY_BUILD: "true" py_3.7_64: MB_PYTHON_VERSION: "3.7" NP_BUILD_DEP: "numpy==1.14.5" From bd1ddefa9b9fb82fbbba7b20e805cf774c9a8917 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 12:00:58 +0100 Subject: [PATCH 146/194] Fix variable definitions --- azure/posix.yml | 36 +++++++++++++++++++++--------------- azure/windows.yml | 17 ++++++----------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 73732375..1f964c3f 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -28,49 +28,55 @@ jobs: inputs: versionSpec: $(MB_PYTHON_VERSION) displayName: Set python version + - script: | set -e - if [ "$BUILD_REASON" == "Schedule" ]; then - if [ "$DAILY_BUILD" != "true" ]; then - exit 0 - fi BUILD_COMMIT=$DAILY_COMMIT fi echo "Building scikit-learn-$BUILD_COMMIT" + echo "##vso[task.setvariable variable=BUILD_COMMIT]$BUILD_COMMIT" - pip install virtualenv - BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $SCIPY_BUILD_DEP" - TEST_DEPENDS="pytest" - + # Platform variables used in multibuild scripts if [ `uname` == 'Darwin' ]; then - TRAVIS_OS_NAME='osx' - export MACOSX_DEPLOYMENT_TARGET=10.9 + echo "##vso[task.setvariable variable=TRAVIS_OS_NAME]osx" + echo "##vso[task.setvariable variable=MACOSX_DEPLOYMENT_TARGET]10.9" else - TRAVIS_OS_NAME='linux' + echo "##vso[task.setvariable variable=TRAVIS_OS_NAME]linux" fi + displayName: Define build env variables + + - script: | + set -e + pip install virtualenv + BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $SCIPY_BUILD_DEP" source multibuild/common_utils.sh source multibuild/travis_steps.sh source extra_functions.sh + + # Setup build dependencies before_install - displayName: Install build environment - - script: | - set -e - # OpenMP is not present on osx by default + # OpenMP is not present on macOS by default setup_compiler clean_code $REPO_DIR $BUILD_COMMIT build_wheel $REPO_DIR $PLAT teardown_compiler displayName: Build wheel + condition: ne(variables['Daily.Build'], 'false') - script: | set -e + TEST_DEPENDS="pytest" + 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 + condition: ne(variables['Daily.Build'], 'false') - script: pip install twine wheel keyring artifacts-keyring displayName: Install twine and wheel diff --git a/azure/windows.yml b/azure/windows.yml index 632465ba..f78e6457 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -38,28 +38,21 @@ jobs: set -xe if [ "$BUILD_REASON" == "Schedule" ]; then - if [ "$DAILY_BUILD" != "true" ]; then - exit 0 - fi BUILD_COMMIT=$DAILY_COMMIT fi + echo "Building scikit-learn-$BUILD_COMMIT" + echo "##vso[task.setvariable variable=BUILD_COMMIT]$BUILD_COMMIT" cd scikit-learn git checkout $BUILD_COMMIT git clean -fxd git reset --hard displayName: Checkout commit + condition: ne(variables['Daily.Build'], 'false') + - bash: | set -xe - if [ "$BUILD_REASON" == "Schedule" ]; then - if [ "$DAILY_BUILD" != "true" ]; then - exit 0 - fi - BUILD_COMMIT=$DAILY_COMMIT - fi - echo "Building scikit-learn-$BUILD_COMMIT" - pip install --timeout=60 numpy==$NP_BUILD_DEP pip install --timeout=60 pytest wheel joblib scipy==$SCIPY_BUILD_DEP Cython==$CYTHON_BUILD_DEP pip install twine @@ -73,6 +66,7 @@ jobs: pip install --pre --no-index --find-links dist/ scikit-learn popd + source extra_functions.sh mkdir tmp cd tmp @@ -84,6 +78,7 @@ jobs: pip install -U --timeout=60 numpy pytest -rs --pyargs sklearn displayName: Build, install, and test + condition: ne(variables['Daily.Build'], 'false') - bash: | pip install wheel keyring artifacts-keyring From 95f79dc4322e64cadfcd6a30985cfd5128c7e770 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 12:21:23 +0100 Subject: [PATCH 147/194] Make test_env functions more robust --- extra_functions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extra_functions.sh b/extra_functions.sh index 41433451..a7490bd9 100644 --- a/extra_functions.sh +++ b/extra_functions.sh @@ -21,7 +21,7 @@ function setup_test_venv { # Create a new empty venv dedicated to testing for non-Linux platforms. On # Linux the tests are run in a Docker container. if [ $(uname) != "Linux" ]; then - deactivate + deactivate || echo "" virtualenv --python=python test_venv source test_venv/bin/activate python --version # just to check @@ -32,7 +32,7 @@ function setup_test_venv { function teardown_test_venv { if [ $(uname) != "Linux" ]; then - deactivate + deactivate || echo "" source venv/bin/activate fi } From 1ffe768d1239e55086346d33b055498be8ebf511 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 12:53:35 +0100 Subject: [PATCH 148/194] Fix DAILY_BUILD condition --- azure/posix.yml | 4 ++-- azure/windows.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 1f964c3f..685dace2 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -64,7 +64,7 @@ jobs: build_wheel $REPO_DIR $PLAT teardown_compiler displayName: Build wheel - condition: ne(variables['Daily.Build'], 'false') + condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Daily.Build'], 'false')) - script: | set -e @@ -76,7 +76,7 @@ jobs: install_run $PLAT teardown_test_venv displayName: Install wheel and test - condition: ne(variables['Daily.Build'], 'false') + condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Daily.Build'], 'false')) - script: pip install twine wheel keyring artifacts-keyring displayName: Install twine and wheel diff --git a/azure/windows.yml b/azure/windows.yml index f78e6457..67dc00de 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -48,7 +48,7 @@ jobs: git clean -fxd git reset --hard displayName: Checkout commit - condition: ne(variables['Daily.Build'], 'false') + condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Daily.Build'], 'false')) - bash: | set -xe @@ -78,7 +78,7 @@ jobs: pip install -U --timeout=60 numpy pytest -rs --pyargs sklearn displayName: Build, install, and test - condition: ne(variables['Daily.Build'], 'false') + condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Daily.Build'], 'false')) - bash: | pip install wheel keyring artifacts-keyring From bc98776aeb79ce55c5a4fff2c5513eec42a8f5d6 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 12:59:30 +0100 Subject: [PATCH 149/194] Isolated test venv on windows + split test step --- azure/windows.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 67dc00de..9d862d0d 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -63,21 +63,21 @@ jobs: python setup.py bdist_wheel ls dist twine check dist/* - pip install --pre --no-index --find-links dist/ scikit-learn popd + displayName: Build wheel + condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Daily.Build'], 'false')) + - bash: | + set -xe source extra_functions.sh + setup_test_env + pip install --pre --no-index --find-links scikit-learn/dist/ scikit-learn mkdir tmp - cd tmp - - # Install the newest version of numpy for the tests: the goal is to ensure - # that the scikit-learn wheels are binary compatible both with the old numpy - # version against which they were built and the newest numpy version at the - # time of the release, that is the version of numpy that users are most - # likely to use. - pip install -U --timeout=60 numpy + pushd tmp pytest -rs --pyargs sklearn - displayName: Build, install, and test + popd + teardown_test_env + displayName: Install wheel and test condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Daily.Build'], 'false')) - bash: | From 9e9212da6a3e5fb3ce58bff9244ac034e0d77cbd Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 13:04:38 +0100 Subject: [PATCH 150/194] typo --- azure/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index 9d862d0d..a173b281 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -70,13 +70,13 @@ jobs: - bash: | set -xe source extra_functions.sh - setup_test_env + setup_test_venv pip install --pre --no-index --find-links scikit-learn/dist/ scikit-learn mkdir tmp pushd tmp pytest -rs --pyargs sklearn popd - teardown_test_env + teardown_test_venv displayName: Install wheel and test condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Daily.Build'], 'false')) From 8a8c6a32883e57fc57ea48ef70e9f1845931dd90 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 13:11:53 +0100 Subject: [PATCH 151/194] No need for virtualenv (Python 3 only) --- extra_functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra_functions.sh b/extra_functions.sh index a7490bd9..58b20fe0 100644 --- a/extra_functions.sh +++ b/extra_functions.sh @@ -22,7 +22,7 @@ function setup_test_venv { # Linux the tests are run in a Docker container. if [ $(uname) != "Linux" ]; then deactivate || echo "" - virtualenv --python=python test_venv + python -m venv test_venv source test_venv/bin/activate python --version # just to check pip install --upgrade pip wheel From 4aea61ee5b83618f0cad6d53110756ee2cabea2b Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 13:27:59 +0100 Subject: [PATCH 152/194] Windows venv activation --- extra_functions.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/extra_functions.sh b/extra_functions.sh index 58b20fe0..1ba77ce6 100644 --- a/extra_functions.sh +++ b/extra_functions.sh @@ -23,8 +23,11 @@ function setup_test_venv { if [ $(uname) != "Linux" ]; then deactivate || echo "" python -m venv test_venv - source test_venv/bin/activate - python --version # just to check + if [ $(uname) == "Windows" ]; then + source test_venv/Scripts/activate + else + source test_venv/bin/activate + fi pip install --upgrade pip wheel pip install $TEST_DEPENDS fi From 2173b1a7646ae8bda1cdc5c5e8ca1fbed12e6311 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 13:35:55 +0100 Subject: [PATCH 153/194] One more try --- extra_functions.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extra_functions.sh b/extra_functions.sh index 1ba77ce6..1b042a4e 100644 --- a/extra_functions.sh +++ b/extra_functions.sh @@ -23,10 +23,10 @@ function setup_test_venv { if [ $(uname) != "Linux" ]; then deactivate || echo "" python -m venv test_venv - if [ $(uname) == "Windows" ]; then - source test_venv/Scripts/activate - else + if [ $(uname) == "Darwin" ]; then source test_venv/bin/activate + else + source test_venv/Scripts/activate fi pip install --upgrade pip wheel pip install $TEST_DEPENDS From 98a1419f156e99dc011506de5d68356d1c46efa0 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 13:45:18 +0100 Subject: [PATCH 154/194] Upgrade pip --- extra_functions.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/extra_functions.sh b/extra_functions.sh index 1b042a4e..024c89db 100644 --- a/extra_functions.sh +++ b/extra_functions.sh @@ -28,7 +28,10 @@ function setup_test_venv { else source test_venv/Scripts/activate fi - pip install --upgrade pip wheel + # 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 -m pip install --upgrade pip wheel pip install $TEST_DEPENDS fi } From fc61831d429de656e45bf67cbfc34786a2581938 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 13:57:59 +0100 Subject: [PATCH 155/194] One more try --- extra_functions.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/extra_functions.sh b/extra_functions.sh index 024c89db..b666b184 100644 --- a/extra_functions.sh +++ b/extra_functions.sh @@ -32,7 +32,9 @@ function setup_test_venv { # pip itself on Windows. Otherwise one would get a permission error on # pip.exe. python -m pip install --upgrade pip wheel - pip install $TEST_DEPENDS + if [ "$TEST_DEPENDS" != "" ]; then + pip install $TEST_DEPENDS + fi fi } From df45d631f1d3745decfeb40c6ec7162a29a64e3f Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 14:17:58 +0100 Subject: [PATCH 156/194] Install scikit-learn via filename --- azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index a173b281..905993a9 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -71,7 +71,7 @@ jobs: set -xe source extra_functions.sh setup_test_venv - pip install --pre --no-index --find-links scikit-learn/dist/ scikit-learn + pip install scikit-learn/dist/scikit_learn-*.whl mkdir tmp pushd tmp pytest -rs --pyargs sklearn From 69f732367acc6c1c08309c8b5ee5fd3d78ccd847 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 14:32:05 +0100 Subject: [PATCH 157/194] Define TEST_DEPENDS on top --- azure/posix.yml | 2 +- azure/windows.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/azure/posix.yml b/azure/posix.yml index 685dace2..b89b2618 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -17,6 +17,7 @@ jobs: JOBLIB_BUILD_DEP: "joblib==0.11" DAILY_COMMIT: "master" DAILY_BUILD: "false" + TEST_DEPENDS: "pytest" strategy: matrix: ${{ insert }}: ${{ parameters.matrix }} @@ -68,7 +69,6 @@ jobs: - script: | set -e - TEST_DEPENDS="pytest" source multibuild/common_utils.sh source multibuild/travis_steps.sh source extra_functions.sh diff --git a/azure/windows.yml b/azure/windows.yml index 905993a9..8d662e92 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -16,6 +16,7 @@ jobs: DAILY_COMMIT: "master" DAILY_BUILD: "false" PYTHON_ARCH: "x64" + TEST_DEPENDS: "pytest" strategy: matrix: ${{ insert }}: ${{ parameters.matrix }} From 7b94f1d13af42873d52ee0467b2c52ae456e6a2a Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 14:37:27 +0100 Subject: [PATCH 158/194] Reduce daily builds to 2 Python versions --- azure-pipelines.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6d31ff91..cff9dbdd 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,11 +13,9 @@ jobs: # PYTHON_VERSION: "3.6.x" # PYTHON_ARCH: "x86" # NP_BUILD_DEP: "1.12.1" - # DAILY_BUILD: "true" # py_3.6_64: # PYTHON_VERSION: "3.6.x" # NP_BUILD_DEP: "1.12.1" - # DAILY_BUILD: "true" # py_3.7_32: # PYTHON_VERSION: "3.7.x" # PYTHON_ARCH: "x86" @@ -52,10 +50,8 @@ jobs: # py_3.6_32: # MB_PYTHON_VERSION: "3.6" # PLAT: "i686" - # DAILY_BUILD: "true" # py_3.6_64: # MB_PYTHON_VERSION: "3.6" - # DAILY_BUILD: "true" py_3.7_32: MB_PYTHON_VERSION: "3.7" PLAT: "i686" @@ -86,7 +82,6 @@ jobs: # py_3.6_64: # MB_PYTHON_VERSION: "3.6" # NP_BUILD_DEP: "numpy==1.13.3" - # DAILY_BUILD: "true" py_3.7_64: MB_PYTHON_VERSION: "3.7" NP_BUILD_DEP: "numpy==1.14.5" From 0f07d8ff8ade13a99bd9b7002ed5c68010a97546 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 15:26:21 +0100 Subject: [PATCH 159/194] Update README.rst --- README.rst | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/README.rst b/README.rst index cd04d69c..a35fa034 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,4 @@ -.. image:: https://travis-ci.org/MacPython/scikit-learn-wheels.svg?branch=master - :target: https://travis-ci.org/MacPython/scikit-learn-wheels -.. image:: https://ci.appveyor.com/api/projects/status/0vgnsltgf2ghhbr2/branch/master?svg=true - :target: https://ci.appveyor.com/project/sklearn-wheels/scikit-learn-wheels +TODO: add Azure Pipelines badge here ########################## Scikit-learn wheel builder @@ -9,15 +6,17 @@ Scikit-learn wheel builder Repository to build scikit-learn wheels. -Edit `appveyor.yml` and `.travis.yml` to change the `BUILD_COMMIT` environment -variable to set the name of the git tag to build, commit and push (to master). +Edit `azure/windows.yml` and `azure/posix.yml` to change the `BUILD_COMMIT` +environment variable to set the name of the git tag to build, commit and push +(to master). -Travis and appveyor should automatically build and test that version on -Windows, Linux and OSX for various versions of Python (both 32 bit and 64 bit). +Azure Pipelines should automatically build and test that version on Windows, +Linux and OSX for various versions of Python (both 32 bit and 64 bit). If the tests pass, the resulting wheels should show up on: - http://wheels.scipy.org + - https://test.pypi.org for release wheels staging; + - https://anaconda.org/scipy-wheels-nighly for nightly builds. The following tool can be useful to download all the wheels for a specific release: @@ -25,4 +24,4 @@ release: https://github.com/ogrisel/wheelhouse-uploader and then use `twine` to publish all the wheels along with the locally built -source tarball of the release all at once to PyPI. +source tarball of the release all at once to PyPI. From ec514ac23f50385cb1c317dccdb5c13a22dcbe10 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 15:30:40 +0100 Subject: [PATCH 160/194] Use explicit path to python executable when creating test env --- azure/posix.yml | 6 ++++++ azure/windows.yml | 5 +++++ extra_functions.sh | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/azure/posix.yml b/azure/posix.yml index b89b2618..b1c1b8c4 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -25,6 +25,7 @@ jobs: steps: - checkout: self submodules: true + - task: UsePythonVersion@0 inputs: versionSpec: $(MB_PYTHON_VERSION) @@ -45,6 +46,11 @@ jobs: 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 - script: | diff --git a/azure/windows.yml b/azure/windows.yml index 8d662e92..b1146d00 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -34,6 +34,11 @@ jobs: python --version python -c "import struct; print(struct.calcsize('P') * 8)" pip --version + + # 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: Check that we have the expected version and architecture for Python - bash: | set -xe diff --git a/extra_functions.sh b/extra_functions.sh index b666b184..f58fd62e 100644 --- a/extra_functions.sh +++ b/extra_functions.sh @@ -22,7 +22,7 @@ function setup_test_venv { # Linux the tests are run in a Docker container. if [ $(uname) != "Linux" ]; then deactivate || echo "" - python -m venv test_venv + $PYTHON_EXE -m venv test_venv if [ $(uname) == "Darwin" ]; then source test_venv/bin/activate else From 98c919f28e70a0ede1ca16f3c0199d22d6ade2fa Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 15:42:13 +0100 Subject: [PATCH 161/194] Clean up local echo in windows scripts --- azure/windows.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/azure/windows.yml b/azure/windows.yml index b1146d00..c2b85312 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -29,6 +29,8 @@ jobs: architecture: $(PYTHON_ARCH) displayName: Set python version - bash: | + set -e + echo PYTHON $PYTHON_VERSION $PYTHON_ARCH echo Build Reason $BUILD_REASON python --version @@ -41,7 +43,7 @@ jobs: echo "##vso[task.setvariable variable=PYTHON_EXE]$PYTHON_EXE" displayName: Check that we have the expected version and architecture for Python - bash: | - set -xe + set -e if [ "$BUILD_REASON" == "Schedule" ]; then BUILD_COMMIT=$DAILY_COMMIT @@ -57,7 +59,7 @@ jobs: condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Daily.Build'], 'false')) - bash: | - set -xe + set -e pip install --timeout=60 numpy==$NP_BUILD_DEP pip install --timeout=60 pytest wheel joblib scipy==$SCIPY_BUILD_DEP Cython==$CYTHON_BUILD_DEP @@ -74,7 +76,7 @@ jobs: condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Daily.Build'], 'false')) - bash: | - set -xe + set -e source extra_functions.sh setup_test_venv pip install scikit-learn/dist/scikit_learn-*.whl From 4de0e3e7defbb997e2f7dfaeac95667f642216fb Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 16:04:28 +0100 Subject: [PATCH 162/194] Windows specific venv config --- extra_functions.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/extra_functions.sh b/extra_functions.sh index f58fd62e..92d20fbf 100644 --- a/extra_functions.sh +++ b/extra_functions.sh @@ -41,6 +41,8 @@ function setup_test_venv { function teardown_test_venv { if [ $(uname) != "Linux" ]; then deactivate || echo "" - source venv/bin/activate + if [ $(uname) == "Darwin" ]; then + source venv/bin/activate + fi fi } From f6779b1d5128231e9dd0e14bc798078bffb7bee2 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 17:55:23 +0100 Subject: [PATCH 163/194] Try to upload to anaconda.org --- azure-pipelines.yml | 12 ++++++------ azure/posix.yml | 36 +++++++++++++++++++++++------------- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index cff9dbdd..0c11dc2c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -56,20 +56,20 @@ jobs: MB_PYTHON_VERSION: "3.7" PLAT: "i686" NP_BUILD_DEP: "numpy==1.14.5" - DAILY_BUILD: "true" + NIGHTLY_BUILD: "true" py_3.7_64: MB_PYTHON_VERSION: "3.7" NP_BUILD_DEP: "numpy==1.14.5" - DAILY_BUILD: "true" + NIGHTLY_BUILD: "true" py_3.8_32: MB_PYTHON_VERSION: "3.8" PLAT: "i686" NP_BUILD_DEP: "numpy==1.17.3" - DAILY_BUILD: "true" + NIGHTLY_BUILD: "true" py_3.8_64: MB_PYTHON_VERSION: "3.8" NP_BUILD_DEP: "numpy==1.17.3" - DAILY_BUILD: "true" + NIGHTLY_BUILD: "true" - template: azure/posix.yml parameters: @@ -85,8 +85,8 @@ jobs: py_3.7_64: MB_PYTHON_VERSION: "3.7" NP_BUILD_DEP: "numpy==1.14.5" - DAILY_BUILD: "true" + NIGHTLY_BUILD: "true" py_3.8_64: MB_PYTHON_VERSION: "3.8" NP_BUILD_DEP: "numpy==1.17.3" - DAILY_BUILD: "true" + NIGHTLY_BUILD: "true" diff --git a/azure/posix.yml b/azure/posix.yml index b1c1b8c4..9dfa6133 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -15,8 +15,8 @@ jobs: CYTHON_BUILD_DEP: "cython==0.29.14" SCIPY_BUILD_DEP: "scipy" JOBLIB_BUILD_DEP: "joblib==0.11" - DAILY_COMMIT: "master" - DAILY_BUILD: "false" + NIGHTLY_BUILD_COMMIT: "master" + NIGHTLY_BUILD: "false" TEST_DEPENDS: "pytest" strategy: matrix: @@ -33,11 +33,16 @@ jobs: - script: | set -e + + EFFECTIVE_NIGHTLY_BUILD=NIGHTLY_BUILD + if [ "$BUILD_REASON" == "Schedule" ]; then - BUILD_COMMIT=$DAILY_COMMIT + BUILD_COMMIT=$NIGHTLY_BUILD_COMMIT + EFFECTIVE_NIGHTLY_BUILD=$NIGHTLY_BUILD fi echo "Building scikit-learn-$BUILD_COMMIT" echo "##vso[task.setvariable variable=BUILD_COMMIT]$BUILD_COMMIT" + echo "##vso[task.setvariable variable=EFFECTIVE_NIGHTLY_BUILD]$EFFECTIVE_NIGHTLY_BUILD" # Platform variables used in multibuild scripts if [ `uname` == 'Darwin' ]; then @@ -84,19 +89,24 @@ jobs: displayName: Install wheel and test condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Daily.Build'], 'false')) - - script: pip install twine wheel keyring artifacts-keyring - displayName: Install twine and wheel + - script: echo "##vso[task.prependpath]$CONDA/bin" + displayName: Add conda to PATH condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) - - task: TwineAuthenticate@1 - inputs: - artifactFeed: sklearn-wheels-testing/sklearn-release - displayName: Authenticate twine with artifact feed + - script: sudo chown -R $USER $CONDA + displayName: Take ownership of conda installation + condition: eq(variables['uname'], 'Darwin') condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) - script: | - # If wheel was already uploaded then the twine command will error - twine upload -r sklearn-release --config-file $PYPIRC_PATH \ - wheelhouse/* || exit 0 - displayName: Upload to sklearn-release azure artifact feed + conda install -y anaconda-client + if [ "$EFFECTIVE_NIGHTLY_BUILD" == "true" ]; then + ANACONDA_ORG="scipy-wheels-nightly" + TOKEN="$SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN" + else + ANACONDA_ORG="scikit-learn-wheels-staging" + TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN" + fi + anaconda -t $TOKEN upload --user $ANACONDA_ORG wheelhouse/*.whl + displayName: Upload to anaconda.org condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) From 8204138bceec509196338eb6b0172f3834829fc6 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 18:20:49 +0100 Subject: [PATCH 164/194] Fix invalid yaml --- azure/posix.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 9dfa6133..519d440b 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -95,8 +95,7 @@ jobs: - script: sudo chown -R $USER $CONDA displayName: Take ownership of conda installation - condition: eq(variables['uname'], 'Darwin') - condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) + condition: and(eq(variables['uname'], 'Darwin'), succeeded(), ne(variables['Build.Reason'], 'PullRequest')) - script: | conda install -y anaconda-client From d4abad69269443874f783899a2ef17ed6d52cb00 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 18:47:56 +0100 Subject: [PATCH 165/194] More trial and error for anaconda upload --- azure/posix.yml | 9 ++++++--- azure/windows.yml | 31 +++++++++++++++++-------------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 519d440b..6b5711c9 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -84,7 +84,7 @@ jobs: source multibuild/travis_steps.sh source extra_functions.sh setup_test_venv - install_run $PLAT + # install_run $PLAT teardown_test_venv displayName: Install wheel and test condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Daily.Build'], 'false')) @@ -95,9 +95,10 @@ jobs: - script: sudo chown -R $USER $CONDA displayName: Take ownership of conda installation - condition: and(eq(variables['uname'], 'Darwin'), succeeded(), ne(variables['Build.Reason'], 'PullRequest')) + condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) - script: | + set -xe conda install -y anaconda-client if [ "$EFFECTIVE_NIGHTLY_BUILD" == "true" ]; then ANACONDA_ORG="scipy-wheels-nightly" @@ -106,6 +107,8 @@ jobs: ANACONDA_ORG="scikit-learn-wheels-staging" TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN" fi - anaconda -t $TOKEN upload --user $ANACONDA_ORG wheelhouse/*.whl + anaconda -t $TOKEN upload -u $ANACONDA_ORG wheelhouse/*.whl + echo "Uploaded to https://anaconda.org/$ANACONDA_ORG/scikit-learn" + echo "PyPI-style index: https://pypi.anaconda.org/$ANACONDA_ORG/simple" displayName: Upload to anaconda.org condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) diff --git a/azure/windows.yml b/azure/windows.yml index c2b85312..e83b9fc1 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -82,25 +82,28 @@ jobs: pip install scikit-learn/dist/scikit_learn-*.whl mkdir tmp pushd tmp - pytest -rs --pyargs sklearn + # pytest -rs --pyargs sklearn popd teardown_test_venv displayName: Install wheel and test condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Daily.Build'], 'false')) - - bash: | - pip install wheel keyring artifacts-keyring - displayName: Install wheel keyring and artifacts-keyring - condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) - - - task: TwineAuthenticate@1 - inputs: - artifactFeed: sklearn-wheels-testing/sklearn-release - displayName: Authenticate twine with artifact feed + - script: echo "##vso[task.prependpath]$CONDA/Scripts" + displayName: Add conda to PATH condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) - - bash: | - # If wheel was already uploaded then the twine command will error - twine upload -r sklearn-release --config-file $PYPIRC_PATH scikit-learn/dist/* || exit 0 - displayName: Upload to sklearn-release azure artifact feed + - script: | + set -xe + conda install -y anaconda-client + if [ "$EFFECTIVE_NIGHTLY_BUILD" == "true" ]; then + ANACONDA_ORG="scipy-wheels-nightly" + TOKEN="$SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN" + else + ANACONDA_ORG="scikit-learn-wheels-staging" + TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN" + fi + anaconda -t $TOKEN upload -u $ANACONDA_ORG scikit-learn/dist/scikit_learn-*.whl + echo "Uploaded to https://anaconda.org/$ANACONDA_ORG/scikit-learn" + echo "PyPI-style index: https://pypi.anaconda.org/$ANACONDA_ORG/simple" + displayName: Upload to anaconda.org condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) From 1fbe614e42db98d9ca4acb307277e48634fa54ef Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 19:01:02 +0100 Subject: [PATCH 166/194] Fix nightly build vars --- azure-pipelines.yml | 8 ++++---- azure/posix.yml | 10 +++------- azure/windows.yml | 14 +++++++------- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0c11dc2c..3e50dce3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,22 +20,22 @@ jobs: # PYTHON_VERSION: "3.7.x" # PYTHON_ARCH: "x86" # NP_BUILD_DEP: "1.14.5" - # DAILY_BUILD: "true" + # NIGHTLY_BUILD: "true" # py_3.7_64: # PYTHON_VERSION: "3.7.x" # NP_BUILD_DEP: "1.14.5" - # DAILY_BUILD: "true" + # NIGHTLY_BUILD: "true" py_3.8_32: PYTHON_VERSION: "3.8.x" PYTHON_ARCH: "x86" NP_BUILD_DEP: "1.17.3" SCIPY_BUILD_DEP: "1.4.1" - DAILY_BUILD: "true" + NIGHTLY_BUILD: "true" py_3.8_64: PYTHON_VERSION: "3.8.x" NP_BUILD_DEP: "1.17.3" SCIPY_BUILD_DEP: "1.4.1" - DAILY_BUILD: "true" + NIGHTLY_BUILD: "true" - template: azure/posix.yml parameters: diff --git a/azure/posix.yml b/azure/posix.yml index 6b5711c9..713e4d00 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -34,15 +34,11 @@ jobs: - script: | set -e - EFFECTIVE_NIGHTLY_BUILD=NIGHTLY_BUILD - if [ "$BUILD_REASON" == "Schedule" ]; then BUILD_COMMIT=$NIGHTLY_BUILD_COMMIT - EFFECTIVE_NIGHTLY_BUILD=$NIGHTLY_BUILD fi echo "Building scikit-learn-$BUILD_COMMIT" echo "##vso[task.setvariable variable=BUILD_COMMIT]$BUILD_COMMIT" - echo "##vso[task.setvariable variable=EFFECTIVE_NIGHTLY_BUILD]$EFFECTIVE_NIGHTLY_BUILD" # Platform variables used in multibuild scripts if [ `uname` == 'Darwin' ]; then @@ -76,7 +72,7 @@ jobs: build_wheel $REPO_DIR $PLAT teardown_compiler displayName: Build wheel - condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Daily.Build'], 'false')) + condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Nightly.Build'], 'false')) - script: | set -e @@ -87,7 +83,7 @@ jobs: # install_run $PLAT teardown_test_venv displayName: Install wheel and test - condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Daily.Build'], 'false')) + condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Nightly.Build'], 'false')) - script: echo "##vso[task.prependpath]$CONDA/bin" displayName: Add conda to PATH @@ -100,7 +96,7 @@ jobs: - script: | set -xe conda install -y anaconda-client - if [ "$EFFECTIVE_NIGHTLY_BUILD" == "true" ]; then + if [ "$BUILD_REASON" == "Schedule" ]; then ANACONDA_ORG="scipy-wheels-nightly" TOKEN="$SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN" else diff --git a/azure/windows.yml b/azure/windows.yml index e83b9fc1..9fd5dc29 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -13,8 +13,8 @@ jobs: NP_BUILD_DEP: "1.11.0" CYTHON_BUILD_DEP: "0.29.14" SCIPY_BUILD_DEP: "1.1.0" - DAILY_COMMIT: "master" - DAILY_BUILD: "false" + NIGHTLY_BUILD_COMMIT: "master" + NIGHTLY_BUILD: "false" PYTHON_ARCH: "x64" TEST_DEPENDS: "pytest" strategy: @@ -46,7 +46,7 @@ jobs: set -e if [ "$BUILD_REASON" == "Schedule" ]; then - BUILD_COMMIT=$DAILY_COMMIT + BUILD_COMMIT=$NIGHTLY_BUILD_COMMIT fi echo "Building scikit-learn-$BUILD_COMMIT" echo "##vso[task.setvariable variable=BUILD_COMMIT]$BUILD_COMMIT" @@ -56,7 +56,7 @@ jobs: git clean -fxd git reset --hard displayName: Checkout commit - condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Daily.Build'], 'false')) + condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Nightly.Build'], 'false')) - bash: | set -e @@ -73,7 +73,7 @@ jobs: twine check dist/* popd displayName: Build wheel - condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Daily.Build'], 'false')) + condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Nightly.Build'], 'false')) - bash: | set -e @@ -86,7 +86,7 @@ jobs: popd teardown_test_venv displayName: Install wheel and test - condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Daily.Build'], 'false')) + condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Nightly.Build'], 'false')) - script: echo "##vso[task.prependpath]$CONDA/Scripts" displayName: Add conda to PATH @@ -95,7 +95,7 @@ jobs: - script: | set -xe conda install -y anaconda-client - if [ "$EFFECTIVE_NIGHTLY_BUILD" == "true" ]; then + if [ "$BUILD_REASON" == "Schedule" ]; then ANACONDA_ORG="scipy-wheels-nightly" TOKEN="$SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN" else From 54e6ec252091e84772195ecb8a75a66fcc712cde Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 19:21:43 +0100 Subject: [PATCH 167/194] Better error message in case of missing token --- azure/posix.yml | 4 ++++ azure/windows.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/azure/posix.yml b/azure/posix.yml index 713e4d00..5911ca49 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -103,6 +103,10 @@ jobs: ANACONDA_ORG="scikit-learn-wheels-staging" TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN" fi + if [ "$TOKEN" == "" ]; then + echo "Undefined anaconda secret upload token for $ANACONDA_ORG" + exit 1 + fi anaconda -t $TOKEN upload -u $ANACONDA_ORG wheelhouse/*.whl echo "Uploaded to https://anaconda.org/$ANACONDA_ORG/scikit-learn" echo "PyPI-style index: https://pypi.anaconda.org/$ANACONDA_ORG/simple" diff --git a/azure/windows.yml b/azure/windows.yml index 9fd5dc29..ab9855de 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -102,6 +102,10 @@ jobs: ANACONDA_ORG="scikit-learn-wheels-staging" TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN" fi + if [ "$TOKEN" == "" ]; then + echo "Undefined anaconda secret upload token for $ANACONDA_ORG" + exit 1 + fi anaconda -t $TOKEN upload -u $ANACONDA_ORG scikit-learn/dist/scikit_learn-*.whl echo "Uploaded to https://anaconda.org/$ANACONDA_ORG/scikit-learn" echo "PyPI-style index: https://pypi.anaconda.org/$ANACONDA_ORG/simple" From 3308d58e6cbca1b72bdeee1fb677c76ea1071e5b Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 20:59:08 +0100 Subject: [PATCH 168/194] Map secret variables to env variables --- azure/posix.yml | 4 ++++ azure/windows.yml | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 5911ca49..54ef7b40 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -110,5 +110,9 @@ jobs: anaconda -t $TOKEN upload -u $ANACONDA_ORG wheelhouse/*.whl echo "Uploaded to https://anaconda.org/$ANACONDA_ORG/scikit-learn" echo "PyPI-style index: https://pypi.anaconda.org/$ANACONDA_ORG/simple" + env: + # Secret variables need to mapped to env variables explicitly: + SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN: $(SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN) + SCIKIT_LEARN_STAGING_UPLOAD_TOKEN: $(SCIKIT_LEARN_STAGING_UPLOAD_TOKEN) displayName: Upload to anaconda.org condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) diff --git a/azure/windows.yml b/azure/windows.yml index ab9855de..18f57f72 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -23,11 +23,13 @@ jobs: steps: - checkout: self submodules: true + - task: UsePythonVersion@0 inputs: versionSpec: $(PYTHON_VERSION) architecture: $(PYTHON_ARCH) displayName: Set python version + - bash: | set -e @@ -42,6 +44,7 @@ jobs: PYTHON_EXE=`which python` echo "##vso[task.setvariable variable=PYTHON_EXE]$PYTHON_EXE" displayName: Check that we have the expected version and architecture for Python + - bash: | set -e @@ -109,5 +112,9 @@ jobs: anaconda -t $TOKEN upload -u $ANACONDA_ORG scikit-learn/dist/scikit_learn-*.whl echo "Uploaded to https://anaconda.org/$ANACONDA_ORG/scikit-learn" echo "PyPI-style index: https://pypi.anaconda.org/$ANACONDA_ORG/simple" - displayName: Upload to anaconda.org - condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) + env: + # Secret variables need to mapped to env variables explicitly: + SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN: $(SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN) + SCIKIT_LEARN_STAGING_UPLOAD_TOKEN: $(SCIKIT_LEARN_STAGING_UPLOAD_TOKEN) + displayName: Upload to anaconda.org + condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) From 7f4eaaa35ad4f756b8cb34f2b2a879739edb8fb4 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 21:19:27 +0100 Subject: [PATCH 169/194] debug windows env --- azure/posix.yml | 5 ++--- azure/windows.yml | 9 ++++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 54ef7b40..81d95ee8 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -37,7 +37,7 @@ jobs: if [ "$BUILD_REASON" == "Schedule" ]; then BUILD_COMMIT=$NIGHTLY_BUILD_COMMIT fi - echo "Building scikit-learn-$BUILD_COMMIT" + echo "Building scikit-learn@$BUILD_COMMIT" echo "##vso[task.setvariable variable=BUILD_COMMIT]$BUILD_COMMIT" # Platform variables used in multibuild scripts @@ -104,11 +104,10 @@ jobs: TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN" fi if [ "$TOKEN" == "" ]; then - echo "Undefined anaconda secret upload token for $ANACONDA_ORG" + echo "Undefined secret token for organization: $ANACONDA_ORG" exit 1 fi anaconda -t $TOKEN upload -u $ANACONDA_ORG wheelhouse/*.whl - echo "Uploaded to https://anaconda.org/$ANACONDA_ORG/scikit-learn" echo "PyPI-style index: https://pypi.anaconda.org/$ANACONDA_ORG/simple" env: # Secret variables need to mapped to env variables explicitly: diff --git a/azure/windows.yml b/azure/windows.yml index 18f57f72..e134a5b2 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -34,7 +34,7 @@ jobs: set -e echo PYTHON $PYTHON_VERSION $PYTHON_ARCH - echo Build Reason $BUILD_REASON + echo Build Reason: $BUILD_REASON python --version python -c "import struct; print(struct.calcsize('P') * 8)" pip --version @@ -51,7 +51,7 @@ jobs: if [ "$BUILD_REASON" == "Schedule" ]; then BUILD_COMMIT=$NIGHTLY_BUILD_COMMIT fi - echo "Building scikit-learn-$BUILD_COMMIT" + echo "Building scikit-learn@$BUILD_COMMIT" echo "##vso[task.setvariable variable=BUILD_COMMIT]$BUILD_COMMIT" cd scikit-learn @@ -97,6 +97,10 @@ jobs: - script: | set -xe + ls $CONDA + ls $CONDA/Scripts + echo $PATH + hash -r conda install -y anaconda-client if [ "$BUILD_REASON" == "Schedule" ]; then ANACONDA_ORG="scipy-wheels-nightly" @@ -110,7 +114,6 @@ jobs: exit 1 fi anaconda -t $TOKEN upload -u $ANACONDA_ORG scikit-learn/dist/scikit_learn-*.whl - echo "Uploaded to https://anaconda.org/$ANACONDA_ORG/scikit-learn" echo "PyPI-style index: https://pypi.anaconda.org/$ANACONDA_ORG/simple" env: # Secret variables need to mapped to env variables explicitly: From 8890b905b7212b930dc8e5a7a2cb4a73058355d5 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 21:45:41 +0100 Subject: [PATCH 170/194] Fix: use bash everywhere explicitly to avoid silly copy and paste errors --- azure/posix.yml | 14 +++++++------- azure/windows.yml | 14 +++++--------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 81d95ee8..709852b1 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -31,7 +31,7 @@ jobs: versionSpec: $(MB_PYTHON_VERSION) displayName: Set python version - - script: | + - bash: | set -e if [ "$BUILD_REASON" == "Schedule" ]; then @@ -54,7 +54,7 @@ jobs: echo "##vso[task.setvariable variable=PYTHON_EXE]$PYTHON_EXE" displayName: Define build env variables - - script: | + - bash: | set -e pip install virtualenv BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $SCIPY_BUILD_DEP" @@ -74,7 +74,7 @@ jobs: displayName: Build wheel condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Nightly.Build'], 'false')) - - script: | + - bash: | set -e source multibuild/common_utils.sh source multibuild/travis_steps.sh @@ -85,17 +85,17 @@ jobs: displayName: Install wheel and test condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Nightly.Build'], 'false')) - - script: echo "##vso[task.prependpath]$CONDA/bin" + - bash: echo "##vso[task.prependpath]$CONDA/bin" displayName: Add conda to PATH condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) - - script: sudo chown -R $USER $CONDA + - bash: sudo chown -R $USER $CONDA displayName: Take ownership of conda installation condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) - - script: | + - bash: | set -xe - conda install -y anaconda-client + conda install -q -y anaconda-client if [ "$BUILD_REASON" == "Schedule" ]; then ANACONDA_ORG="scipy-wheels-nightly" TOKEN="$SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN" diff --git a/azure/windows.yml b/azure/windows.yml index e134a5b2..22fd86f0 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -91,17 +91,13 @@ jobs: displayName: Install wheel and test condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Nightly.Build'], 'false')) - - script: echo "##vso[task.prependpath]$CONDA/Scripts" + - bash: echo "##vso[task.prependpath]$CONDA/Scripts" displayName: Add conda to PATH condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) - - script: | + - bash: | set -xe - ls $CONDA - ls $CONDA/Scripts - echo $PATH - hash -r - conda install -y anaconda-client + conda install -q -y anaconda-client if [ "$BUILD_REASON" == "Schedule" ]; then ANACONDA_ORG="scipy-wheels-nightly" TOKEN="$SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN" @@ -119,5 +115,5 @@ jobs: # Secret variables need to mapped to env variables explicitly: SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN: $(SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN) SCIKIT_LEARN_STAGING_UPLOAD_TOKEN: $(SCIKIT_LEARN_STAGING_UPLOAD_TOKEN) - displayName: Upload to anaconda.org - condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) + displayName: Upload to anaconda.org + condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) From 41ab87821eec1cc258c3fa22bf1c19c8a98b8f9f Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 22:10:40 +0100 Subject: [PATCH 171/194] Replace existing files --- azure/posix.yml | 4 +++- azure/windows.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 709852b1..53ef498b 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -107,7 +107,9 @@ jobs: echo "Undefined secret token for organization: $ANACONDA_ORG" exit 1 fi - anaconda -t $TOKEN upload -u $ANACONDA_ORG wheelhouse/*.whl + # The --force option forces a replacement if the remote file already + # exists. + anaconda -t $TOKEN upload --force -u $ANACONDA_ORG wheelhouse/*.whl echo "PyPI-style index: https://pypi.anaconda.org/$ANACONDA_ORG/simple" env: # Secret variables need to mapped to env variables explicitly: diff --git a/azure/windows.yml b/azure/windows.yml index 22fd86f0..31606f7c 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -109,7 +109,9 @@ jobs: echo "Undefined anaconda secret upload token for $ANACONDA_ORG" exit 1 fi - anaconda -t $TOKEN upload -u $ANACONDA_ORG scikit-learn/dist/scikit_learn-*.whl + # The --force option forces a replacement if the remote file already + # exists. + anaconda -t $TOKEN upload --force -u $ANACONDA_ORG scikit-learn/dist/scikit_learn-*.whl echo "PyPI-style index: https://pypi.anaconda.org/$ANACONDA_ORG/simple" env: # Secret variables need to mapped to env variables explicitly: From 613fb2e629dc1f6642b7c812157f32c2e5f213bf Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 22:15:28 +0100 Subject: [PATCH 172/194] Fix link in README.rst --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index a35fa034..3fce86c1 100644 --- a/README.rst +++ b/README.rst @@ -15,8 +15,8 @@ Linux and OSX for various versions of Python (both 32 bit and 64 bit). If the tests pass, the resulting wheels should show up on: - - https://test.pypi.org for release wheels staging; - - https://anaconda.org/scipy-wheels-nighly for nightly builds. + - https://anaconda.org/scikit-learn-wheels-staging for release wheels staging; + - https://anaconda.org/scipy-wheels-nightly for nightly builds. The following tool can be useful to download all the wheels for a specific release: From 6600b8a31ad7a4970cca3f620a8e69b146556783 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 22:34:03 +0100 Subject: [PATCH 173/194] Prepare junit + schedule jobs --- azure-pipelines.yml | 8 ++++++++ azure/posix.yml | 9 +++++++++ azure/windows.yml | 15 ++++++++++++--- config.sh | 2 +- 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3e50dce3..d090d359 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,3 +1,11 @@ +schedules: +- cron: "*/5 * * * *" + displayName: Nighthly build (test) + branches: + include: + - master + always: true + jobs: - template: azure/windows.yml parameters: diff --git a/azure/posix.yml b/azure/posix.yml index 53ef498b..74d58a5a 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -18,6 +18,8 @@ jobs: NIGHTLY_BUILD_COMMIT: "master" NIGHTLY_BUILD: "false" TEST_DEPENDS: "pytest" + JUNITXML: "test-data.xml" + TEST_DIR: '$(Agent.WorkFolder)/tmp_for_test' strategy: matrix: ${{ insert }}: ${{ parameters.matrix }} @@ -85,6 +87,13 @@ jobs: displayName: Install wheel and test condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Nightly.Build'], 'false')) + # - task: PublishTestResults@2 + # inputs: + # testResultsFiles: '$(TEST_DIR)/$(JUNITXML)' + # testRunTitle: ${{ format('{0}-$(Agent.JobName)', parameters.name) }} + # displayName: 'Publish Test Results' + # condition: succeededOrFailed() + - bash: echo "##vso[task.prependpath]$CONDA/bin" displayName: Add conda to PATH condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) diff --git a/azure/windows.yml b/azure/windows.yml index 31606f7c..d1c290c7 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -17,6 +17,8 @@ jobs: NIGHTLY_BUILD: "false" PYTHON_ARCH: "x64" TEST_DEPENDS: "pytest" + JUNITXML: "test-data.xml" + TEST_DIR: '$(Agent.WorkFolder)/tmp_for_test' strategy: matrix: ${{ insert }}: ${{ parameters.matrix }} @@ -83,14 +85,21 @@ jobs: source extra_functions.sh setup_test_venv pip install scikit-learn/dist/scikit_learn-*.whl - mkdir tmp - pushd tmp - # pytest -rs --pyargs sklearn + mkdir $TEST_DIR + pushd $TEST_DIR + # pytest -rs -l --junitxml=$JUNITXML --pyargs sklearn popd teardown_test_venv displayName: Install wheel and test condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Nightly.Build'], 'false')) + # - task: PublishTestResults@2 + # inputs: + # testResultsFiles: '$(TEST_DIR)/$(JUNITXML)' + # testRunTitle: ${{ format('{0}-$(Agent.JobName)', parameters.name) }} + # displayName: 'Publish Test Results' + # condition: succeededOrFailed() + - bash: echo "##vso[task.prependpath]$CONDA/Scripts" displayName: Add conda to PATH condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) diff --git a/config.sh b/config.sh index 4522410b..fbe7ecd4 100644 --- a/config.sh +++ b/config.sh @@ -10,5 +10,5 @@ function pre_build { function run_tests { # Runs tests on installed distribution from an empty directory python --version - pytest -l --pyargs sklearn + pytest -l --junitxml=$JUNITXML --pyargs sklearn } From 70986f67c243f185c19203322fcacb4630668ba9 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 22:39:41 +0100 Subject: [PATCH 174/194] Try scheduled run --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d090d359..99b1fc6c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,7 +3,7 @@ schedules: displayName: Nighthly build (test) branches: include: - - master + - azure_pipelines_pr_2_ogrisel always: true jobs: From 6982e32c1ecc3cf99ec0306084d04f4e88686329 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 22:50:13 +0100 Subject: [PATCH 175/194] Cosmetics --- azure/posix.yml | 7 +++++-- azure/windows.yml | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 74d58a5a..8e1bdfdc 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -102,9 +102,12 @@ jobs: displayName: Take ownership of conda installation condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) + - bash: conda install -q -y anaconda-client + displayName: Install anaconda-client + condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) + - bash: | - set -xe - conda install -q -y anaconda-client + set -e if [ "$BUILD_REASON" == "Schedule" ]; then ANACONDA_ORG="scipy-wheels-nightly" TOKEN="$SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN" diff --git a/azure/windows.yml b/azure/windows.yml index d1c290c7..98bc5e2f 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -104,9 +104,12 @@ jobs: displayName: Add conda to PATH condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) + - bash: conda install -q -y anaconda-client + displayName: Install anaconda-client + condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) + - bash: | - set -xe - conda install -q -y anaconda-client + set -e if [ "$BUILD_REASON" == "Schedule" ]; then ANACONDA_ORG="scipy-wheels-nightly" TOKEN="$SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN" From da3a009bbe318ba98d0c41363180fc0219c44d21 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 23:08:51 +0100 Subject: [PATCH 176/194] Check nightly_build tag --- azure-pipelines.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 99b1fc6c..b1aca05e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,6 +1,6 @@ schedules: - cron: "*/5 * * * *" - displayName: Nighthly build (test) + displayName: Nighthly build branches: include: - azure_pipelines_pr_2_ogrisel @@ -12,11 +12,11 @@ jobs: name: windows vmImage: vs2017-win2016 matrix: - # py_3.5_32: - # PYTHON_VERSION: "3.5.x" - # PYTHON_ARCH: "x86" - # py_3.5_64: - # PYTHON_VERSION: "3.5.x" + py_3.5_32: + PYTHON_VERSION: "3.5.x" + PYTHON_ARCH: "x86" + py_3.5_64: + PYTHON_VERSION: "3.5.x" # py_3.6_32: # PYTHON_VERSION: "3.6.x" # PYTHON_ARCH: "x86" From cfe8ebd870c178a8d3273ae2168f4b7649489670 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 23:14:02 +0100 Subject: [PATCH 177/194] Update build matrix --- azure-pipelines.yml | 60 ++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 36 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b1aca05e..42f347f1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,6 +3,7 @@ schedules: displayName: Nighthly build branches: include: + - master - azure_pipelines_pr_2_ogrisel always: true @@ -12,27 +13,22 @@ jobs: name: windows vmImage: vs2017-win2016 matrix: - py_3.5_32: - PYTHON_VERSION: "3.5.x" + py_3.6_32: + PYTHON_VERSION: "3.6.x" PYTHON_ARCH: "x86" - py_3.5_64: - PYTHON_VERSION: "3.5.x" - # py_3.6_32: - # PYTHON_VERSION: "3.6.x" - # PYTHON_ARCH: "x86" - # NP_BUILD_DEP: "1.12.1" - # py_3.6_64: - # PYTHON_VERSION: "3.6.x" - # NP_BUILD_DEP: "1.12.1" - # py_3.7_32: - # PYTHON_VERSION: "3.7.x" - # PYTHON_ARCH: "x86" - # NP_BUILD_DEP: "1.14.5" - # NIGHTLY_BUILD: "true" - # py_3.7_64: - # PYTHON_VERSION: "3.7.x" - # NP_BUILD_DEP: "1.14.5" - # NIGHTLY_BUILD: "true" + NP_BUILD_DEP: "1.12.1" + py_3.6_64: + PYTHON_VERSION: "3.6.x" + NP_BUILD_DEP: "1.12.1" + py_3.7_32: + PYTHON_VERSION: "3.7.x" + PYTHON_ARCH: "x86" + NP_BUILD_DEP: "1.14.5" + NIGHTLY_BUILD: "true" + py_3.7_64: + PYTHON_VERSION: "3.7.x" + NP_BUILD_DEP: "1.14.5" + NIGHTLY_BUILD: "true" py_3.8_32: PYTHON_VERSION: "3.8.x" PYTHON_ARCH: "x86" @@ -50,16 +46,11 @@ jobs: name: linux vmImage: ubuntu-16.04 matrix: - # py_3.5_32: - # MB_PYTHON_VERSION: "3.5" - # PLAT: "i686" - # py_3.5_64: - # MB_PYTHON_VERSION: "3.5" - # py_3.6_32: - # MB_PYTHON_VERSION: "3.6" - # PLAT: "i686" - # py_3.6_64: - # MB_PYTHON_VERSION: "3.6" + py_3.6_32: + MB_PYTHON_VERSION: "3.6" + PLAT: "i686" + py_3.6_64: + MB_PYTHON_VERSION: "3.6" py_3.7_32: MB_PYTHON_VERSION: "3.7" PLAT: "i686" @@ -84,12 +75,9 @@ jobs: name: macOS vmImage: xcode9-macos10.13 matrix: - # py_3.5_64: - # MB_PYTHON_VERSION: "3.5" - # SCIPY_BUILD_DEP: "scipy==0.17.1" - # py_3.6_64: - # MB_PYTHON_VERSION: "3.6" - # NP_BUILD_DEP: "numpy==1.13.3" + py_3.6_64: + MB_PYTHON_VERSION: "3.6" + NP_BUILD_DEP: "numpy==1.13.3" py_3.7_64: MB_PYTHON_VERSION: "3.7" NP_BUILD_DEP: "numpy==1.14.5" From d933fee2d0e114f6431095a774b864769466e000 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 23:17:58 +0100 Subject: [PATCH 178/194] disable test schedule for now --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 42f347f1..bb17c3ac 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,5 @@ schedules: -- cron: "*/5 * * * *" +- cron: "0 0 * * *" displayName: Nighthly build branches: include: From 4abbe428affd569a89325f075f1688962e60c96d Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 23:30:38 +0100 Subject: [PATCH 179/194] Fix skip build logic --- azure-pipelines.yml | 2 +- azure/posix.yml | 23 ++++++++++++++--------- azure/windows.yml | 40 ++++++++++++++++++++++++---------------- 3 files changed, 39 insertions(+), 26 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bb17c3ac..42f347f1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,5 @@ schedules: -- cron: "0 0 * * *" +- cron: "*/5 * * * *" displayName: Nighthly build branches: include: diff --git a/azure/posix.yml b/azure/posix.yml index 8e1bdfdc..b286e4c3 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -36,11 +36,16 @@ jobs: - bash: | set -e + SKIP_BUILD="false" if [ "$BUILD_REASON" == "Schedule" ]; then BUILD_COMMIT=$NIGHTLY_BUILD_COMMIT + if [ "NIGHTLY_BUILD" != "true" ]; then + SKIP_BUILD="true" + fi fi echo "Building scikit-learn@$BUILD_COMMIT" echo "##vso[task.setvariable variable=BUILD_COMMIT]$BUILD_COMMIT" + echo "##vso[task.setvariable variable=SKIP_BUILD]$SKIP_BUILD" # Platform variables used in multibuild scripts if [ `uname` == 'Darwin' ]; then @@ -74,7 +79,7 @@ jobs: build_wheel $REPO_DIR $PLAT teardown_compiler displayName: Build wheel - condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Nightly.Build'], 'false')) + condition: eq(variables['SKIP_BUILD'], 'false') - bash: | set -e @@ -85,14 +90,14 @@ jobs: # install_run $PLAT teardown_test_venv displayName: Install wheel and test - condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Nightly.Build'], 'false')) - - # - task: PublishTestResults@2 - # inputs: - # testResultsFiles: '$(TEST_DIR)/$(JUNITXML)' - # testRunTitle: ${{ format('{0}-$(Agent.JobName)', parameters.name) }} - # displayName: 'Publish Test Results' - # condition: succeededOrFailed() + condition: eq(variables['SKIP_BUILD'], 'false') + + - task: PublishTestResults@2 + inputs: + testResultsFiles: '$(TEST_DIR)/$(JUNITXML)' + testRunTitle: ${{ format('{0}-$(Agent.JobName)', parameters.name) }} + displayName: 'Publish Test Results' + condition: succeededOrFailed() - bash: echo "##vso[task.prependpath]$CONDA/bin" displayName: Add conda to PATH diff --git a/azure/windows.yml b/azure/windows.yml index 98bc5e2f..8db74277 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -40,28 +40,36 @@ jobs: python --version python -c "import struct; print(struct.calcsize('P') * 8)" pip --version - - # 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: Check that we have the expected version and architecture for Python - bash: | set -e + SKIP_BUILD="false" if [ "$BUILD_REASON" == "Schedule" ]; then BUILD_COMMIT=$NIGHTLY_BUILD_COMMIT + if [ "NIGHTLY_BUILD" != "true" ]; then + SKIP_BUILD="true" + fi fi echo "Building scikit-learn@$BUILD_COMMIT" echo "##vso[task.setvariable variable=BUILD_COMMIT]$BUILD_COMMIT" + echo "##vso[task.setvariable variable=SKIP_BUILD]$SKIP_BUILD" + + # 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 cd scikit-learn git checkout $BUILD_COMMIT git clean -fxd git reset --hard - displayName: Checkout commit - condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Nightly.Build'], 'false')) + displayName: Checkout scikit-learn commit + condition: eq(variables['SKIP_BUILD'], 'false') - bash: | set -e @@ -78,7 +86,7 @@ jobs: twine check dist/* popd displayName: Build wheel - condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Nightly.Build'], 'false')) + condition: eq(variables['SKIP_BUILD'], 'false') - bash: | set -e @@ -91,14 +99,14 @@ jobs: popd teardown_test_venv displayName: Install wheel and test - condition: or(ne(variables['Build.Reason'], 'Schedule'), ne(variables['Nightly.Build'], 'false')) - - # - task: PublishTestResults@2 - # inputs: - # testResultsFiles: '$(TEST_DIR)/$(JUNITXML)' - # testRunTitle: ${{ format('{0}-$(Agent.JobName)', parameters.name) }} - # displayName: 'Publish Test Results' - # condition: succeededOrFailed() + condition: eq(variables['SKIP_BUILD'], 'false') + + - task: PublishTestResults@2 + inputs: + testResultsFiles: '$(TEST_DIR)/$(JUNITXML)' + testRunTitle: ${{ format('{0}-$(Agent.JobName)', parameters.name) }} + displayName: 'Publish Test Results' + condition: succeededOrFailed() - bash: echo "##vso[task.prependpath]$CONDA/Scripts" displayName: Add conda to PATH From e02561d52139df8c1411bd8130345bcccc0fa3e4 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Mon, 10 Feb 2020 23:48:38 +0100 Subject: [PATCH 180/194] Fix conditions --- azure/posix.yml | 10 +++++----- azure/windows.yml | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index b286e4c3..aea999f6 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -97,19 +97,19 @@ jobs: testResultsFiles: '$(TEST_DIR)/$(JUNITXML)' testRunTitle: ${{ format('{0}-$(Agent.JobName)', parameters.name) }} displayName: 'Publish Test Results' - condition: succeededOrFailed() + condition: eq(variables['SKIP_BUILD'], 'false') - bash: echo "##vso[task.prependpath]$CONDA/bin" displayName: Add conda to PATH - condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) + condition: and(succeeded(), eq(variables['SKIP_BUILD'], 'false'), ne(variables['Build.Reason'], 'PullRequest')) - bash: sudo chown -R $USER $CONDA displayName: Take ownership of conda installation - condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) + condition: and(succeeded(), eq(variables['SKIP_BUILD'], 'false'), ne(variables['Build.Reason'], 'PullRequest')) - bash: conda install -q -y anaconda-client displayName: Install anaconda-client - condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) + condition: and(succeeded(), eq(variables['SKIP_BUILD'], 'false'), ne(variables['Build.Reason'], 'PullRequest')) - bash: | set -e @@ -133,4 +133,4 @@ jobs: SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN: $(SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN) SCIKIT_LEARN_STAGING_UPLOAD_TOKEN: $(SCIKIT_LEARN_STAGING_UPLOAD_TOKEN) displayName: Upload to anaconda.org - condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) + condition: and(succeeded(), eq(variables['SKIP_BUILD'], 'false'), ne(variables['Build.Reason'], 'PullRequest')) diff --git a/azure/windows.yml b/azure/windows.yml index 8db74277..36d518be 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -106,15 +106,15 @@ jobs: testResultsFiles: '$(TEST_DIR)/$(JUNITXML)' testRunTitle: ${{ format('{0}-$(Agent.JobName)', parameters.name) }} displayName: 'Publish Test Results' - condition: succeededOrFailed() + condition: eq(variables['SKIP_BUILD'], 'false') - bash: echo "##vso[task.prependpath]$CONDA/Scripts" displayName: Add conda to PATH - condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) + condition: and(succeeded(), eq(variables['SKIP_BUILD'], 'false'), ne(variables['Build.Reason'], 'PullRequest')) - bash: conda install -q -y anaconda-client displayName: Install anaconda-client - condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) + condition: and(succeeded(), eq(variables['SKIP_BUILD'], 'false'), ne(variables['Build.Reason'], 'PullRequest')) - bash: | set -e @@ -138,4 +138,4 @@ jobs: SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN: $(SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN) SCIKIT_LEARN_STAGING_UPLOAD_TOKEN: $(SCIKIT_LEARN_STAGING_UPLOAD_TOKEN) displayName: Upload to anaconda.org - condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) + condition: and(succeeded(), eq(variables['SKIP_BUILD'], 'false'), ne(variables['Build.Reason'], 'PullRequest')) From 62f3aac9bf7694782db21dcaabb5419fb724697c Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Tue, 11 Feb 2020 00:01:05 +0100 Subject: [PATCH 181/194] Fix typo in SKIP_BUILD definition, reduce schedule to test while I'm sleeping --- azure-pipelines.yml | 2 +- azure/posix.yml | 2 +- azure/windows.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 42f347f1..a84e908d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,5 @@ schedules: -- cron: "*/5 * * * *" +- cron: "0 */3 * * *" displayName: Nighthly build branches: include: diff --git a/azure/posix.yml b/azure/posix.yml index aea999f6..0fbe33cc 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -39,7 +39,7 @@ jobs: SKIP_BUILD="false" if [ "$BUILD_REASON" == "Schedule" ]; then BUILD_COMMIT=$NIGHTLY_BUILD_COMMIT - if [ "NIGHTLY_BUILD" != "true" ]; then + if [ "$NIGHTLY_BUILD" != "true" ]; then SKIP_BUILD="true" fi fi diff --git a/azure/windows.yml b/azure/windows.yml index 36d518be..d29ab19e 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -48,7 +48,7 @@ jobs: SKIP_BUILD="false" if [ "$BUILD_REASON" == "Schedule" ]; then BUILD_COMMIT=$NIGHTLY_BUILD_COMMIT - if [ "NIGHTLY_BUILD" != "true" ]; then + if [ "$NIGHTLY_BUILD" != "true" ]; then SKIP_BUILD="true" fi fi From 8f5cb62212f08f065295a4a1074d42277c34603a Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Tue, 11 Feb 2020 09:18:55 +0100 Subject: [PATCH 182/194] Reeable tests --- azure/posix.yml | 2 +- azure/windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 0fbe33cc..a8d76763 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -87,7 +87,7 @@ jobs: source multibuild/travis_steps.sh source extra_functions.sh setup_test_venv - # install_run $PLAT + install_run $PLAT teardown_test_venv displayName: Install wheel and test condition: eq(variables['SKIP_BUILD'], 'false') diff --git a/azure/windows.yml b/azure/windows.yml index d29ab19e..6bc76aca 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -95,7 +95,7 @@ jobs: pip install scikit-learn/dist/scikit_learn-*.whl mkdir $TEST_DIR pushd $TEST_DIR - # pytest -rs -l --junitxml=$JUNITXML --pyargs sklearn + pytest -rs -l --junitxml=$JUNITXML --pyargs sklearn popd teardown_test_venv displayName: Install wheel and test From 5ae6a916ef2cac6c2dc544642e083dce2c97ad72 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Tue, 11 Feb 2020 10:06:57 +0100 Subject: [PATCH 183/194] Do not try to upload if TOKEN is not present --- azure-pipelines.yml | 3 ++- azure/posix.yml | 20 ++++++++++---------- azure/windows.yml | 14 ++++++++------ 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a84e908d..9f403ded 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,6 @@ schedules: -- cron: "0 */3 * * *" +- cron: "27 3 */1 * *" + # 3:27am UTC everyday displayName: Nighthly build branches: include: diff --git a/azure/posix.yml b/azure/posix.yml index a8d76763..eafd310a 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -99,14 +99,12 @@ jobs: displayName: 'Publish Test Results' condition: eq(variables['SKIP_BUILD'], 'false') - - bash: echo "##vso[task.prependpath]$CONDA/bin" + - bash: | + echo "##vso[task.prependpath]$CONDA/bin" + sudo chown -R $USER $CONDA displayName: Add conda to PATH condition: and(succeeded(), eq(variables['SKIP_BUILD'], 'false'), ne(variables['Build.Reason'], 'PullRequest')) - - bash: sudo chown -R $USER $CONDA - displayName: Take ownership of conda installation - condition: and(succeeded(), eq(variables['SKIP_BUILD'], 'false'), ne(variables['Build.Reason'], 'PullRequest')) - - bash: conda install -q -y anaconda-client displayName: Install anaconda-client condition: and(succeeded(), eq(variables['SKIP_BUILD'], 'false'), ne(variables['Build.Reason'], 'PullRequest')) @@ -120,10 +118,12 @@ jobs: ANACONDA_ORG="scikit-learn-wheels-staging" TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN" fi - if [ "$TOKEN" == "" ]; then - echo "Undefined secret token for organization: $ANACONDA_ORG" - exit 1 - fi + echo "##vso[task.setvariable variable=TOKEN]$TOKEN" + displayName: Retrieve secret upload token + condition: and(succeeded(), eq(variables['SKIP_BUILD'], 'false'), ne(variables['Build.Reason'], 'PullRequest')) + + - bash: | + set -e # The --force option forces a replacement if the remote file already # exists. anaconda -t $TOKEN upload --force -u $ANACONDA_ORG wheelhouse/*.whl @@ -133,4 +133,4 @@ jobs: SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN: $(SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN) SCIKIT_LEARN_STAGING_UPLOAD_TOKEN: $(SCIKIT_LEARN_STAGING_UPLOAD_TOKEN) displayName: Upload to anaconda.org - condition: and(succeeded(), eq(variables['SKIP_BUILD'], 'false'), ne(variables['Build.Reason'], 'PullRequest')) + condition: ne(variables['TOKEN'], '')) diff --git a/azure/windows.yml b/azure/windows.yml index 6bc76aca..fc9d3541 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -125,17 +125,19 @@ jobs: ANACONDA_ORG="scikit-learn-wheels-staging" TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN" fi - if [ "$TOKEN" == "" ]; then - echo "Undefined anaconda secret upload token for $ANACONDA_ORG" - exit 1 - fi + echo "##vso[task.setvariable variable=TOKEN]$TOKEN" + displayName: Retrieve secret upload token + condition: and(succeeded(), eq(variables['SKIP_BUILD'], 'false'), ne(variables['Build.Reason'], 'PullRequest')) + + - bash: | + set -e # The --force option forces a replacement if the remote file already # exists. - anaconda -t $TOKEN upload --force -u $ANACONDA_ORG scikit-learn/dist/scikit_learn-*.whl + anaconda -t $TOKEN upload --force -u $ANACONDA_ORG wheelhouse/*.whl echo "PyPI-style index: https://pypi.anaconda.org/$ANACONDA_ORG/simple" env: # Secret variables need to mapped to env variables explicitly: SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN: $(SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN) SCIKIT_LEARN_STAGING_UPLOAD_TOKEN: $(SCIKIT_LEARN_STAGING_UPLOAD_TOKEN) displayName: Upload to anaconda.org - condition: and(succeeded(), eq(variables['SKIP_BUILD'], 'false'), ne(variables['Build.Reason'], 'PullRequest')) + condition: ne(variables['TOKEN'], '')) From bae8fa5266cb4dd21964fb1ca0509323c25f4ae7 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Tue, 11 Feb 2020 10:39:23 +0100 Subject: [PATCH 184/194] Typo --- azure/posix.yml | 2 +- azure/windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index eafd310a..9de22d1c 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -133,4 +133,4 @@ jobs: SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN: $(SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN) SCIKIT_LEARN_STAGING_UPLOAD_TOKEN: $(SCIKIT_LEARN_STAGING_UPLOAD_TOKEN) displayName: Upload to anaconda.org - condition: ne(variables['TOKEN'], '')) + condition: ne(variables['TOKEN'], '') diff --git a/azure/windows.yml b/azure/windows.yml index fc9d3541..2052339e 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -140,4 +140,4 @@ jobs: SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN: $(SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN) SCIKIT_LEARN_STAGING_UPLOAD_TOKEN: $(SCIKIT_LEARN_STAGING_UPLOAD_TOKEN) displayName: Upload to anaconda.org - condition: ne(variables['TOKEN'], '')) + condition: ne(variables['TOKEN'], '') From 928c34d0972db2c45d6ee0941249a0f45da8d469 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Tue, 11 Feb 2020 11:01:19 +0100 Subject: [PATCH 185/194] Fix secret variable mapping --- azure/posix.yml | 8 ++++---- azure/windows.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 9de22d1c..cf614394 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -121,6 +121,10 @@ jobs: echo "##vso[task.setvariable variable=TOKEN]$TOKEN" displayName: Retrieve secret upload token condition: and(succeeded(), eq(variables['SKIP_BUILD'], 'false'), ne(variables['Build.Reason'], 'PullRequest')) + env: + # Secret variables need to mapped to env variables explicitly: + SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN: $(SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN) + SCIKIT_LEARN_STAGING_UPLOAD_TOKEN: $(SCIKIT_LEARN_STAGING_UPLOAD_TOKEN) - bash: | set -e @@ -128,9 +132,5 @@ jobs: # exists. anaconda -t $TOKEN upload --force -u $ANACONDA_ORG wheelhouse/*.whl echo "PyPI-style index: https://pypi.anaconda.org/$ANACONDA_ORG/simple" - env: - # Secret variables need to mapped to env variables explicitly: - SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN: $(SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN) - SCIKIT_LEARN_STAGING_UPLOAD_TOKEN: $(SCIKIT_LEARN_STAGING_UPLOAD_TOKEN) displayName: Upload to anaconda.org condition: ne(variables['TOKEN'], '') diff --git a/azure/windows.yml b/azure/windows.yml index 2052339e..46a4a945 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -128,6 +128,10 @@ jobs: echo "##vso[task.setvariable variable=TOKEN]$TOKEN" displayName: Retrieve secret upload token condition: and(succeeded(), eq(variables['SKIP_BUILD'], 'false'), ne(variables['Build.Reason'], 'PullRequest')) + env: + # Secret variables need to mapped to env variables explicitly: + SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN: $(SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN) + SCIKIT_LEARN_STAGING_UPLOAD_TOKEN: $(SCIKIT_LEARN_STAGING_UPLOAD_TOKEN) - bash: | set -e @@ -135,9 +139,5 @@ jobs: # exists. anaconda -t $TOKEN upload --force -u $ANACONDA_ORG wheelhouse/*.whl echo "PyPI-style index: https://pypi.anaconda.org/$ANACONDA_ORG/simple" - env: - # Secret variables need to mapped to env variables explicitly: - SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN: $(SCIKIT_LEARN_NIGHTLY_UPLOAD_TOKEN) - SCIKIT_LEARN_STAGING_UPLOAD_TOKEN: $(SCIKIT_LEARN_STAGING_UPLOAD_TOKEN) displayName: Upload to anaconda.org condition: ne(variables['TOKEN'], '') From c7d3c0c743cd62d5345d3a9b144716001b2721f7 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Tue, 11 Feb 2020 14:53:34 +0100 Subject: [PATCH 186/194] More debug --- azure/posix.yml | 3 ++- azure/windows.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index cf614394..d52c3f25 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -87,7 +87,7 @@ jobs: source multibuild/travis_steps.sh source extra_functions.sh setup_test_venv - install_run $PLAT + # install_run $PLAT teardown_test_venv displayName: Install wheel and test condition: eq(variables['SKIP_BUILD'], 'false') @@ -130,6 +130,7 @@ jobs: set -e # The --force option forces a replacement if the remote file already # exists. + ls wheelhouse/*.whl anaconda -t $TOKEN upload --force -u $ANACONDA_ORG wheelhouse/*.whl echo "PyPI-style index: https://pypi.anaconda.org/$ANACONDA_ORG/simple" displayName: Upload to anaconda.org diff --git a/azure/windows.yml b/azure/windows.yml index 46a4a945..e451b113 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -95,7 +95,7 @@ jobs: pip install scikit-learn/dist/scikit_learn-*.whl mkdir $TEST_DIR pushd $TEST_DIR - pytest -rs -l --junitxml=$JUNITXML --pyargs sklearn + # pytest -rs -l --junitxml=$JUNITXML --pyargs sklearn popd teardown_test_venv displayName: Install wheel and test @@ -137,7 +137,7 @@ jobs: set -e # The --force option forces a replacement if the remote file already # exists. - anaconda -t $TOKEN upload --force -u $ANACONDA_ORG wheelhouse/*.whl + anaconda -t $TOKEN upload --force -u $ANACONDA_ORG scikit-learn/dist/scikit_learn-*.whl echo "PyPI-style index: https://pypi.anaconda.org/$ANACONDA_ORG/simple" displayName: Upload to anaconda.org condition: ne(variables['TOKEN'], '') From d0d95ddb26631ce063ac8c8b19e6a5745fe55c17 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Tue, 11 Feb 2020 15:40:29 +0100 Subject: [PATCH 187/194] Typo --- azure/posix.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure/posix.yml b/azure/posix.yml index d52c3f25..eb784f0f 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -119,6 +119,7 @@ jobs: TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN" fi echo "##vso[task.setvariable variable=TOKEN]$TOKEN" + echo "##vso[task.setvariable variable=ANACONDA_ORG]$ANACONDA_ORG" displayName: Retrieve secret upload token condition: and(succeeded(), eq(variables['SKIP_BUILD'], 'false'), ne(variables['Build.Reason'], 'PullRequest')) env: From 7d1aa2d25b4c9249ab9153795a024f1cc1a769e6 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Tue, 11 Feb 2020 15:43:25 +0100 Subject: [PATCH 188/194] Fix missing variable --- azure/posix.yml | 2 +- azure/windows.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index eb784f0f..2fadae53 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -134,5 +134,5 @@ jobs: ls wheelhouse/*.whl anaconda -t $TOKEN upload --force -u $ANACONDA_ORG wheelhouse/*.whl echo "PyPI-style index: https://pypi.anaconda.org/$ANACONDA_ORG/simple" - displayName: Upload to anaconda.org + displayName: Upload to anaconda.org (only if secret token is retrieved) condition: ne(variables['TOKEN'], '') diff --git a/azure/windows.yml b/azure/windows.yml index e451b113..8e538c67 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -126,6 +126,7 @@ jobs: TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN" fi echo "##vso[task.setvariable variable=TOKEN]$TOKEN" + echo "##vso[task.setvariable variable=ANACONDA_ORG]$ANACONDA_ORG" displayName: Retrieve secret upload token condition: and(succeeded(), eq(variables['SKIP_BUILD'], 'false'), ne(variables['Build.Reason'], 'PullRequest')) env: @@ -139,5 +140,5 @@ jobs: # exists. anaconda -t $TOKEN upload --force -u $ANACONDA_ORG scikit-learn/dist/scikit_learn-*.whl echo "PyPI-style index: https://pypi.anaconda.org/$ANACONDA_ORG/simple" - displayName: Upload to anaconda.org + displayName: Upload to anaconda.org (only if secret token is retrieved) condition: ne(variables['TOKEN'], '') From 618e372956779832aa7f7f23659758cf6ac21b77 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Tue, 11 Feb 2020 15:53:27 +0100 Subject: [PATCH 189/194] Enable tests --- azure/posix.yml | 2 +- azure/windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 2fadae53..0c582b45 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -87,7 +87,7 @@ jobs: source multibuild/travis_steps.sh source extra_functions.sh setup_test_venv - # install_run $PLAT + install_run $PLAT teardown_test_venv displayName: Install wheel and test condition: eq(variables['SKIP_BUILD'], 'false') diff --git a/azure/windows.yml b/azure/windows.yml index 8e538c67..40db3a05 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -95,7 +95,7 @@ jobs: pip install scikit-learn/dist/scikit_learn-*.whl mkdir $TEST_DIR pushd $TEST_DIR - # pytest -rs -l --junitxml=$JUNITXML --pyargs sklearn + pytest -rs -l --junitxml=$JUNITXML --pyargs sklearn popd teardown_test_venv displayName: Install wheel and test From 3f22da577f0a7e8d6efba1a8ad508f13c51407a1 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Tue, 11 Feb 2020 17:05:47 +0100 Subject: [PATCH 190/194] debug test dir --- azure/posix.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/azure/posix.yml b/azure/posix.yml index 0c582b45..4529bd8f 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -19,7 +19,7 @@ jobs: NIGHTLY_BUILD: "false" TEST_DEPENDS: "pytest" JUNITXML: "test-data.xml" - TEST_DIR: '$(Agent.WorkFolder)/tmp_for_test' + TEST_DIR: "tmp_for_test" strategy: matrix: ${{ insert }}: ${{ parameters.matrix }} @@ -89,6 +89,8 @@ jobs: setup_test_venv install_run $PLAT teardown_test_venv + ls + ls $TEST_DIR displayName: Install wheel and test condition: eq(variables['SKIP_BUILD'], 'false') From b10cb88e586fd2bfb25bff6f72ab5cbb239f76db Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Wed, 12 Feb 2020 09:51:16 +0100 Subject: [PATCH 191/194] Debug --- azure/posix.yml | 3 ++- azure/windows.yml | 2 +- config.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 4529bd8f..3a133097 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -82,7 +82,7 @@ jobs: condition: eq(variables['SKIP_BUILD'], 'false') - bash: | - set -e + set -xe source multibuild/common_utils.sh source multibuild/travis_steps.sh source extra_functions.sh @@ -91,6 +91,7 @@ jobs: teardown_test_venv ls ls $TEST_DIR + ls tmp_for_test displayName: Install wheel and test condition: eq(variables['SKIP_BUILD'], 'false') diff --git a/azure/windows.yml b/azure/windows.yml index 40db3a05..6d46d459 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -95,7 +95,7 @@ jobs: pip install scikit-learn/dist/scikit_learn-*.whl mkdir $TEST_DIR pushd $TEST_DIR - pytest -rs -l --junitxml=$JUNITXML --pyargs sklearn + pytest -k isotonic -rs -l --junitxml=$JUNITXML --pyargs sklearn popd teardown_test_venv displayName: Install wheel and test diff --git a/config.sh b/config.sh index fbe7ecd4..38fbd072 100644 --- a/config.sh +++ b/config.sh @@ -10,5 +10,5 @@ function pre_build { function run_tests { # Runs tests on installed distribution from an empty directory python --version - pytest -l --junitxml=$JUNITXML --pyargs sklearn + pytest -l -k isotonic --junitxml=$JUNITXML --pyargs sklearn } From e733336cbfb4a4e3d918ed688a936f6e243b7b86 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Wed, 12 Feb 2020 10:28:47 +0100 Subject: [PATCH 192/194] More debug --- config.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config.sh b/config.sh index 38fbd072..a828f6e6 100644 --- a/config.sh +++ b/config.sh @@ -7,8 +7,10 @@ function pre_build { : } +# XXX: test-data.xml is hard-coded because the JUNITXML env variable +# is not forwarded to the docker container environment. function run_tests { # Runs tests on installed distribution from an empty directory python --version - pytest -l -k isotonic --junitxml=$JUNITXML --pyargs sklearn + pytest -l -k isotonic --junitxml=test-data.xml --pyargs sklearn } From cc36cbfbd9950fc1e4f51b4e4707ae04a09c7677 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Wed, 12 Feb 2020 10:51:23 +0100 Subject: [PATCH 193/194] Small improvements --- azure/posix.yml | 6 +++--- azure/windows.yml | 6 +++++- config.sh | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 3a133097..6e28200c 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -89,9 +89,6 @@ jobs: setup_test_venv install_run $PLAT teardown_test_venv - ls - ls $TEST_DIR - ls tmp_for_test displayName: Install wheel and test condition: eq(variables['SKIP_BUILD'], 'false') @@ -121,6 +118,9 @@ jobs: ANACONDA_ORG="scikit-learn-wheels-staging" TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN" fi + if [ "$TOKEN" == "" ]; then + echo "##[warning] Could not find anaconda.org upload token in secret variables" + fi echo "##vso[task.setvariable variable=TOKEN]$TOKEN" echo "##vso[task.setvariable variable=ANACONDA_ORG]$ANACONDA_ORG" displayName: Retrieve secret upload token diff --git a/azure/windows.yml b/azure/windows.yml index 6d46d459..50b85e78 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -95,7 +95,7 @@ jobs: pip install scikit-learn/dist/scikit_learn-*.whl mkdir $TEST_DIR pushd $TEST_DIR - pytest -k isotonic -rs -l --junitxml=$JUNITXML --pyargs sklearn + pytest -rs -l --junitxml=$JUNITXML --pyargs sklearn popd teardown_test_venv displayName: Install wheel and test @@ -125,6 +125,9 @@ jobs: ANACONDA_ORG="scikit-learn-wheels-staging" TOKEN="$SCIKIT_LEARN_STAGING_UPLOAD_TOKEN" fi + if [ "$TOKEN" == "" ]; then + echo "##[warning] Could not find anaconda.org upload token in secret variables" + fi echo "##vso[task.setvariable variable=TOKEN]$TOKEN" echo "##vso[task.setvariable variable=ANACONDA_ORG]$ANACONDA_ORG" displayName: Retrieve secret upload token @@ -138,6 +141,7 @@ jobs: set -e # The --force option forces a replacement if the remote file already # exists. + ls scikit-learn/dist/scikit_learn-*.whl anaconda -t $TOKEN upload --force -u $ANACONDA_ORG scikit-learn/dist/scikit_learn-*.whl echo "PyPI-style index: https://pypi.anaconda.org/$ANACONDA_ORG/simple" displayName: Upload to anaconda.org (only if secret token is retrieved) diff --git a/config.sh b/config.sh index a828f6e6..a9d40c73 100644 --- a/config.sh +++ b/config.sh @@ -12,5 +12,5 @@ function pre_build { function run_tests { # Runs tests on installed distribution from an empty directory python --version - pytest -l -k isotonic --junitxml=test-data.xml --pyargs sklearn + pytest -l --junitxml=test-data.xml --pyargs sklearn } From 684d6088d242e407170f52a3206b7ac582e1b77c Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Wed, 12 Feb 2020 11:45:57 +0100 Subject: [PATCH 194/194] Cleanup --- azure-pipelines.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9f403ded..f113b606 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -5,7 +5,6 @@ schedules: branches: include: - master - - azure_pipelines_pr_2_ogrisel always: true jobs: