Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ cache:

before_install:
- mkdir -p "${HOME}/.cache/download"
- export DISPLAY=:99.0
- if [[ ${TRAVIS_OS_NAME} == 'linux' ]]; then ./ci/install-edm-linux.sh; export PATH="${HOME}/edm/bin:${PATH}"; fi
- if [[ ${TRAVIS_OS_NAME} == 'osx' ]]; then ./ci/install-edm-osx.sh; export PATH="${PATH}:/usr/local/bin"; fi
- edm install --version ${RUNTIME} -y wheel numpy nose mock Sphinx coverage psutil
Expand All @@ -42,7 +41,11 @@ install:
- if [[ ${ETS_TOOLKIT} == 'wx' ]]; then edm install -y wxpython; fi
- if [[ ${ETS_TOOLKIT} == 'qt4' && ${RUNTIME} == '2.7' ]]; then edm install -y pyside; fi
- if [[ ${ETS_TOOLKIT} == 'qt4' && ${RUNTIME} == '3.6' ]]; then edm run -- pip install "pyqt5==5.10.1"; fi
- edm run -- pip install -r ci/ci-requirements.txt
- if [[ ${TRAVIS_EVENT_TYPE} == "cron" ]] ; then
edm run -- pip install -r ci/ci-src-requirements.txt ;
else
edm run -- pip install -r ci/ci-requirements.txt ;
fi;
- if [[ ${VTK} == '8' ]]; then edm run -- pip install vtk; fi
- if [[ ${VTK} != '8' ]]; then edm install -y vtk==7.0.0-3; fi
- edm run -- python -c "import vtk; print(vtk.vtkVersion.GetVTKSourceVersion())"
Expand Down
12 changes: 0 additions & 12 deletions .travis_before_install

This file was deleted.

10 changes: 10 additions & 0 deletions ci/ci-src-requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
pillow
mock
Sphinx
coverage
psutil
git+http://github.com/enthought/traits.git#egg=traits
git+http://github.com/enthought/traitsui.git#egg=traitsui
git+http://github.com/enthought/apptools.git#egg=apptools
git+http://github.com/enthought/pyface.git#egg=pyface
git+http://github.com/enthought/envisage.git#egg=envisage