Arg, master.cfg kills me

This commit is contained in:
Jorrit Wronski
2015-07-06 15:18:39 +02:00
parent a6e4d2ecee
commit 4270095455

View File

@@ -381,7 +381,7 @@ def pythonFactory(pyID, pyCFG=PythonSlaveConfig("name"), gitMode='incremental'):
#
pkgs = ["requests", "jinja2", "pyyaml", "numpy", "scipy", "matplotlib", "pandas", "cython"]
if checkID(pyID, teID=100, strict=False): pkgs.extend(["unxutils","pywin32"]) # Add Windows-only dependency
installCMD = " ".join(["conda", "install", "-yq"] + " " + " ".join(pkgs))
installCMD = " ".join(["conda", "install", "-yq"]) + " " + " ".join(pkgs)
combinedCMD = " && ".join([activateCMD, installCMD])
factory.addStep(ShellCommand(command = combinedCMD, workdir = workingFolder, haltOnFailure = False))
#