Use EDM for Travis CI builds

.travis.yml

@@ -1,57 +1,62 @@
-language: python
+language: generic
 sudo: false
-python:
-  - '2.7_with_system_site_packages'
-  - 3.4
+
 addons:
   apt:
     packages:
     - python-qt4
     - python-qt4-dev
     - python-qt4-gl
-    - python-pip
-    - python-numpy
     - python-wxtools
     - ccache
     - cmake
     - swig
     - zlib1g-dev
     - libpng-dev
     - libfreetype6-dev
-    - python-cairo
+    - libcairo2-dev
+
 env:
-  - ETS_TOOLKIT=wx PILLOW='pillow'
-  - ETS_TOOLKIT=qt4 PILLOW='pillow'
-  - ETS_TOOLKIT=null.image PILLOW='pillow<3.0.0'
-  - ETS_TOOLKIT=null.image PILLOW='pillow'
+  global:
+    - INSTALL_EDM_VERSION=1.5.2
+      PYTHONUNBUFFERED="1"
+
 matrix:
-  exclude:
-    - python: 3.4
-      env: ETS_TOOLKIT=wx PILLOW='pillow'
+  include:
+  - env: RUNTIME=2.7 TOOLKIT=wx PILLOW='pillow'
+  - env: RUNTIME=2.7 TOOLKIT=pyqt PILLOW='pillow'
+  - env: RUNTIME=3.5 TOOLKIT=pyqt PILLOW='pillow'
+  - env: RUNTIME=2.7 TOOLKIT=null PILLOW='pillow'
+  - env: RUNTIME=3.5 TOOLKIT=null PILLOW='pillow'
+  - env: RUNTIME=2.7 TOOLKIT=null PILLOW='pillow<3.0.0'
+  - env: RUNTIME=3.5 TOOLKIT=null PILLOW='pillow<3.0.0'
+  allow_failures:
+  - env: RUNTIME=2.7 TOOLKIT=wx PILLOW='pillow'
+  fast_finish: true
+
+branches:
+  only:
+    - master
+
 cache:
   directories:
     - $HOME/.cache
     - $HOME/.ccache
+
 before_install:
   - ccache -s
-  - export PATH=/usr/lib/ccache:${PATH}
-  - pip install --upgrade pip
-  - if [[ ${TRAVIS_PYTHON_VERSION} == "3.4" && ${ETS_TOOLKIT} == "qt4" ]]; then ./build_pyside_wheel.sh; fi
-  # setup X11 for the tests
+  - mkdir -p "${HOME}/.cache/download"
+  - ci/install-edm.sh
+  - export PATH="${HOME}/edm/bin:/usr/lib/ccache:${PATH}"
+  - edm install -y wheel click coverage
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 install:
-  # Install pillow separately to control the version
-  - pip install $PILLOW
-  - pip install -r travis-ci-requirements
-  - python setup.py develop
-before_script:
-  - mkdir testrunner
-  - cp .coveragerc testrunner
-  - cd testrunner
+  - edm run -- python ci/edmtool.py install --runtime=${RUNTIME} --toolkit=${TOOLKIT} --pillow=${PILLOW}
 script:
-  - coverage run -m nose.core enable -v
-  - coverage run -a -m nose.core kiva -v
+  - edm run -- python ci/edmtool.py test --runtime=${RUNTIME} --toolkit=${TOOLKIT} --pillow=${PILLOW}
+
 after_success:
-  - pip install codecov
-  - codecov
+  - edm run -- coverage combine
+  - edm run -- pip install codecov
+  - edm run -- codecov