Skip to content

Update edm and install/config scripts #492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rahulporuri merged 1 commit into from
Nov 18, 2019
Merged

Update edm and install/config scripts #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ addons:

env:
global:
- INSTALL_EDM_VERSION=1.11.0
- INSTALL_EDM_VERSION=2.0.0
PYTHONUNBUFFERED="1"

matrix:
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ environment:

global:
PYTHONUNBUFFERED: "1"
INSTALL_EDM_VERSION: "1.11.0"
INSTALL_EDM_VERSION: "2.0.0"

matrix:
- RUNTIME: '2.7'
Expand Down
6 changes: 3 additions & 3 deletions ci/install-edm-linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ 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"
}

install_edm
install_edm
2 changes: 1 addition & 1 deletion ci/install-edm-osx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ 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}.pkg"
local EDM_PACKAGE="edm_cli_${INSTALL_EDM_VERSION}.pkg"
local EDM_INSTALLER_PATH="${HOME}/.cache/download/${EDM_PACKAGE}"

if [ ! -e "$EDM_INSTALLER_PATH" ]; then
Expand Down
2 changes: 1 addition & 1 deletion install-edm-windows.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ FOR /F "tokens=1,2,3 delims=." %%a in ("%INSTALL_EDM_VERSION%") do (
)

SET EDM_MAJOR_MINOR=%MAJOR%.%MINOR%
SET EDM_PACKAGE=edm_%INSTALL_EDM_VERSION%_x86_64.msi
SET EDM_PACKAGE=edm_cli_%INSTALL_EDM_VERSION%_x86_64.msi
SET EDM_INSTALLER_PATH=%HOMEDRIVE%%HOMEPATH%\.cache\%EDM_PACKAGE%
SET COMMAND="(new-object net.webclient).DownloadFile('https://package-data.enthought.com/edm/win_x86_64/%EDM_MAJOR_MINOR%/%EDM_PACKAGE%', '%EDM_INSTALLER_PATH%')"

Expand Down