Merge pull request #1965 from mdboom/simplify-travis

mdboom · mdboom · commit 51d1d878831e · 2013-05-01T06:00:01.000-07:00
Make the travis output quieter on v1.2.x
diff --git a/.travis.yml b/.travis.yml
@@ -4,19 +4,15 @@ python:
   - 2.6
   - 2.7
   - 3.2
+  - 3.3
 
 install:
-  - pip install --use-mirrors nose
-  # This is a workaround to install numpy with the version of
-  # virtualenv in Travis.  If that is updated in the future, this can
-  # be simplified to 'pip install numpy'
-  - 'if [ $TRAVIS_PYTHON_VERSION == "3.2" ]; then pip install https://github.com/y-p/numpy/archive/1.6.2_with_travis_fix.tar.gz; fi'
-  - 'if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then pip install numpy; fi' # should be nop if pre-installed
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then pip install --use-mirrors PIL; fi
-  - sudo apt-get update && sudo apt-get install inkscape
+  - pip -q install --use-mirrors nose numpy
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then pip -q install --use-mirrors PIL; fi
+  - sudo apt-get -qq update && sudo apt-get -qq install inkscape
   - python setup.py install
 
 script:
   - mkdir ../tmp_test_dir
   - cd ../tmp_test_dir
-  - python ../matplotlib/tests.py
+  - python ../matplotlib/tests.py -sv
