Merge pull request #142 from enthought/add_wx_to_travis

Added installation of WX.

.travis.yml

@@ -6,20 +6,18 @@ 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
   - sudo apt-get update
   - sudo apt-get install python-numpy swig
-
+  - source .travis_before_install
 install:
   - pip install cython
   - pip install coveralls
   - pip install -r dev_requirements.txt
   - python setup.py develop
 script:
-  # Running all tests in chaco/tests and chaco/tests2
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then coverage run -m nose.core -v chaco; fi
-  # FIXME: tricky to install PyQt for version <= 2.6, only running chaco/tests
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then ETS_TOOLKIT='qt4' coverage run -p -m nose.core -v chaco; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then ETS_TOOLKIT='wx' coverage run -p -m nose.core -v chaco; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then coverage combine; fi
   - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then coverage run -m nose.core -v chaco/tests; fi
 notifications:
   email:

.travis_before_install

@@ -1,12 +1,7 @@
-# Set up PyQt4 for potential UI tests.
+# Set up PyQt4 and WX for UI tests.
 
 export DISPLAY=:99.0
 sh -e /etc/init.d/xvfb start
 
 sudo apt-get install python-qt4 python-qt4-dev python-sip python-qt4-gl libqt4-scripttools
-
-python -c 'import PyQt4'
-python -c 'import PyQt4.QtCore'
-python -c 'import PyQt4.QtGui'
-
-export ETS_TOOLKIT=qt4
+sudo apt-get install python-wxgtk2.8 python-wxtools wx2.8-i18n