From aadb3fcad434e216f7160601d5f9d6807739b574 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 9 May 2020 11:12:45 -0400 Subject: [PATCH 1/9] BLD Test build dependencies --- azure-pipelines.yml | 131 ++++++++++++++++++++++---------------------- azure/posix.yml | 1 - extra_functions.sh | 5 ++ 3 files changed, 70 insertions(+), 67 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1970be7b..89dff7ff 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,79 +11,78 @@ variables: MANYLINUX_URL: "https://pypi.python.org/simple" jobs: - - template: azure/windows.yml - parameters: - name: windows - vmImage: vs2017-win2016 - matrix: - py_3.6_32: - PYTHON_VERSION: "3.6.x" - PYTHON_ARCH: "x86" - py_3.6_64: - PYTHON_VERSION: "3.6.x" - 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" - NP_BUILD_DEP: "1.17.3" - SCIPY_BUILD_DEP: "1.4.1" - NIGHTLY_BUILD: "true" - py_3.8_64: - PYTHON_VERSION: "3.8.x" - NP_BUILD_DEP: "1.17.3" - SCIPY_BUILD_DEP: "1.4.1" - NIGHTLY_BUILD: "true" + # - template: azure/windows.yml + # parameters: + # name: windows + # vmImage: vs2017-win2016 + # matrix: + # py_3.6_32: + # PYTHON_VERSION: "3.6.x" + # PYTHON_ARCH: "x86" + # py_3.6_64: + # PYTHON_VERSION: "3.6.x" + # 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" + # NP_BUILD_DEP: "1.17.3" + # SCIPY_BUILD_DEP: "1.4.1" + # NIGHTLY_BUILD: "true" + # py_3.8_64: + # PYTHON_VERSION: "3.8.x" + # NP_BUILD_DEP: "1.17.3" + # SCIPY_BUILD_DEP: "1.4.1" + # NIGHTLY_BUILD: "true" - template: azure/posix.yml parameters: name: linux vmImage: ubuntu-16.04 matrix: - 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" - NP_BUILD_DEP: "numpy==1.14.5" - NIGHTLY_BUILD: "true" - py_3.7_64: - MB_PYTHON_VERSION: "3.7" - NP_BUILD_DEP: "numpy==1.14.5" - NIGHTLY_BUILD: "true" - py_3.8_32: - MB_PYTHON_VERSION: "3.8" - PLAT: "i686" - NP_BUILD_DEP: "numpy==1.17.3" - NIGHTLY_BUILD: "true" + # 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" + # NP_BUILD_DEP: "numpy==1.14.5" + # NIGHTLY_BUILD: "true" + # py_3.7_64: + # MB_PYTHON_VERSION: "3.7" + # NP_BUILD_DEP: "numpy==1.14.5" + # NIGHTLY_BUILD: "true" + # py_3.8_32: + # MB_PYTHON_VERSION: "3.8" + # PLAT: "i686" + # NP_BUILD_DEP: "numpy==1.17.3" + # NIGHTLY_BUILD: "true" py_3.8_64: MB_PYTHON_VERSION: "3.8" - NP_BUILD_DEP: "numpy==1.17.3" NIGHTLY_BUILD: "true" - - template: azure/posix.yml - parameters: - name: macOS - vmImage: macOS-10.14 - matrix: - 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" - NIGHTLY_BUILD: "true" - py_3.8_64: - MB_PYTHON_VERSION: "3.8" - NP_BUILD_DEP: "numpy==1.17.3" - NIGHTLY_BUILD: "true" + # - template: azure/posix.yml + # parameters: + # name: macOS + # vmImage: macOS-10.14 + # matrix: + # 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" + # NIGHTLY_BUILD: "true" + # py_3.8_64: + # MB_PYTHON_VERSION: "3.8" + # NP_BUILD_DEP: "numpy==1.17.3" + # NIGHTLY_BUILD: "true" diff --git a/azure/posix.yml b/azure/posix.yml index 127ee532..676d4cff 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -64,7 +64,6 @@ jobs: - bash: | 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 diff --git a/extra_functions.sh b/extra_functions.sh index e9e7c610..d8dd2bcb 100644 --- a/extra_functions.sh +++ b/extra_functions.sh @@ -49,3 +49,8 @@ function teardown_test_venv { fi fi } + +function pip_wheel_cmd { + local abs_wheelhouse=$1 + pip wheel $(pip_opts) -w $abs_wheelhouse . +} From 2632e8578766e369a5d8305f3c1d8f3b7600dc9e Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 9 May 2020 11:35:41 -0400 Subject: [PATCH 2/9] TST Use verbose --- extra_functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra_functions.sh b/extra_functions.sh index d8dd2bcb..def2417d 100644 --- a/extra_functions.sh +++ b/extra_functions.sh @@ -52,5 +52,5 @@ function teardown_test_venv { function pip_wheel_cmd { local abs_wheelhouse=$1 - pip wheel $(pip_opts) -w $abs_wheelhouse . + pip wheel $(pip_opts) -v -w $abs_wheelhouse . } From c7bfd85df8ecf25c2c4e2ffe5d29d8b444ca350d Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 9 May 2020 11:42:32 -0400 Subject: [PATCH 3/9] TSTT Quick testt --- azure/posix.yml | 2 +- extra_functions.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/azure/posix.yml b/azure/posix.yml index 676d4cff..12e0a71a 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -86,7 +86,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/extra_functions.sh b/extra_functions.sh index def2417d..135f3757 100644 --- a/extra_functions.sh +++ b/extra_functions.sh @@ -52,5 +52,6 @@ function teardown_test_venv { function pip_wheel_cmd { local abs_wheelhouse=$1 - pip wheel $(pip_opts) -v -w $abs_wheelhouse . + echo "HELLO WOLRD" + pip wheel $(pip_opts) -w $abs_wheelhouse . } From 8d449a95016611f14fc6d937f3547ac00feecfb3 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 9 May 2020 11:51:45 -0400 Subject: [PATCH 4/9] TST Just build --- azure-pipelines.yml | 118 ++++++++++++++++++++------------------------ azure/posix.yml | 4 -- azure/windows.yml | 2 +- extra_functions.sh | 6 --- 4 files changed, 54 insertions(+), 76 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 89dff7ff..ced72195 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,78 +11,66 @@ variables: MANYLINUX_URL: "https://pypi.python.org/simple" jobs: - # - template: azure/windows.yml - # parameters: - # name: windows - # vmImage: vs2017-win2016 - # matrix: - # py_3.6_32: - # PYTHON_VERSION: "3.6.x" - # PYTHON_ARCH: "x86" - # py_3.6_64: - # PYTHON_VERSION: "3.6.x" - # 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" - # NP_BUILD_DEP: "1.17.3" - # SCIPY_BUILD_DEP: "1.4.1" - # NIGHTLY_BUILD: "true" - # py_3.8_64: - # PYTHON_VERSION: "3.8.x" - # NP_BUILD_DEP: "1.17.3" - # SCIPY_BUILD_DEP: "1.4.1" - # NIGHTLY_BUILD: "true" + - template: azure/windows.yml + parameters: + name: windows + vmImage: vs2017-win2016 + matrix: + py_3.6_32: + PYTHON_VERSION: "3.6.x" + PYTHON_ARCH: "x86" + py_3.6_64: + PYTHON_VERSION: "3.6.x" + py_3.7_32: + PYTHON_VERSION: "3.7.x" + PYTHON_ARCH: "x86" + NIGHTLY_BUILD: "true" + py_3.7_64: + PYTHON_VERSION: "3.7.x" + NIGHTLY_BUILD: "true" + py_3.8_32: + PYTHON_VERSION: "3.8.x" + PYTHON_ARCH: "x86" + NIGHTLY_BUILD: "true" + py_3.8_64: + PYTHON_VERSION: "3.8.x" + NIGHTLY_BUILD: "true" - template: azure/posix.yml parameters: name: linux vmImage: ubuntu-16.04 matrix: - # 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" - # NP_BUILD_DEP: "numpy==1.14.5" - # NIGHTLY_BUILD: "true" - # py_3.7_64: - # MB_PYTHON_VERSION: "3.7" - # NP_BUILD_DEP: "numpy==1.14.5" - # NIGHTLY_BUILD: "true" - # py_3.8_32: - # MB_PYTHON_VERSION: "3.8" - # PLAT: "i686" - # NP_BUILD_DEP: "numpy==1.17.3" - # NIGHTLY_BUILD: "true" + 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" + NIGHTLY_BUILD: "true" + py_3.7_64: + MB_PYTHON_VERSION: "3.7" + NIGHTLY_BUILD: "true" + py_3.8_32: + MB_PYTHON_VERSION: "3.8" + PLAT: "i686" + NIGHTLY_BUILD: "true" py_3.8_64: MB_PYTHON_VERSION: "3.8" NIGHTLY_BUILD: "true" - # - template: azure/posix.yml - # parameters: - # name: macOS - # vmImage: macOS-10.14 - # matrix: - # 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" - # NIGHTLY_BUILD: "true" - # py_3.8_64: - # MB_PYTHON_VERSION: "3.8" - # NP_BUILD_DEP: "numpy==1.17.3" - # NIGHTLY_BUILD: "true" + - template: azure/posix.yml + parameters: + name: macOS + vmImage: macOS-10.14 + matrix: + py_3.6_64: + MB_PYTHON_VERSION: "3.6" + py_3.7_64: + MB_PYTHON_VERSION: "3.7" + NIGHTLY_BUILD: "true" + py_3.8_64: + MB_PYTHON_VERSION: "3.8" + NIGHTLY_BUILD: "true" diff --git a/azure/posix.yml b/azure/posix.yml index 12e0a71a..f68c9f35 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -11,10 +11,6 @@ jobs: REPO_DIR: "scikit-learn" BUILD_COMMIT: "0.23.0rc1" PLAT: "x86_64" - NP_BUILD_DEP: "numpy==1.13.3" - CYTHON_BUILD_DEP: "cython==0.29.14" - SCIPY_BUILD_DEP: "scipy" - JOBLIB_BUILD_DEP: "joblib==0.11" NIGHTLY_BUILD_COMMIT: "master" NIGHTLY_BUILD: "false" TEST_DEPENDS: "pytest" diff --git a/azure/windows.yml b/azure/windows.yml index f267b1ef..f3650a8d 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -8,7 +8,7 @@ jobs: pool: vmImage: ${{ parameters.vmImage }} variables: - BUILD_COMMIT: "0.23.0rc1" + BUILD_COMMIT: "0.23.X" SKLEARN_SKIP_NETWORK_TESTS: "1" NP_BUILD_DEP: "1.13.3" CYTHON_BUILD_DEP: "0.29.14" diff --git a/extra_functions.sh b/extra_functions.sh index 135f3757..e9e7c610 100644 --- a/extra_functions.sh +++ b/extra_functions.sh @@ -49,9 +49,3 @@ function teardown_test_venv { fi fi } - -function pip_wheel_cmd { - local abs_wheelhouse=$1 - echo "HELLO WOLRD" - pip wheel $(pip_opts) -w $abs_wheelhouse . -} From 7855274bd1bd4737f470a14492533994b6bb5584 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 9 May 2020 11:53:50 -0400 Subject: [PATCH 5/9] REV --- azure/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/windows.yml b/azure/windows.yml index f3650a8d..f267b1ef 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -8,7 +8,7 @@ jobs: pool: vmImage: ${{ parameters.vmImage }} variables: - BUILD_COMMIT: "0.23.X" + BUILD_COMMIT: "0.23.0rc1" SKLEARN_SKIP_NETWORK_TESTS: "1" NP_BUILD_DEP: "1.13.3" CYTHON_BUILD_DEP: "0.29.14" From 4d11900dc08e338935f1bd4013dc3c5369da45bc Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 9 May 2020 12:10:59 -0400 Subject: [PATCH 6/9] REV Just build --- azure-pipelines.yml | 6 ++++++ azure/windows.yml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ced72195..62199d81 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -24,16 +24,22 @@ jobs: 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" + NP_BUILD_DEP: "1.17.3" + SCIPY_BUILD_DEP: "1.4.1" NIGHTLY_BUILD: "true" py_3.8_64: PYTHON_VERSION: "3.8.x" + NP_BUILD_DEP: "1.17.3" + SCIPY_BUILD_DEP: "1.4.1" NIGHTLY_BUILD: "true" - template: azure/posix.yml diff --git a/azure/windows.yml b/azure/windows.yml index f267b1ef..2fd893e7 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 9d9cd2bf5537924cb998a25bbfa10d553219d437 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 9 May 2020 13:02:12 -0400 Subject: [PATCH 7/9] REV Less diffs --- 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 f68c9f35..02a1da01 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -82,7 +82,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 2fd893e7..f267b1ef 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 f566dbd7665461016bf6ab99bfc5af311807e81a Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 9 May 2020 13:07:28 -0400 Subject: [PATCH 8/9] REV Less diffs --- azure/posix.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/azure/posix.yml b/azure/posix.yml index 02a1da01..b4e9c5cd 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -11,6 +11,7 @@ jobs: REPO_DIR: "scikit-learn" BUILD_COMMIT: "0.23.0rc1" PLAT: "x86_64" + CYTHON_BUILD_DEP: "cython==0.29.14" NIGHTLY_BUILD_COMMIT: "master" NIGHTLY_BUILD: "false" TEST_DEPENDS: "pytest" @@ -60,6 +61,7 @@ jobs: - bash: | set -e pip install virtualenv + BUILD_DEPENDS="$CYTHON_BUILD_DEP" source multibuild/common_utils.sh source multibuild/travis_steps.sh @@ -82,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: eq(variables['SKIP_BUILD'], 'false') From 9bfce1bec02c5762b921065c61e71d9883d8efbd Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 9 May 2020 13:16:36 -0400 Subject: [PATCH 9/9] REV Less diffs --- azure/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/posix.yml b/azure/posix.yml index b4e9c5cd..3f254d36 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: eq(variables['SKIP_BUILD'], 'false')