From b7c3d6219ce74b4d550c722101963662176c4855 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Fri, 14 Sep 2018 14:05:20 +0200 Subject: [PATCH 01/10] MAINT: pin numpy version in windows --- appveyor.yml | 7 +++++++ appveyor/requirements.txt | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 3bb4290e..e6a7b12a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,6 +16,8 @@ environment: # Make sure we don't download large datasets when running the test on # continuous integration platform SKLEARN_SKIP_NETWORK_TESTS: 1 + # Minimum numpy version + NP_BUILD_DEP: "1.9.3" matrix: - PYTHON: "C:\\Python27" @@ -45,18 +47,22 @@ environment: - PYTHON: "C:\\Python36" PYTHON_VERSION: "3.6.0" PYTHON_ARCH: "32" + NP_BUILD_DEP: "1.13.0" - PYTHON: "C:\\Python36-x64" PYTHON_VERSION: "3.6.0" PYTHON_ARCH: "64" + NP_BUILD_DEP: "1.13.0" - PYTHON: "C:\\Python37" PYTHON_VERSION: "3.7.0" PYTHON_ARCH: "32" + NP_BUILD_DEP: "1.14.5" - PYTHON: "C:\\Python37-x64" PYTHON_VERSION: "3.7.0" PYTHON_ARCH: "64" + NP_BUILD_DEP: "1.14.5" install: @@ -79,6 +85,7 @@ install: - "git reset --hard" # Install the build and runtime dependencies of the project. + - "%CMD_IN_ENV% pip install --timeout=60 --trusted-host 28daf2247a33ed269873-7b1aad3fab3cc330e1fd9d109892382a.r6.cf2.rackcdn.com numpy=%NP_BUILD_DEP%" - "%CMD_IN_ENV% pip install --timeout=60 --trusted-host 28daf2247a33ed269873-7b1aad3fab3cc330e1fd9d109892382a.r6.cf2.rackcdn.com -r ../appveyor/requirements.txt" - "%CMD_IN_ENV% python setup.py bdist_wheel" - ps: "ls dist" diff --git a/appveyor/requirements.txt b/appveyor/requirements.txt index 362648d9..e78a8e04 100644 --- a/appveyor/requirements.txt +++ b/appveyor/requirements.txt @@ -1,4 +1,4 @@ -numpy==1.14.5 +# numpy==1.14.5 scipy==1.1.0 cython==0.28.4 pytest From 6374b58731104d85350f0a7e2962e17292baa029 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Fri, 14 Sep 2018 14:25:16 +0200 Subject: [PATCH 02/10] FIX: syntax pin numpy --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index e6a7b12a..9a59a365 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -85,7 +85,7 @@ install: - "git reset --hard" # Install the build and runtime dependencies of the project. - - "%CMD_IN_ENV% pip install --timeout=60 --trusted-host 28daf2247a33ed269873-7b1aad3fab3cc330e1fd9d109892382a.r6.cf2.rackcdn.com numpy=%NP_BUILD_DEP%" + - "%CMD_IN_ENV% pip install --timeout=60 --trusted-host 28daf2247a33ed269873-7b1aad3fab3cc330e1fd9d109892382a.r6.cf2.rackcdn.com numpy==%NP_BUILD_DEP%" - "%CMD_IN_ENV% pip install --timeout=60 --trusted-host 28daf2247a33ed269873-7b1aad3fab3cc330e1fd9d109892382a.r6.cf2.rackcdn.com -r ../appveyor/requirements.txt" - "%CMD_IN_ENV% python setup.py bdist_wheel" - ps: "ls dist" From eecadb3df0bf02da141595028c702da74976a484 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Fri, 14 Sep 2018 15:36:59 +0200 Subject: [PATCH 03/10] MAINT: use only pypi --- appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9a59a365..75cca975 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,7 +17,7 @@ environment: # continuous integration platform SKLEARN_SKIP_NETWORK_TESTS: 1 # Minimum numpy version - NP_BUILD_DEP: "1.9.3" + NP_BUILD_DEP: "1.10.4" matrix: - PYTHON: "C:\\Python27" @@ -47,12 +47,12 @@ environment: - PYTHON: "C:\\Python36" PYTHON_VERSION: "3.6.0" PYTHON_ARCH: "32" - NP_BUILD_DEP: "1.13.0" + NP_BUILD_DEP: "1.12.1" - PYTHON: "C:\\Python36-x64" PYTHON_VERSION: "3.6.0" PYTHON_ARCH: "64" - NP_BUILD_DEP: "1.13.0" + NP_BUILD_DEP: "1.12.1" - PYTHON: "C:\\Python37" PYTHON_VERSION: "3.7.0" @@ -85,7 +85,7 @@ install: - "git reset --hard" # Install the build and runtime dependencies of the project. - - "%CMD_IN_ENV% pip install --timeout=60 --trusted-host 28daf2247a33ed269873-7b1aad3fab3cc330e1fd9d109892382a.r6.cf2.rackcdn.com numpy==%NP_BUILD_DEP%" + - "%CMD_IN_ENV% pip install --timeout=60 numpy==%NP_BUILD_DEP%" - "%CMD_IN_ENV% pip install --timeout=60 --trusted-host 28daf2247a33ed269873-7b1aad3fab3cc330e1fd9d109892382a.r6.cf2.rackcdn.com -r ../appveyor/requirements.txt" - "%CMD_IN_ENV% python setup.py bdist_wheel" - ps: "ls dist" From 9de900397328cf882d70d1293e5f16f6b07c6c9b Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Fri, 14 Sep 2018 16:22:44 +0200 Subject: [PATCH 04/10] MAINT: remove numpy from the requirements --- appveyor/requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor/requirements.txt b/appveyor/requirements.txt index e78a8e04..aedcd5c5 100644 --- a/appveyor/requirements.txt +++ b/appveyor/requirements.txt @@ -1,4 +1,3 @@ -# numpy==1.14.5 scipy==1.1.0 cython==0.28.4 pytest From 1d2cea1eace67151d7592ab12b7d0d7c3d779dcd Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Fri, 14 Sep 2018 18:30:39 +0200 Subject: [PATCH 05/10] FIX: remove rackspace repository --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 75cca975..7fc117bf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -86,7 +86,7 @@ install: # 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 --trusted-host 28daf2247a33ed269873-7b1aad3fab3cc330e1fd9d109892382a.r6.cf2.rackcdn.com -r ../appveyor/requirements.txt" + - "%CMD_IN_ENV% pip install --timeout=60 -r ../appveyor/requirements.txt" - "%CMD_IN_ENV% python setup.py bdist_wheel" - ps: "ls dist" From 590243cf9801ea8016ab71904929be577a924526 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Fri, 14 Sep 2018 19:52:30 +0200 Subject: [PATCH 06/10] TMP: bump version for python 3.5 --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 7fc117bf..9eb97cfb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -39,10 +39,12 @@ environment: - PYTHON: "C:\\Python35" PYTHON_VERSION: "3.5.2" PYTHON_ARCH: "32" + NP_BUILD_DEP: "1.12.1" - PYTHON: "C:\\Python35-x64" PYTHON_VERSION: "3.5.2" PYTHON_ARCH: "64" + NP_BUILD_DEP: "1.12.1" - PYTHON: "C:\\Python36" PYTHON_VERSION: "3.6.0" From bdf800c7ea00ab1fbc717930fb43377e69d39e38 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Fri, 14 Sep 2018 23:45:37 +0200 Subject: [PATCH 07/10] FIX: add specific version for testing --- appveyor.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9eb97cfb..34caf5ad 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,6 +18,7 @@ environment: SKLEARN_SKIP_NETWORK_TESTS: 1 # Minimum numpy version NP_BUILD_DEP: "1.10.4" + NP_TEST_DEP: "1.10.4" matrix: - PYTHON: "C:\\Python27" @@ -39,32 +40,36 @@ environment: - PYTHON: "C:\\Python35" PYTHON_VERSION: "3.5.2" PYTHON_ARCH: "32" - NP_BUILD_DEP: "1.12.1" + NP_TEST_DEP: "1.12.1" - PYTHON: "C:\\Python35-x64" PYTHON_VERSION: "3.5.2" PYTHON_ARCH: "64" - NP_BUILD_DEP: "1.12.1" + NP_TEST_DEP: "1.12.1" - PYTHON: "C:\\Python36" PYTHON_VERSION: "3.6.0" PYTHON_ARCH: "32" NP_BUILD_DEP: "1.12.1" + NP_TEST_DEP: "1.12.1" - PYTHON: "C:\\Python36-x64" PYTHON_VERSION: "3.6.0" PYTHON_ARCH: "64" NP_BUILD_DEP: "1.12.1" + NP_TEST_DEP: "1.12.1" - PYTHON: "C:\\Python37" PYTHON_VERSION: "3.7.0" PYTHON_ARCH: "32" NP_BUILD_DEP: "1.14.5" + NP_TEST_DEP: "1.14.5" - PYTHON: "C:\\Python37-x64" PYTHON_VERSION: "3.7.0" PYTHON_ARCH: "64" NP_BUILD_DEP: "1.14.5" + NP_TEST_DEP: "1.14.5" install: @@ -102,6 +107,8 @@ test_script: # Remove the source dir to make sure we run the tests on the # installed library. - "rd /s /q \"sklearn\"" + # Install the library version for testing + - "%CMD_IN_ENV% pip install --timeout=60 numpy==%NP_TEST_DEP%" # remove setup.cfg so as to not force --doctest-modules - "del setup.cfg" - "%CMD_IN_ENV% pytest -rs --pyargs sklearn" From 1d6b0eeae40ed9359cb97d1c9d63ced786dcd95d Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Sat, 15 Sep 2018 00:14:07 +0200 Subject: [PATCH 08/10] Update appveyor.yml --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 34caf5ad..809087d4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -40,12 +40,12 @@ environment: - PYTHON: "C:\\Python35" PYTHON_VERSION: "3.5.2" PYTHON_ARCH: "32" - NP_TEST_DEP: "1.12.1" + NP_TEST_DEP: "1.11.3" - PYTHON: "C:\\Python35-x64" PYTHON_VERSION: "3.5.2" PYTHON_ARCH: "64" - NP_TEST_DEP: "1.12.1" + NP_TEST_DEP: "1.11.3" - PYTHON: "C:\\Python36" PYTHON_VERSION: "3.6.0" From 594d94abc78a63e2d00d3330cf88b4555faf7ee1 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Sun, 16 Sep 2018 23:25:19 +0200 Subject: [PATCH 09/10] FIX: test using the last available release --- appveyor.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 809087d4..a9498f1a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,7 +18,6 @@ environment: SKLEARN_SKIP_NETWORK_TESTS: 1 # Minimum numpy version NP_BUILD_DEP: "1.10.4" - NP_TEST_DEP: "1.10.4" matrix: - PYTHON: "C:\\Python27" @@ -40,36 +39,30 @@ environment: - PYTHON: "C:\\Python35" PYTHON_VERSION: "3.5.2" PYTHON_ARCH: "32" - NP_TEST_DEP: "1.11.3" - PYTHON: "C:\\Python35-x64" PYTHON_VERSION: "3.5.2" PYTHON_ARCH: "64" - NP_TEST_DEP: "1.11.3" - PYTHON: "C:\\Python36" PYTHON_VERSION: "3.6.0" PYTHON_ARCH: "32" NP_BUILD_DEP: "1.12.1" - NP_TEST_DEP: "1.12.1" - PYTHON: "C:\\Python36-x64" PYTHON_VERSION: "3.6.0" PYTHON_ARCH: "64" NP_BUILD_DEP: "1.12.1" - NP_TEST_DEP: "1.12.1" - PYTHON: "C:\\Python37" PYTHON_VERSION: "3.7.0" PYTHON_ARCH: "32" NP_BUILD_DEP: "1.14.5" - NP_TEST_DEP: "1.14.5" - PYTHON: "C:\\Python37-x64" PYTHON_VERSION: "3.7.0" PYTHON_ARCH: "64" NP_BUILD_DEP: "1.14.5" - NP_TEST_DEP: "1.14.5" install: @@ -108,7 +101,7 @@ test_script: # installed library. - "rd /s /q \"sklearn\"" # Install the library version for testing - - "%CMD_IN_ENV% pip install --timeout=60 numpy==%NP_TEST_DEP%" + - "%CMD_IN_ENV% pip install -U --timeout=60 numpy # remove setup.cfg so as to not force --doctest-modules - "del setup.cfg" - "%CMD_IN_ENV% pytest -rs --pyargs sklearn" From 075163f32eedfd0d1b1b5edf1300ee9c895ca2e5 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Sun, 16 Sep 2018 23:29:15 +0200 Subject: [PATCH 10/10] FIX: syntax --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index a9498f1a..e90a1da0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -101,7 +101,7 @@ test_script: # installed library. - "rd /s /q \"sklearn\"" # Install the library version for testing - - "%CMD_IN_ENV% pip install -U --timeout=60 numpy + - "%CMD_IN_ENV% pip install -U --timeout=60 numpy" # remove setup.cfg so as to not force --doctest-modules - "del setup.cfg" - "%CMD_IN_ENV% pytest -rs --pyargs sklearn"