From 9e017be77bdfde489a3a8d51d6db7aae4e1f3bb5 Mon Sep 17 00:00:00 2001 From: Tim Diller Date: Tue, 18 Feb 2014 14:56:59 +0000 Subject: [PATCH 1/2] fix travis config for seamless PIL installation --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd243ee36..fd11b35ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,19 +11,20 @@ before_install: install: # nose is already installed - pip install unittest2 - - pip install cython + - pip install cython - sudo apt-get install python-numpy - sudo apt-get install swig # Test against the current master of traits, traitsui and enable + - pip install PIL --allow-external PIL --allow-unverified PIL - pip install git+http://github.com/enthought/traits.git#egg=traits - pip install git+http://github.com/enthought/traitsui.git#egg=traitsui - pip install git+http://github.com/enthought/enable.git#egg=enable - python setup.py develop -script: +script: # Running all tests in chaco/tests and chaco/tests2 - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then nosetests -v chaco; fi # FIXME: tricky to install PyQt for version <= 2.6, only running chaco/tests - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then nosetests -v chaco/tests; fi notifications: email: - - travis-ci@enthought.com \ No newline at end of file + - travis-ci@enthought.com From e34aaed1c153926fb21f5efa4ab721e92a71aebd Mon Sep 17 00:00:00 2001 From: Jonathan Rocher Date: Tue, 18 Feb 2014 12:27:45 -0600 Subject: [PATCH 2/2] Added a comment to explain the need for the new pip install PIL --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fd11b35ae..0c5da3ccc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,9 +15,11 @@ install: - sudo apt-get install python-numpy - sudo apt-get install swig # Test against the current master of traits, traitsui and enable - - pip install PIL --allow-external PIL --allow-unverified PIL - pip install git+http://github.com/enthought/traits.git#egg=traits - pip install git+http://github.com/enthought/traitsui.git#egg=traitsui + # New version of pip does not install packages that are external to the pypi repositories. Since PIL is external and enable needs PIL, + # to install we have to tell pip to specifically allow PIL to be installed. + - pip install PIL --allow-external PIL --allow-unverified PIL - pip install git+http://github.com/enthought/enable.git#egg=enable - python setup.py develop script: