Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

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

Merged
merged 1 commit into from

2 participants

Michael Droettboom Phil Elson
Michael Droettboom
Owner

@pelson: You may be interested in this.

I have also done another version of this on master (since .travis.yml has diverged a lot) as part of #1951.

Phil Elson pelson commented on the diff
.travis.yml
((5 lines not shown))
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'
Phil Elson Collaborator
pelson added a note

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!).

Michael Droettboom Owner
mdboom added a note

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Michael Droettboom mdboom merged commit 51d1d87 into from
Phil Elson pelson commented on the diff
.travis.yml
((5 lines not shown))
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
Phil Elson Collaborator
pelson added a note

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.

Michael Droettboom Owner
mdboom added a note

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Damon McDougall dmcdougall referenced this pull request
Merged

PIL -> Pillow #2137

Michael Droettboom mdboom deleted the branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on May 1, 2013
  1. Michael Droettboom

    Make the travis output slightly quieter, particularly when installing…

    mdboom authored
    … dependencies. Add Python 3.3 to the tests.
This page is out of date. Refresh to see the latest.
Showing with 5 additions and 9 deletions.
  1. +5 −9 .travis.yml
14 .travis.yml
View
@@ -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'
Phil Elson Collaborator
pelson added a note

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!).

Michael Droettboom Owner
mdboom added a note

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
- - '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
Phil Elson Collaborator
pelson added a note

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.

Michael Droettboom Owner
mdboom added a note

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
+ - 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
Something went wrong with that request. Please try again.