Permalink
Browse files

Simplify Python 3 statements under TravisCI, remove tail calls.

The tail calls are not really needed with the improved TravisCI
interface which collaspes each command's output by default.
Keeping the full output is useful when things break.
  • Loading branch information...
1 parent 7593e63 commit c77abb791d79905bda2eac7b714e147d4c5e214a @peterjc peterjc committed Apr 9, 2013
Showing with 9 additions and 7 deletions.
  1. +9 −7 .travis.yml
View
@@ -14,20 +14,22 @@ python:
- "pypy"
before_install:
- - "sudo apt-get install clustalw clustalo | tail -n 2"
- - "sudo apt-get install t-coffee muscle mafft probcons wise emboss 2>&1 | tail -n 2"
+ - "export PY3=no"
+ - "if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then export PY3=yes; fi"
+ - "if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then export PY3=yes; fi"
+ - "sudo apt-get install clustalw clustalo"
+ - "sudo apt-get install t-coffee muscle mafft probcons wise emboss"
#Installing psycopg2 does not work under PyPy or Jython
- "export PG=yes"
- "if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then export PG=no; fi"
- - "if [[ $PG == 'yes' ]]; then pip install psycopg2 --use-mirrors 2>&1 | tail -n 2; fi"
+ - "if [[ $PG == 'yes' ]]; then pip install psycopg2 --use-mirrors; fi"
#Installing mysql-python does not work under Python 3.2
- "export MSQL=$PG"
- - "if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then export MSQL=no; fi"
- - "if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then export MSQL=no; fi"
- - "if [[ $MSQL == 'yes' ]]; then pip install mysql-python --use-mirrors 2>&1 | tail -n 2; fi"
+ - "if [[ $PY3 == 'yes' ]]; then export MSQL=no; fi"
+ - "if [[ $MSQL == 'yes' ]]; then pip install mysql-python --use-mirrors; fi"
install:
- - "/usr/bin/yes | python setup.py install 2>&1 | tail -n 2"
+ - "/usr/bin/yes | python setup.py install"
before_script:
- cd Tests

0 comments on commit c77abb7

Please sign in to comment.