diff --git a/.travis.yml b/.travis.yml index a46e72f..e2d312a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,11 @@ language: generic -sudo: false +dist: xenial +services: + - xvfb + env: global: - - INSTALL_EDM_VERSION=1.9.2 + - INSTALL_EDM_VERSION=3.2.3 PYTHONUNBUFFERED="1" @@ -39,8 +42,6 @@ cache: before_install: - mkdir -p "${HOME}/.cache/download" - export PATH="/usr/lib/ccache/usr/local/bin:${HOME}/edm/bin:${PATH}" - - export DISPLAY=:99.0 - - sh -e /etc/init.d/xvfb start - ccache -s install: - ./install-edm-linux.sh diff --git a/etstool.py b/etstool.py index 4c1c97f..5b83bef 100644 --- a/etstool.py +++ b/etstool.py @@ -154,7 +154,7 @@ def install(runtime, toolkit, environment, enaml, source): assert len(parameters['pip_packages']) == 0 # edm commands to setup the development environment commands = [ - "edm environments create {environment} --force --version={runtime}", + "edm environments create {environment} --force --version={runtime} --platform=rh6-x86_64", "edm install -y -e {environment} {test_packages} {edm_packages}", "edm run -e {environment} -- pip install ." ] diff --git a/install-edm-linux.sh b/install-edm-linux.sh index 4715066..342b56b 100755 --- a/install-edm-linux.sh +++ b/install-edm-linux.sh @@ -4,11 +4,11 @@ set -e install_edm() { local EDM_MAJOR_MINOR="$(echo "$INSTALL_EDM_VERSION" | sed -E -e 's/([[:digit:]]+\.[[:digit:]]+)\..*/\1/')" - local EDM_PACKAGE="edm_${INSTALL_EDM_VERSION}_linux_x86_64.sh" + local EDM_PACKAGE="edm_cli_${INSTALL_EDM_VERSION}_linux_x86_64.sh" local EDM_INSTALLER_PATH="${HOME}/.cache/download/${EDM_PACKAGE}" if [ ! -e "$EDM_INSTALLER_PATH" ]; then - curl -o "$EDM_INSTALLER_PATH" -L "https://package-data.enthought.com/edm/rh5_x86_64/${EDM_MAJOR_MINOR}/${EDM_PACKAGE}" + curl -o "$EDM_INSTALLER_PATH" -L "https://package-data.enthought.com/edm/rh6_x86_64/${EDM_MAJOR_MINOR}/${EDM_PACKAGE}" fi bash "$EDM_INSTALLER_PATH" -b -p "${HOME}/edm"