Skip to content

Commit

Permalink
Make Travis run the tests on python 3
Browse files Browse the repository at this point in the history
The python 3 tests are allowed to fail so they will not mark pull
requests as broken.
  • Loading branch information
jbarnoud committed Jan 25, 2016
1 parent fde8735 commit 18beb92
Showing 1 changed file with 20 additions and 14 deletions.
34 changes: 20 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
env:
global:
- secure: "HIj3p+p2PV8DBVg/KGUx6n83KwB0ASE5FwOn0SMB9zxnzAqe8sapwdBQdMdq0sXB7xT1spJqRxuxOMVEVn35BNLu7bxMLfa4287C8YXcomnvmv9xruxAsjsIewnNQ80vtPVbQddBPxa4jKbqgPby5QhhAP8KANAqYe44pIV70fY="
- GH_DOC_BRANCH: develop
- GH_REPOSITORY: github.com/MDAnalysis/mdanalysis.git
- GIT_CI_USER: TravisCI
- GIT_CI_EMAIL: TravisCI@mdanalysis.org
- MDA_DOCDIR: package/doc/html
matrix:
- SETUP=full CYTHONIZE=true
- SETUP=minimal CYTHONIZE=false
language: python
python:
- "2.7"
env:
global:
- secure: "HIj3p+p2PV8DBVg/KGUx6n83KwB0ASE5FwOn0SMB9zxnzAqe8sapwdBQdMdq0sXB7xT1spJqRxuxOMVEVn35BNLu7bxMLfa4287C8YXcomnvmv9xruxAsjsIewnNQ80vtPVbQddBPxa4jKbqgPby5QhhAP8KANAqYe44pIV70fY="
- GH_DOC_BRANCH: develop
- GH_REPOSITORY: github.com/MDAnalysis/mdanalysis.git
- GIT_CI_USER: TravisCI
- GIT_CI_EMAIL: TravisCI@mdanalysis.org
- MDA_DOCDIR: package/doc/html
matrix:
allow_failures:
- python: "3.3"
env: SETUP=full CYTHONIZE=true
include:
- python: "2.7"
env: SETUP=minimal CYTHONIZE=false
- python: "2.7"
env: SETUP=full CYTHONIZE=true
- python: "3.3"
env: SETUP=full CYTHONIZE=true
# command to install dependencies
addons:
apt:
Expand Down Expand Up @@ -41,7 +47,7 @@ install:
- chmod +x testsuite/MDAnalysisTests/mda_nosetests
# command to run tests
script:
- ./testsuite/MDAnalysisTests/mda_nosetests --with-coverage --cover-package MDAnalysis --processes=2 --process-timeout=300 --with-memleak
- ./testsuite/MDAnalysisTests/mda_nosetests --with-coverage --cover-package MDAnalysis --processes=2 --process-timeout=300 $( if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then echo '--with-memleak'; fi )
- |
test ${TRAVIS_PULL_REQUEST} == "false" && \
test ${TRAVIS_BRANCH} == ${GH_DOC_BRANCH} && \
Expand Down

0 comments on commit 18beb92

Please sign in to comment.