Make the travis output quieter on v1.2.x #1965

Merged
merged 1 commit into from May 1, 2013
View
14 .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'
@pelson
pelson May 1, 2013

This looked intentional, though I've no idea why it was here. I guess so long as the test all pass it is fine (this is just .travis.yml after all!).

@mdboom
mdboom May 1, 2013

Numpy 1.6.2 was released with a bug that made it incompatible with Python 3.2 on Travis, so we explicitly linked to a patched version. Now that Numpy 1.7 is out and is the default one gets from pip, there's no longer a need for this hack.

- - '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
@pelson
pelson May 1, 2013

I've been meaning to bring this up on the mailing list but PIL is a dead horse IMHO. Pillow seems to be the actively developed fork (I've had changes merged very quickly in pillow recently) so I wonder if we can get rid of the if statement and use is on all Python versions: https://pypi.python.org/pypi/Pillow/ .

Lets keep that out of this PR though.

@mdboom
mdboom May 1, 2013

Yeah -- maybe we should open an issue about moving to Pillow.

+ - 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