Merge pull request #7 from jnothman/patch-1

ogrisel · web-flow · commit 35b76b959d13 · 2018-08-30T13:31:15.000+02:00
0.20rc1; fix not accessing correct installed sklearn path in AppVeyor
diff --git 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,11 +90,12 @@ 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% pytest --pyargs sklearn"
+  - "rd /s /q \"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 .."
diff --git a/scikit-learn b/scikit-learn
@@ -1 +1 @@
-Subproject commit cd7d9d985e1bbe2dbbbae17da0e9fbbba7e8c8c6
+Subproject commit eb6764936c9558553f7a7203a6aaa0ddc6497875
