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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ before_install:
- mkdir -p "${HOME}/.cache/download"
- ci/install-edm.sh
- export PATH="${HOME}/edm/bin:/usr/lib/ccache:${PATH}"
- edm install -y wheel click coverage
- edm --config ci/.edm.yaml install -y wheel click coverage
install:
- for toolkit in ${TOOLKITS}; do
if [[ ${TRAVIS_EVENT_TYPE} == "cron" ]] ; then
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ init:

install:
- install-edm-windows.cmd
- edm install -y wheel click coverage
- edm --config ci\.edm.yaml install -y wheel click coverage
- appveyor-run.cmd install %runtime% %toolkits%
test_script:
- appveyor-run.cmd test %runtime% %toolkits%
3 changes: 3 additions & 0 deletions ci/.edm.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
store_url: https://packages.enthought.com
repositories:
- enthought/free
10 changes: 8 additions & 2 deletions ci/edmtool.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,9 @@
"help_option_names": ["-h", "--help"],
}

# Config file for EDM
EDM_CONFIG = os.path.join(ROOT, "ci", ".edm.yaml")


@click.group(context_settings=CONTEXT_SETTINGS)
def cli():
Expand All @@ -173,8 +176,9 @@ def install(runtime, toolkit, pillow, environment, source):
dependencies | extra_dependencies.get(toolkit, set()))
# edm commands to setup the development environment
commands = [
"edm environments create {environment} --force --version={runtime}",
"edm install -y -e {environment} {packages}",
("edm --config {edm_config} environments create {environment} "
"--force --version={runtime}"),
"edm --config {edm_config} install -y -e {environment} {packages}",
"edm run -e {environment} -- pip install {pillow}",
("edm run -e {environment} -- pip install -r ci/requirements.txt"
" --no-dependencies"),
Expand Down Expand Up @@ -362,6 +366,8 @@ def get_parameters(runtime, toolkit, pillow, environment):
environment = tmpl.format(**parameters)
environment += '-{}'.format(str(pillow).translate(pillow_trans))
parameters['environment'] = environment

parameters["edm_config"] = EDM_CONFIG
return parameters


Expand Down