From 53d9b3eca20ca241b020d4fa99ce9bc250ba61bc Mon Sep 17 00:00:00 2001 From: Joel Nothman Date: Wed, 22 Aug 2018 12:03:38 +1000 Subject: [PATCH 01/11] Get more verbosity from pip install --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index fc1aba03..9332d938 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -85,7 +85,7 @@ install: - ps: "ls dist" # Install the generated wheel package to test it - - "pip install --pre --no-index --find-links dist/ scikit-learn" + - "pip install --verbose --pre --no-index --find-links dist/ scikit-learn" # Not a .NET project, we build scikit-learn in the install step instead build: false From 33be5df0ef984a2088096bd8a90f6a0e3e3cc53c Mon Sep 17 00:00:00 2001 From: Joel Nothman Date: Wed, 22 Aug 2018 12:34:37 +1000 Subject: [PATCH 02/11] show me sys.path --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 9332d938..b8b84dd4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -85,7 +85,7 @@ install: - ps: "ls dist" # Install the generated wheel package to test it - - "pip install --verbose --pre --no-index --find-links dist/ scikit-learn" + - "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 @@ -95,6 +95,7 @@ test_script: # installed library. - "mkdir empty_folder" - "cd empty_folder" + - "%CMD_IN_ENV_DEEP% python -c "import sys; print(sys.path)" - "%CMD_IN_ENV_DEEP% pytest --pyargs sklearn" # Move back to the project folder From ee911d9124e8aada35d5c3c0e58cc5edc86e1f36 Mon Sep 17 00:00:00 2001 From: Joel Nothman Date: Wed, 22 Aug 2018 12:36:45 +1000 Subject: [PATCH 03/11] quotes --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index b8b84dd4..870d6da5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -95,7 +95,7 @@ test_script: # installed library. - "mkdir empty_folder" - "cd empty_folder" - - "%CMD_IN_ENV_DEEP% python -c "import sys; print(sys.path)" + - "%CMD_IN_ENV_DEEP% python -c \"import sys; print(sys.path)\"" - "%CMD_IN_ENV_DEEP% pytest --pyargs sklearn" # Move back to the project folder From 0905a84c19695309ce4ed6a24650521e9677b94f Mon Sep 17 00:00:00 2001 From: Joel Nothman Date: Wed, 22 Aug 2018 12:46:37 +1000 Subject: [PATCH 04/11] remove the source dir --- appveyor.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 870d6da5..7425601c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,6 @@ environment: # /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" - CMD_IN_ENV_DEEP: "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 @@ -91,12 +90,10 @@ install: build: false test_script: - # Change to a non-source folder to make sure we run the tests on the + # Remove the source dir to make sure we run the tests on the # installed library. - - "mkdir empty_folder" - - "cd empty_folder" - - "%CMD_IN_ENV_DEEP% python -c \"import sys; print(sys.path)\"" - - "%CMD_IN_ENV_DEEP% pytest --pyargs sklearn" + - "rd /s /q \"sklearn\"" + - "%CMD_IN_ENV% pytest --pyargs sklearn" # Move back to the project folder - "cd .." From 9cbd5b2f17f7d1fc3641840034d5fbb22b900c6d Mon Sep 17 00:00:00 2001 From: Joel Nothman Date: Thu, 23 Aug 2018 10:48:39 +1000 Subject: [PATCH 05/11] Update to master --- scikit-learn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikit-learn b/scikit-learn index cd7d9d98..9a86e397 160000 --- a/scikit-learn +++ b/scikit-learn @@ -1 +1 @@ -Subproject commit cd7d9d985e1bbe2dbbbae17da0e9fbbba7e8c8c6 +Subproject commit 9a86e39758c89f06022a7fe9b785164a6e181a3a From 347972aa05ec9a1b3df2e494a7f47e9c714c928f Mon Sep 17 00:00:00 2001 From: Joel Nothman Date: Thu, 23 Aug 2018 10:50:33 +1000 Subject: [PATCH 06/11] Don't use setup.cfg in pytest in appveyor --- appveyor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 7425601c..89d0b11a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -93,7 +93,9 @@ test_script: # Remove the source dir to make sure we run the tests on the # installed library. - "rd /s /q \"sklearn\"" - - "%CMD_IN_ENV% pytest --pyargs sklearn" + # remove setup.cfg so as to not force --doctest-modules + - "del setup.cfg" + - "%CMD_IN_ENV% pytest -rs --pyargs sklearn" # Move back to the project folder - "cd .." From 737b4df432e13c2efe52cc3b4fa023c9d8b22aa2 Mon Sep 17 00:00:00 2001 From: Joel Nothman Date: Sat, 25 Aug 2018 20:50:54 +1000 Subject: [PATCH 07/11] Update master --- scikit-learn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikit-learn b/scikit-learn index 9a86e397..b42a5152 160000 --- a/scikit-learn +++ b/scikit-learn @@ -1 +1 @@ -Subproject commit 9a86e39758c89f06022a7fe9b785164a6e181a3a +Subproject commit b42a5152af2cf51d9d7c30c40abc56bf0fe327f5 From 26d9cf548afb5371448464cbb27f1953adf3db7a Mon Sep 17 00:00:00 2001 From: Joel Nothman Date: Mon, 27 Aug 2018 16:41:54 +1000 Subject: [PATCH 08/11] Update to master --- scikit-learn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikit-learn b/scikit-learn index b42a5152..1c84b818 160000 --- a/scikit-learn +++ b/scikit-learn @@ -1 +1 @@ -Subproject commit b42a5152af2cf51d9d7c30c40abc56bf0fe327f5 +Subproject commit 1c84b818bb581484069e2bd347e9a777ed4737da From 26d6d3af4af25b46a73b40e6855738da68b3b829 Mon Sep 17 00:00:00 2001 From: Joel Nothman Date: Tue, 28 Aug 2018 09:21:26 +1000 Subject: [PATCH 09/11] Empty commit to see if coefs differ From f0e61c53b93905e2166d2bc9ac813ba2973cda3c Mon Sep 17 00:00:00 2001 From: Joel Nothman Date: Wed, 29 Aug 2018 17:48:30 +1000 Subject: [PATCH 10/11] Update to master --- scikit-learn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikit-learn b/scikit-learn index 1c84b818..b24ef363 160000 --- a/scikit-learn +++ b/scikit-learn @@ -1 +1 @@ -Subproject commit 1c84b818bb581484069e2bd347e9a777ed4737da +Subproject commit b24ef3631ac0d43c25fe5eab7081b2c6a07d45e3 From cf9ad386eafad63f119bb6e03d33d43d89fdc2a7 Mon Sep 17 00:00:00 2001 From: Joel Nothman Date: Thu, 30 Aug 2018 00:11:50 +1000 Subject: [PATCH 11/11] Update to 0.20rc1 --- scikit-learn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikit-learn b/scikit-learn index b24ef363..eb676493 160000 --- a/scikit-learn +++ b/scikit-learn @@ -1 +1 @@ -Subproject commit b24ef3631ac0d43c25fe5eab7081b2c6a07d45e3 +Subproject commit eb6764936c9558553f7a7203a6aaa0ddc6497875