update travis file

use more ci-helpers goodies.

.travis.yml

@@ -22,7 +22,7 @@ env:
     - BUILD_DOCS=false
     - PYTHON_VERSION=2.7
     - MAIN_CMD="python ./testsuite/MDAnalysisTests/mda_nosetests --processes=2 --process-timeout=400 --no-open-files --with-timer --timer-top-n 50"
-    - MAIN_CMD_OPTIONS=""
+    - SETUP_CMD=""
     - COVERALLS=false
     - BUILD_CMD="pip install -v package/ && pip install testsuite/"
     - CONDA_DEPENDENCIES="mmtf-python nose=1.3.7 mock six biopython networkx cython joblib nose-timer"
@@ -33,14 +33,15 @@ env:
     - CONDA_CHANNEL_PRIORITY=True
     - NUMPY_VERSION=stable
   matrix:
-    - NAME='minimal' PYTHON_VERSION=2.7 MAIN_CMD_OPTIONS='--with-memleak'
+    - NAME='minimal' PYTHON_VERSION=2.7 SETUP_CMD='--with-memleak'
 
 matrix:
   fast_finish: true
   include:
     - os: linux
       env: NAME="Doc"
-           MAIN_CMD="cd package && python setup.py build_sphinx"
+           MAIN_CMD="cd package && python setup.py"
+           SETUP_CMD="build_sphinx"
            BUILD_DOCS=true
            BUILD_CMD="cd ${TRAVIS_BUILD_DIR}/package && python setup.py build_ext --inplace"
            CONDA_DEPENDENCIES=${CONDA_ALL_DEPENDENCIES}
@@ -54,7 +55,7 @@ matrix:
 
     - os: linux
       env: NAME='full'
-           MAIN_CMD_OPTIONS='--with-coverage --cover-package MDAnalysis'
+           SETUP_CMD='--with-coverage --cover-package MDAnalysis'
            CONDA_DEPENDENCIES=${CONDA_ALL_DEPENDENCIES}
            COVERALLS='true'
 
@@ -83,14 +84,13 @@ install:
         HOLE_BINDIR="${HOME}/${MDA_OPTPACKAGES}/hole2/exe"; \
         export PATH=${PATH}:${HOLE_BINDIR}; \
     fi
-  - if [[ $BUILD_DOCS == "true" ]] ; then conda install sphinx=1.5.1; fi
   - eval $BUILD_CMD
 
 script:
   - cd ${TRAVIS_BUILD_DIR}
   - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then ulimit -S -n 2048; fi
-  - echo $MAIN_CMD $MAIN_CMD_OPTIONS
-  - eval $MAIN_CMD $MAIN_CMD_OPTIONS
+  - echo $MAIN_CMD $SETUP_CMD
+  - eval $MAIN_CMD $SETUP_CMD
 
 after_success:
   - if [[ $COVERALLS == 'true' ]]; then coveralls; fi