Skip to content

Commit

Permalink
nose-timer added to CI
Browse files Browse the repository at this point in the history
  • Loading branch information
giorgiop committed Nov 11, 2015
1 parent f49a558 commit 3fc29cd
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
5 changes: 2 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 .."
Expand All @@ -89,4 +89,3 @@ cache:
# container, speed up the appveyor jobs and reduce bandwidth
# usage on our rackspace account.
- '%APPDATA%\pip\Cache'

1 change: 1 addition & 0 deletions continuous_integration/appveyor/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ numpy==1.9.3
scipy==0.16.0
cython
nose
nose-timer
wheel
wheelhouse_uploader
5 changes: 4 additions & 1 deletion continuous_integration/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions continuous_integration/test_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?
Expand Down

0 comments on commit 3fc29cd

Please sign in to comment.