Simplify travis config

.travis.yml

@@ -1,38 +1,62 @@
 # vim ft=yaml
-# travis-ci.org definition for skimage build
+
+# After changing this file, check it on:
+#   http://lint.travis-ci.org/
+
 
 language: python
+
 python:
-    - "2.7"
-    - "3.2"
+    - 2.6
+
+matrix:
+    include:
+        - python: 2.7
+          env:
+            - PYTHON=python
+            - PYVER=2.x
+        - python: 3.2
+          env:
+            - PYTHON=python3
+            - PYVER=3.x
+    exclude:
+        - python: 2.6
+
 virtualenv:
     system_site_packages: true
+
 before_install:
-    - "export DISPLAY=:99.0"
-    - "sh -e /etc/init.d/xvfb start"
-    - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PYTHON=python; fi
-    - if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then export PYTHON=python3; fi
+    - export DISPLAY=:99.0
+    - sh -e /etc/init.d/xvfb start
+
     - sudo apt-get update
-    - sudo apt-get install $PYTHON-dev
     - sudo apt-get install $PYTHON-numpy
     - sudo apt-get install $PYTHON-scipy
     - sudo apt-get install libfreeimage3
-    - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then sudo apt-get install $PYTHON-qt4; fi
-    - if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then sudo apt-get install $PYTHON-pyqt4; fi
-    - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then sudo apt-get install $PYTHON-matplotlib; fi
-    - if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then sudo pip install matplotlib; fi
-    - sudo pip install cython
-    - sudo pip install flake8
-    - sudo pip install six
+
+    - if [[ $PYVER == '2.x' ]]; then
+    -   sudo apt-get install $PYTHON-qt4;
+    -   sudo apt-get install $PYTHON-matplotlib;
+    - fi
+    - if [[ $PYVER == '3.x' ]]; then
+    -   sudo apt-get install $PYTHON-pyqt4;
+    -   pip install matplotlib;
+    - fi
+
+    - pip install cython
+    - pip install flake8
+    - pip install six
+
+    - python check_bento_build.py
+
 install:
     - python setup.py build_ext --inplace
+
 script:
-    # Check if setup.py's match bento.info
-    - $PYTHON check_bento_build.py
     # Setup matplotlib settings
     - mkdir $HOME/.matplotlib
-    - "echo 'backend : Agg' > $HOME/.matplotlib/matplotlibrc"
-    - "echo 'backend.qt4 : PyQt4' >> $HOME/.matplotlib/matplotlibrc"
+    - echo 'backend : Agg' > $HOME/.matplotlib/matplotlibrc
+    - echo 'backend.qt4 : PyQt4' >> $HOME/.matplotlib/matplotlibrc
     # Run all tests
     - nosetests --exe -v --with-doctest --ignore-files='^\.' --ignore-files='^setup\.py$$' --ignore-files='^_test' skimage
     # Run all doc examples