Skip to content

Commit

Permalink
travis: Fix "and" condition and Py 3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
chfoo committed Oct 20, 2015
1 parent 3e97037 commit e7d8f96
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ python:
- 3.2
- 3.3
- 3.4
- 3.5
- pypy3

addons:
Expand Down Expand Up @@ -40,14 +41,14 @@ install:
# command to run tests
script:
- pip install . -t thematrix/ --no-dependencies
- if [[ $TRAVIS_PYTHON_VERSION != 'pypy3' -a $TRAVIS_PYTHON_VERSION != '3.2' ]]; then
- if [[ $TRAVIS_PYTHON_VERSION != 'pypy3' && $TRAVIS_PYTHON_VERSION != '3.2' ]]; then
cd thematrix/ && nosetests --with-coverage --cover-package=wpull --cover-branches;
else
cd thematrix/ && nosetests;
fi


after_success:
- if [[ $TRAVIS_PYTHON_VERSION != 'pypy3' -a $TRAVIS_PYTHON_VERSION != '3.2' ]]; then
- if [[ $TRAVIS_PYTHON_VERSION != 'pypy3' && $TRAVIS_PYTHON_VERSION != '3.2' ]]; then
coveralls;
fi

0 comments on commit e7d8f96

Please sign in to comment.