Skip to content

Commit

Permalink
Merge 3c86bf6 into 056f421
Browse files Browse the repository at this point in the history
  • Loading branch information
mdickinson committed May 6, 2014
2 parents 056f421 + 3c86bf6 commit 4a1cc43
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 23 deletions.
16 changes: 5 additions & 11 deletions .travis.yml
@@ -1,17 +1,12 @@
language: python
python:
- 3.3
- 3.2
- 2.7
- 2.6
virtualenv:
# This allows installing PyQt using apt-get and being able to import it.
system_site_packages: true
before_install:
# On Python 2.7 we install PyQt4 and run the UI tests.
- if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then source .travis_before_install; fi
- 2.7
- 3.2
- 3.3
- 3.4
install:
- pip install nose
- pip install -U nose
- if ! [[ $TRAVIS_PYTHON_VERSION > '2.6' ]]; then pip install unittest2 ; fi
- if [[ $TRAVIS_PYTHON_VERSION > '3.' ]]; then pip install numpy ; fi
- pip install cython
Expand All @@ -27,6 +22,5 @@ script:
notifications:
email:
- travis-ci@enthought.com
- hack@delley.net
after_success:
coveralls
12 changes: 0 additions & 12 deletions .travis_before_install

This file was deleted.

0 comments on commit 4a1cc43

Please sign in to comment.