Skip to content

Commit

Permalink
Don't bloat the waterfall so much.
Browse files Browse the repository at this point in the history
whitequark committed Jan 19, 2018
1 parent 1ec760b commit 91a6c94
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions master.cfg
Original file line number Diff line number Diff line change
@@ -242,17 +242,17 @@ def addCondaSetupTestEnvironmentSteps(factory, packages=['python'],

def addCondaInstallSteps(factory, packages=[],
update_deps=False, use_local=True):
packages = map(WithProperties, packages)
packages_display = [re.sub("=.*", "", package) for package in packages]
factory.addStep(
ShellCommand(
name = 'conda_install',
command = ['conda', 'install',
'-n', WithProperties(conda_env_name)] +
packages +
map(WithProperties, packages) +
([] if update_deps else ['--no-update-deps']) +
(['--use-local'] if use_local else []),
description = ['installing'] + packages,
descriptionDone = ['install'] + packages,
description = ['installing'] + packages_display,
descriptionDone = ['install'] + packages_display,
haltOnFailure = True,
env = condaEnv(use_local=True),
locks = default_locks +

0 comments on commit 91a6c94

Please sign in to comment.