Skip to content

Commit

Permalink
Try to dig ourselves out of the --use-local/--no-update-deps mess.
Browse files Browse the repository at this point in the history
--use-local doens't do what I thought it does; it's equivalent
to --channel local, and so we want it essentially everywhere.
whitequark committed Nov 27, 2017
1 parent 1dabbb9 commit bd1c272
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions master.cfg
Original file line number Diff line number Diff line change
@@ -209,13 +209,16 @@ def addCondaUploadSteps(factory, channels, force=False):
env = condaEnv(),
locks = default_locks))

def addCondaSetupTestEnvironmentSteps(factory, packages=['python']):
def addCondaSetupTestEnvironmentSteps(factory, packages=['python'],
update_deps=False, use_local=True):
factory.addStep(
ShellCommand(
name = 'conda_create',
command = ['conda', 'create',
'-n', WithProperties(conda_env_name)] +
map(WithProperties, packages),
map(WithProperties, packages) +
([] if update_deps else ['--no-update-deps']) +
(['--use-local'] if use_local else []),
description = 'creating',
descriptionDone = 'create',
descriptionSuffix = 'test environment',
@@ -224,14 +227,16 @@ def addCondaSetupTestEnvironmentSteps(factory, packages=['python']):
locks = default_locks +
[conda_lock.access('exclusive')]))

def addCondaInstallSteps(factory, packages=[], no_update_deps=False):
def addCondaInstallSteps(factory, packages=[],
update_deps=False, use_local=True):
factory.addStep(
ShellCommand(
name = 'conda_install',
command = ['conda', 'install',
'-n', WithProperties(conda_env_name)] +
map(WithProperties, packages) +
(['--no-update-deps'] if no_update_deps else []),
([] if update_deps else ['--no-update-deps']) +
(['--use-local'] if use_local else []),
description = ['installing'] + packages,
descriptionDone = ['install'] + packages,
haltOnFailure = True,
@@ -579,8 +584,7 @@ addTriggerSteps(artiqBuildFactory,
set_properties={"package": test_board_package})
# Test ARTIQ with hardware in the loop
addCondaInstallSteps(artiqBuildFactory,
packages=[test_board_package],
no_update_deps=True)
packages=[test_board_package])
addFlockAcquireSteps(artiqBuildFactory,
board='kc705')
addARTIQFlashSteps(artiqBuildFactory,

0 comments on commit bd1c272

Please sign in to comment.