Skip to content

improvements to install / testing [manually merge to master] #3659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 12 commits into from
Closed

improvements to install / testing [manually merge to master] #3659

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ee141f2
Nose and Mock as tests_require deps, test command
HolgerPeters Oct 16, 2014
896fa87
Feature test command in readme
HolgerPeters Oct 17, 2014
3fc9331
Rework test command for matplotlib
HolgerPeters Oct 21, 2014
a992a31
Travis should use setup.py
HolgerPeters Oct 21, 2014
97d5753
do not switch directories for tests
HolgerPeters Oct 21, 2014
e0bfc75
fix path to setup.py
HolgerPeters Oct 21, 2014
ace56df
fixup travis test invocation
HolgerPeters Oct 21, 2014
4c65d50
fix python setup.py test arguments
HolgerPeters Oct 21, 2014
cfbae33
fixup test command argument "--nocapture"
HolgerPeters Oct 21, 2014
e3d786c
fix format for python 2.6
HolgerPeters Oct 21, 2014
98d462f
fixup of python2.6 compatible formatting
HolgerPeters Oct 21, 2014
6fb68ad
Removed tests.py in favor of python setup.py test
HolgerPeters Oct 21, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Travis should use setup.py
  • Loading branch information
@HolgerPeters
HolgerPeters committed Oct 21, 2014
commit a992a31257a876944c1aa58893de36b1dfc81638
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ env:
- secure: RgJI7BBL8aX5FTOQe7xiXqWHMxWokd6GNUWp1NUV2mRLXPb9dI0RXqZt3UJwKTAzf1z/OtlHDmEkBoTVK81E9iUxK5npwyyjhJ8yTJmwfQtQF2n51Q1Ww9p+XSLORrOzZc7kAo6Kw6FIXN1pfctgYq2bQkrwJPRx/oPR8f6hcbY=
- secure: E7OCdqhZ+PlwJcn+Hd6ns9TDJgEUXiUNEI0wu7xjxB2vBRRIKtZMbuaZjd+iKDqCKuVOJKu0ClBUYxmgmpLicTwi34CfTUYt6D4uhrU+8hBBOn1iiK51cl/aBvlUUrqaRLVhukNEBGZcyqAjXSA/Qsnp2iELEmAfOUa92ZYo1sk=
- BUILD_DOCS=false
- TEST_ARGS=--no-pep8
- TEST_ARGS=--omit-pep8

language: python

Expand All @@ -16,7 +16,7 @@ matrix:
- python: 3.3
- python: 3.4
- python: 2.7
env: TEST_ARGS=--pep8
env: TEST_ARGS=--pep8-only
- python: 2.7
env: BUILD_DOCS=true

Expand All @@ -38,7 +38,7 @@ script:
- python -c "from matplotlib import font_manager"
- if [[ $BUILD_DOCS == false ]]; then mkdir ../tmp_test_dir; fi
- if [[ $BUILD_DOCS == false ]]; then cd ../tmp_test_dir; fi
- if [[ $BUILD_DOCS == false ]]; then python ../matplotlib/tests.py -sv --processes=8 --process-timeout=300 $TEST_ARGS; fi
- if [[ $BUILD_DOCS == false ]]; then python ../matplotlib/setup.py --nocapture --verbose --processes=8 --process-timeout=300 $TEST_ARGS; fi
- if [[ $BUILD_DOCS == true ]]; then cd doc; python make.py html --small; fi
# We don't build the LaTeX docs here, so linkchecker will complain
- if [[ $BUILD_DOCS == true ]]; then touch build/html/Matplotlib.pdf; fi
Expand Down