Merge pull request scikit-learn#5733 from giorgiop/trevis-with-timer

[MRG+2] MAINT nose-timer added to CIs

appveyor.yml

@@ -50,7 +50,7 @@ install:
   - "%CMD_IN_ENV% python setup.py bdist_wheel bdist_wininst -b doc/logos/scikit-learn-logo.bmp"
   - ps: "ls dist"
 
-  # Install the genreated wheel package to test it
+  # Install the generated wheel package to test it
   - "pip install --pre --no-index --find-links dist/ scikit-learn"
 
 # Not a .NET project, we build scikit-learn in the install step instead
@@ -62,7 +62,7 @@ test_script:
   - "mkdir empty_folder"
   - "cd empty_folder"
 
-  - "python -c \"import nose; nose.main()\" -s -v sklearn"
+  - "python -c \"import nose; nose.main()\" --with-timer --timer-top-n 20 -s -v sklearn"
 
   # Move back to the project folder
   - "cd .."
@@ -89,4 +89,3 @@ cache:
   # container, speed up the appveyor jobs and reduce bandwidth
   # usage on our rackspace account.
   - '%APPDATA%\pip\Cache'
-

continuous_integration/appveyor/requirements.txt

@@ -11,5 +11,6 @@ numpy==1.9.3
 scipy==0.16.0
 cython
 nose
+nose-timer
 wheel
 wheelhouse_uploader

continuous_integration/install.sh

@@ -57,6 +57,9 @@ if [[ "$DISTRIB" == "conda" ]]; then
         numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION cython=$CYTHON_VERSION
     source activate testenv
 
+    # Install nose-timer via pip
+    pip install nose-timer
+
     # Resolve MKL usage
     if [[ "$INSTALL_MKL" == "true" ]]; then
         conda install --yes mkl
@@ -72,7 +75,7 @@ elif [[ "$DISTRIB" == "ubuntu" ]]; then
     # Create a new virtualenv using system site packages for numpy and scipy
     virtualenv --system-site-packages testvenv
     source testvenv/bin/activate
-    pip install nose
+    pip install nose nose-timer
     pip install cython
 fi
 

continuous_integration/test_script.sh

@@ -23,9 +23,9 @@ python -c "import scipy; print('scipy %s' % scipy.__version__)"
 export SKLEARN_SKIP_NETWORK_TESTS=1
 
 if [[ "$COVERAGE" == "true" ]]; then
-    nosetests -s --with-coverage sklearn
+    nosetests -s --with-coverage --with-timer --timer-top-n 20 sklearn
 else
-    nosetests -s sklearn
+    nosetests -s --with-timer --timer-top-n 20 sklearn
 fi
 
 # Is directory still empty ?