From 5ba5af02f1dda270a95cc96920dcc557989e9211 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Thu, 24 Oct 2019 11:00:24 -0400 Subject: [PATCH 01/26] BLD Build 3.8 --- .travis.yml | 17 +++++++++++++++++ appveyor.yml | 12 ++++++++++++ 2 files changed, 29 insertions(+) diff --git a/.travis.yml b/.travis.yml index c163c270..699a1df9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,12 +55,23 @@ matrix: - 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.14.5 + - 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.14.5 + - DAILY_BUILD=true - os: osx language: generic env: @@ -79,6 +90,12 @@ matrix: - 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.14.5 + - DAILY_BUILD=true before_install: - | diff --git a/appveyor.yml b/appveyor.yml index ca4fa109..e3659203 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -55,6 +55,18 @@ environment: NP_BUILD_DEP: "1.14.5" DAILY_BUILD: "true" + - PYTHON: "C:\\Python38" + PYTHON_VERSION: "3.8.0" + PYTHON_ARCH: "32" + NP_BUILD_DEP: "1.14.5" + DAILY_BUILD: "true" + + - PYTHON: "C:\\Python38-x64" + PYTHON_VERSION: "3.8.0" + PYTHON_ARCH: "64" + NP_BUILD_DEP: "1.14.5" + DAILY_BUILD: "true" + init: - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%" - "ECHO \"%APPVEYOR_SCHEDULED_BUILD%\"" From 89890083c908798c2f65ad46f758090fb67ec8af Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Thu, 24 Oct 2019 11:23:17 -0400 Subject: [PATCH 02/26] DEP Update multibuild --- multibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multibuild b/multibuild index 951b6c64..160edd79 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit 951b6c64f01853cf2569000bb30ecd01a16bba0b +Subproject commit 160edd796c25c0aa400b73ce79cecfa1758c181e From aae8b8ae947afc97637a9919b88a6f5578fd59f3 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 16 Nov 2019 07:51:35 -0800 Subject: [PATCH 03/26] BLD Builds python 3.8 --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 356cedf1..bc55babe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,8 +59,8 @@ matrix: env: - MB_PYTHON_VERSION=3.8 - NP_BUILD_DEP=numpy==1.14.5 - - DAILY_BUILD=true - - os: linux + - SCIPY_BUILD_DEP=scipy==1.3.2 # support 3.8 + - CYTHON_BUILD_DEP=cython==0.29.13 # recommened by numpy to support 3.8 env: - MB_PYTHON_VERSION=3.7 - PLAT=i686 @@ -73,8 +73,8 @@ matrix: - NP_BUILD_DEP=numpy==1.14.5 - DAILY_BUILD=true - os: osx - language: generic - env: + - SCIPY_BUILD_DEP=scipy==1.3.2 # support 3.8 + - CYTHON_BUILD_DEP=cython==0.29.13 # recommened by numpy to support 3.8 - MB_PYTHON_VERSION=3.5 - SCIPY_BUILD_DEP="scipy==0.18.1" - os: osx @@ -99,8 +99,8 @@ matrix: before_install: - | - if [ "$TRAVIS_EVENT_TYPE" == "cron" ]; then - if [ "$DAILY_BUILD" != "true" ]; then + - SCIPY_BUILD_DEP=scipy==1.3.2 # support 3.8 + - CYTHON_BUILD_DEP=cython==0.29.13 # recommened by numpy to support 3.8 exit 0 fi CONTAINER="sklearn-nightly" From d6a56b8c37ad853e17a94dbf128255322f9d6a3d Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 16 Nov 2019 07:54:54 -0800 Subject: [PATCH 04/26] BLD Comments --- .travis.yml | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index bc55babe..dfc58f3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,9 +58,13 @@ matrix: - os: linux env: - MB_PYTHON_VERSION=3.8 - - NP_BUILD_DEP=numpy==1.14.5 - - SCIPY_BUILD_DEP=scipy==1.3.2 # support 3.8 - - CYTHON_BUILD_DEP=cython==0.29.13 # recommened by numpy to support 3.8 + - NP_BUILD_DEP=numpy==1.17.4 + # min scipy support 3.8 + - SCIPY_BUILD_DEP=scipy==1.3.2 + # recommened by numpy to support 3.8 + - CYTHON_BUILD_DEP=cython==0.29.13 + - DAILY_BUILD=true + - os: linux env: - MB_PYTHON_VERSION=3.7 - PLAT=i686 @@ -70,11 +74,15 @@ matrix: env: - MB_PYTHON_VERSION=3.8 - PLAT=i686 - - NP_BUILD_DEP=numpy==1.14.5 + - NP_BUILD_DEP=numpy==1.17.4 + # min scipy support 3.8 + - SCIPY_BUILD_DEP=scipy==1.3.2 + - CYTHON_BUILD_DEP=cython==0.29.13 + # recommened by numpy to support 3.8 - DAILY_BUILD=true - os: osx - - SCIPY_BUILD_DEP=scipy==1.3.2 # support 3.8 - - CYTHON_BUILD_DEP=cython==0.29.13 # recommened by numpy to support 3.8 + language: generic + env: - MB_PYTHON_VERSION=3.5 - SCIPY_BUILD_DEP="scipy==0.18.1" - os: osx @@ -94,13 +102,17 @@ matrix: language: generic env: - MB_PYTHON_VERSION=3.8 - - NP_BUILD_DEP=numpy==1.14.5 + - NP_BUILD_DEP=numpy==1.17.4 + # support 3.8 + - SCIPY_BUILD_DEP=scipy==1.3.2 + # recommened by numpy to support 3.8 + - CYTHON_BUILD_DEP=cython==0.29.13 - DAILY_BUILD=true before_install: - | - - SCIPY_BUILD_DEP=scipy==1.3.2 # support 3.8 - - CYTHON_BUILD_DEP=cython==0.29.13 # recommened by numpy to support 3.8 + if [ "$TRAVIS_EVENT_TYPE" == "cron" ]; then + if [ "$DAILY_BUILD" != "true" ]; then exit 0 fi CONTAINER="sklearn-nightly" @@ -131,6 +143,6 @@ after_success: # Upload wheels to Rackspace container - pip install wheelhouse-uploader - python -m wheelhouse_uploader upload --local-folder - ${TRAVIS_BUILD_DIR}/wheelhouse/ - $UPLOAD_ARGS - $CONTAINER + ${TRAVIS_BUILD_DIR}/wheelhouse/ + $UPLOAD_ARGS + $CONTAINER From 2ba127fb1597f22f45f552cd3df834de9bf65773 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 16 Nov 2019 07:55:17 -0800 Subject: [PATCH 05/26] REV --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index dfc58f3e..be2b4363 100644 --- a/.travis.yml +++ b/.travis.yml @@ -143,6 +143,6 @@ after_success: # Upload wheels to Rackspace container - pip install wheelhouse-uploader - python -m wheelhouse_uploader upload --local-folder - ${TRAVIS_BUILD_DIR}/wheelhouse/ - $UPLOAD_ARGS - $CONTAINER + ${TRAVIS_BUILD_DIR}/wheelhouse/ + $UPLOAD_ARGS + $CONTAINER From 5f40db4af8f31f7c9cae3cda0c058cc127f21d29 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 16 Nov 2019 09:29:35 -0800 Subject: [PATCH 06/26] BLD Update requirements --- .travis.yml | 14 +++++++------- appveyor.yml | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index be2b4363..1157aa1c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,8 +59,8 @@ matrix: env: - MB_PYTHON_VERSION=3.8 - NP_BUILD_DEP=numpy==1.17.4 - # min scipy support 3.8 - - SCIPY_BUILD_DEP=scipy==1.3.2 + # use latest scipy for 3.8 support + - SCIPY_TEST_DEP=scipy # recommened by numpy to support 3.8 - CYTHON_BUILD_DEP=cython==0.29.13 - DAILY_BUILD=true @@ -75,10 +75,10 @@ matrix: - MB_PYTHON_VERSION=3.8 - PLAT=i686 - NP_BUILD_DEP=numpy==1.17.4 - # min scipy support 3.8 - - SCIPY_BUILD_DEP=scipy==1.3.2 - - CYTHON_BUILD_DEP=cython==0.29.13 + # use latest scipy for 3.8 support + - SCIPY_TEST_DEP=scipy # recommened by numpy to support 3.8 + - CYTHON_BUILD_DEP=cython==0.29.13 - DAILY_BUILD=true - os: osx language: generic @@ -103,8 +103,8 @@ matrix: env: - MB_PYTHON_VERSION=3.8 - NP_BUILD_DEP=numpy==1.17.4 - # support 3.8 - - SCIPY_BUILD_DEP=scipy==1.3.2 + # use latest scipy for 3.8 support + - SCIPY_TEST_DEP=scipy # recommened by numpy to support 3.8 - CYTHON_BUILD_DEP=cython==0.29.13 - DAILY_BUILD=true diff --git a/appveyor.yml b/appveyor.yml index 9472f288..c8586290 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -58,13 +58,13 @@ environment: - PYTHON: "C:\\Python38" PYTHON_VERSION: "3.8.0" PYTHON_ARCH: "32" - NP_BUILD_DEP: "1.14.5" + 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.14.5" + NP_BUILD_DEP: "1.17.4" DAILY_BUILD: "true" init: From 9bcbf81e4c2297ee4650136def117a0ed9d1993e Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 16 Nov 2019 09:30:57 -0800 Subject: [PATCH 07/26] BLD Update multibuild --- multibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multibuild b/multibuild index 160edd79..68a4af04 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit 160edd796c25c0aa400b73ce79cecfa1758c181e +Subproject commit 68a4af043e2adb0d9353d4a0e1f3d871203237aa From 11f49eac944347ebdfb21434158e3fc2f6e198a4 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 16 Nov 2019 15:25:55 -0800 Subject: [PATCH 08/26] WIP Update python 3.8 --- .travis.yml | 117 ++++++++++++++++++++++++---------------------------- 1 file changed, 54 insertions(+), 63 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1157aa1c..ee94a376 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,10 @@ env: - UNICODE_WIDTH=32 - NP_BUILD_DEP="numpy==1.11.0" - NP_TEST_DEP="numpy==1.16.3" - - CYTHON_BUILD_DEP="cython==0.29.7" + - CYTHON_BUILD_DEP="cython==0.29.13" - CYTHON_TEST_DEP="cython" - SCIPY_BUILD_DEP="scipy" - - SCIPY_TEST_DEP="scipy==1.3.0" + - SCIPY_TEST_DEP="scipy==1.3.2" - JOBLIB_BUILD_DEP="joblib==0.11" - JOBLIB_TEST_DEP="joblib" - DAILY_COMMIT=master @@ -30,83 +30,74 @@ matrix: # 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.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 - # use latest scipy for 3.8 support - - SCIPY_TEST_DEP=scipy - # recommened by numpy to support 3.8 - - CYTHON_BUILD_DEP=cython==0.29.13 - - DAILY_BUILD=true - - os: linux - env: - - MB_PYTHON_VERSION=3.7 - - PLAT=i686 - - NP_BUILD_DEP=numpy==1.14.5 + - 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 - # use latest scipy for 3.8 support - - SCIPY_TEST_DEP=scipy - # recommened by numpy to support 3.8 - - CYTHON_BUILD_DEP=cython==0.29.13 - - 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 + - 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 - # use latest scipy for 3.8 support - - SCIPY_TEST_DEP=scipy - # recommened by numpy to support 3.8 - - CYTHON_BUILD_DEP=cython==0.29.13 + - NP_TEST_DEP=numpy==1.17.4 - DAILY_BUILD=true before_install: From e310c4bcf20b3db0aeea5faf25a15def32b81912 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 16 Nov 2019 16:23:02 -0800 Subject: [PATCH 09/26] REV Enable other builds --- .travis.yml | 98 ++++++++++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/.travis.yml b/.travis.yml index ee94a376..55b0378d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,43 +30,43 @@ matrix: # 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.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.7 + - PLAT=i686 + - NP_BUILD_DEP=numpy==1.14.5 + - DAILY_BUILD=true - os: linux env: - MB_PYTHON_VERSION=3.8 @@ -74,24 +74,24 @@ matrix: - 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.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: From 0f4f05c5dfbdecbbbf5c778a7a24a743f1203a67 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 16 Nov 2019 16:27:08 -0800 Subject: [PATCH 10/26] WIP Test windows --- .travis.yml | 124 +++++++++++++++++++++++++-------------------------- appveyor.yml | 64 +++++++++++++------------- 2 files changed, 95 insertions(+), 93 deletions(-) diff --git a/.travis.yml b/.travis.yml index 55b0378d..b8b87acc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,68 +30,68 @@ matrix: # 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: 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: diff --git a/appveyor.yml b/appveyor.yml index c8586290..d2fd85ca 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,48 +23,50 @@ environment: 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:\\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" + SCIPY_BUILD_DEP: "1.3.2" DAILY_BUILD: "true" - PYTHON: "C:\\Python38-x64" PYTHON_VERSION: "3.8.0" PYTHON_ARCH: "64" NP_BUILD_DEP: "1.17.4" + SCIPY_BUILD_DEP: "1.3.2" DAILY_BUILD: "true" init: From 49154f60af3cc68810636c4afb0914995ebe0797 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 16 Nov 2019 17:14:24 -0800 Subject: [PATCH 11/26] BLD Update dependences --- appveyor.yml | 2 -- appveyor/requirements.txt | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index d2fd85ca..0ca132ef 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -59,14 +59,12 @@ environment: PYTHON_VERSION: "3.8.0" PYTHON_ARCH: "32" NP_BUILD_DEP: "1.17.4" - SCIPY_BUILD_DEP: "1.3.2" DAILY_BUILD: "true" - PYTHON: "C:\\Python38-x64" PYTHON_VERSION: "3.8.0" PYTHON_ARCH: "64" NP_BUILD_DEP: "1.17.4" - SCIPY_BUILD_DEP: "1.3.2" DAILY_BUILD: "true" init: diff --git a/appveyor/requirements.txt b/appveyor/requirements.txt index 8966319b..9a07786b 100644 --- a/appveyor/requirements.txt +++ b/appveyor/requirements.txt @@ -1,5 +1,5 @@ -scipy==1.1.0 -cython==0.29.7 +scipy==1.3.2 +cython==0.29.13 joblib pytest wheel From d82a1f3336ddad7557d51e1cee39db81034b7873 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sat, 16 Nov 2019 18:19:19 -0800 Subject: [PATCH 12/26] Allow other platforms --- .travis.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index b8b87acc..ee94a376 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,25 +55,25 @@ matrix: # - 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.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: 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: From 103a9c068f6733ce62e6523b7896df92c33af282 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sun, 17 Nov 2019 20:07:06 -0500 Subject: [PATCH 13/26] TST: Force CI to run From fdc7e749cb82c6c54851dcb088d7304781bb51e0 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Sun, 17 Nov 2019 22:05:50 -0500 Subject: [PATCH 14/26] BLD Allow 3.7 to build --- appveyor.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0ca132ef..76f8069e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,17 +43,17 @@ environment: # 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" + 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:\\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" From 7c90f86eb874896d1ba78b2c633dbfa6f8f8d003 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Mon, 18 Nov 2019 07:23:41 -0500 Subject: [PATCH 15/26] BLD Use scipy 1.3.1 --- appveyor.yml | 37 ++++++++++++++++++------------------- appveyor/requirements.txt | 2 +- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 76f8069e..b43e4aea 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,11 +43,11 @@ environment: # 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" + # 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" @@ -55,21 +55,20 @@ environment: 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" + # - 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%\"" + - 'ECHO "%APPVEYOR_SCHEDULED_BUILD%"' - ps: >- if ($env:APPVEYOR_SCHEDULED_BUILD -eq "True") { $env:CONTAINER = "sklearn-nightly" @@ -89,7 +88,7 @@ install: # Check that we have the expected version and architecture for Python - "python --version" - - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" + - 'python -c "import struct; print(struct.calcsize(''P'') * 8)"' - "pip --version" # Checkout the request scikit-learn version in the submodule @@ -114,7 +113,7 @@ build: false test_script: # Remove the source dir to make sure we run the tests on the # installed library. - - "rd /s /q \"sklearn\"" + - '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 diff --git a/appveyor/requirements.txt b/appveyor/requirements.txt index 9a07786b..75c0eb23 100644 --- a/appveyor/requirements.txt +++ b/appveyor/requirements.txt @@ -1,4 +1,4 @@ -scipy==1.3.2 +scipy==1.3.1 cython==0.29.13 joblib pytest From 4b0725d96b35daedb6e50214203823f7acb452c9 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Mon, 18 Nov 2019 07:43:13 -0500 Subject: [PATCH 16/26] BLD Use scipy 1.3.0 --- appveyor.yml | 2 +- appveyor/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b43e4aea..44ed90a8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -122,7 +122,7 @@ test_script: # 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" + - "%CMD_IN_ENV% pytest -rs --pyargs sklearn.cross_decomposition" artifacts: # Archive the generated wheel package in the ci.appveyor.com build report. diff --git a/appveyor/requirements.txt b/appveyor/requirements.txt index 75c0eb23..f66d7ad2 100644 --- a/appveyor/requirements.txt +++ b/appveyor/requirements.txt @@ -1,4 +1,4 @@ -scipy==1.3.1 +scipy==1.3.0 cython==0.29.13 joblib pytest From 07565158d0d29a14bdbf1dadc58d4cf1296fff02 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Mon, 18 Nov 2019 07:47:38 -0500 Subject: [PATCH 17/26] BLD Use scipy 1.2.2 --- appveyor/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor/requirements.txt b/appveyor/requirements.txt index f66d7ad2..c76bc8ba 100644 --- a/appveyor/requirements.txt +++ b/appveyor/requirements.txt @@ -1,4 +1,4 @@ -scipy==1.3.0 +scipy==1.2.2 cython==0.29.13 joblib pytest From 9c497cf82b32e63cf06d0b046ef8ddf74c6a5334 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Tue, 19 Nov 2019 01:50:30 -0500 Subject: [PATCH 18/26] TST Adds failing test back --- appveyor.yml | 11 ++++++----- appveyor/requirements.txt | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 44ed90a8..e4715863 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -60,11 +60,12 @@ environment: # 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" + + - 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%" diff --git a/appveyor/requirements.txt b/appveyor/requirements.txt index c76bc8ba..9a07786b 100644 --- a/appveyor/requirements.txt +++ b/appveyor/requirements.txt @@ -1,4 +1,4 @@ -scipy==1.2.2 +scipy==1.3.2 cython==0.29.13 joblib pytest From f2fbe9c89991291ed786755f0ee49e57d964203b Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Tue, 19 Nov 2019 12:51:35 -0500 Subject: [PATCH 19/26] REV Reverts to changes --- appveyor.yml | 68 ++++++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 62f868fb..18d7317e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,31 +23,31 @@ environment: 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:\\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" @@ -55,11 +55,11 @@ environment: 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" + 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" @@ -69,7 +69,7 @@ environment: init: - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%" - - 'ECHO "%APPVEYOR_SCHEDULED_BUILD%"' + - "ECHO \"%APPVEYOR_SCHEDULED_BUILD%\"" - ps: >- if ($env:APPVEYOR_SCHEDULED_BUILD -eq "True") { $env:CONTAINER = "sklearn-nightly" @@ -89,7 +89,7 @@ install: # Check that we have the expected version and architecture for Python - "python --version" - - 'python -c "import struct; print(struct.calcsize(''P'') * 8)"' + - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" - "pip --version" # Checkout the request scikit-learn version in the submodule @@ -114,7 +114,7 @@ build: false test_script: # Remove the source dir to make sure we run the tests on the # installed library. - - 'rd /s /q "sklearn"' + - "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 @@ -123,7 +123,7 @@ test_script: # 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.cross_decomposition" + - "%CMD_IN_ENV% pytest -rs --pyargs sklearn" artifacts: # Archive the generated wheel package in the ci.appveyor.com build report. From cdb832e852aacc4f1d9b03c8bd0703353978e5ee Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Tue, 19 Nov 2019 12:53:51 -0500 Subject: [PATCH 20/26] REV Reverts to changes --- .travis.yml | 98 ++++++++++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/.travis.yml b/.travis.yml index d2155ae4..1563d004 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,43 +30,43 @@ matrix: # 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.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.7 + - PLAT=i686 + - NP_BUILD_DEP=numpy==1.14.5 + - DAILY_BUILD=true - os: linux env: - MB_PYTHON_VERSION=3.8 @@ -74,24 +74,24 @@ matrix: - 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.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: From db29226a83adc2b1a302843c669d1cdfab025d3a Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Wed, 20 Nov 2019 16:18:41 +0100 Subject: [PATCH 21/26] add twine check --- .travis.yml | 3 ++- appveyor.yml | 1 + appveyor/requirements.txt | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3391d7a7..6c0a842f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -132,7 +132,8 @@ script: after_success: # Upload wheels to Rackspace container - - pip install wheelhouse-uploader + - 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 diff --git a/appveyor.yml b/appveyor.yml index e54a1bea..1fc8dab4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -104,6 +104,7 @@ install: - "%CMD_IN_ENV% pip install --timeout=60 -r ../appveyor/requirements.txt" - "%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" diff --git a/appveyor/requirements.txt b/appveyor/requirements.txt index 9a07786b..dbbc45b3 100644 --- a/appveyor/requirements.txt +++ b/appveyor/requirements.txt @@ -4,3 +4,4 @@ joblib pytest wheel wheelhouse_uploader +twine From e33a9b5747e92bede94015e32da7f8cb22663fc6 Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Wed, 20 Nov 2019 18:09:24 +0100 Subject: [PATCH 22/26] add missing * --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6c0a842f..b8404c76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -133,7 +133,7 @@ script: after_success: # Upload wheels to Rackspace container - pip install wheelhouse-uploader twine - - python -m twine check ${TRAVIS_BUILD_DIR}/wheelhouse/ + - python -m twine check ${TRAVIS_BUILD_DIR}/wheelhouse/* - python -m wheelhouse_uploader upload --local-folder ${TRAVIS_BUILD_DIR}/wheelhouse/ $UPLOAD_ARGS From 3b64c3f5d4dc0e0b767df6d16fad15e6e9fd90e0 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Thu, 21 Nov 2019 00:04:52 -0500 Subject: [PATCH 23/26] TST Try with 0.22.X --- appveyor.yml | 63 ++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 1fc8dab4..cd86d6bb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,8 @@ environment: global: - BUILD_COMMIT: 0.22rc2.post1 + # BUILD_COMMIT: 0.22rc2.post1 + BUILD_COMMIT: 0.22.X # 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 @@ -23,31 +24,31 @@ environment: 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:\\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" @@ -55,11 +56,11 @@ environment: 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" + # 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" From 89785f085313d8ae2c5a93035dffbcb158a3c8dd Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Thu, 21 Nov 2019 00:07:35 -0500 Subject: [PATCH 24/26] TST Master --- .appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index cd86d6bb..32ff28ae 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,7 +5,7 @@ environment: global: # BUILD_COMMIT: 0.22rc2.post1 - BUILD_COMMIT: 0.22.X + BUILD_COMMIT: master # 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 @@ -70,7 +70,7 @@ environment: init: - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%" - - "ECHO \"%APPVEYOR_SCHEDULED_BUILD%\"" + - 'ECHO "%APPVEYOR_SCHEDULED_BUILD%"' - ps: >- if ($env:APPVEYOR_SCHEDULED_BUILD -eq "True") { $env:CONTAINER = "sklearn-nightly" @@ -90,7 +90,7 @@ install: # Check that we have the expected version and architecture for Python - "python --version" - - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" + - 'python -c "import struct; print(struct.calcsize(''P'') * 8)"' - "pip --version" # Checkout the request scikit-learn version in the submodule @@ -116,7 +116,7 @@ build: false test_script: # Remove the source dir to make sure we run the tests on the # installed library. - - "rd /s /q \"sklearn\"" + - '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 From eb895a519c11ebd04540d82d9d8e62eff9b76225 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Thu, 21 Nov 2019 14:37:39 -0500 Subject: [PATCH 25/26] REV Reverts to changes --- .appveyor.yml | 60 +++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 32ff28ae..3ec82bfe 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -24,31 +24,31 @@ environment: 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:\\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" @@ -56,11 +56,11 @@ environment: 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" + 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" From 8bacb8602b4b6fbbb53f4dedfa3ebc40e2ec2dd9 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Thu, 21 Nov 2019 14:37:57 -0500 Subject: [PATCH 26/26] REV Reverts to changes --- .appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 3ec82bfe..664e5bb5 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -70,7 +70,7 @@ environment: init: - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%" - - 'ECHO "%APPVEYOR_SCHEDULED_BUILD%"' + - "ECHO \"%APPVEYOR_SCHEDULED_BUILD%\"" - ps: >- if ($env:APPVEYOR_SCHEDULED_BUILD -eq "True") { $env:CONTAINER = "sklearn-nightly" @@ -90,7 +90,7 @@ install: # Check that we have the expected version and architecture for Python - "python --version" - - 'python -c "import struct; print(struct.calcsize(''P'') * 8)"' + - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" - "pip --version" # Checkout the request scikit-learn version in the submodule @@ -116,7 +116,7 @@ build: false test_script: # Remove the source dir to make sure we run the tests on the # installed library. - - 'rd /s /q "sklearn"' + - "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