Don't bloat the waterfall so much.

m-labs · Jan 19, 2018 · 91a6c94 · 91a6c94
1 parent 1ec760b
commit 91a6c94
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/master.cfg b/master.cfg
@@ -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 +