Skip to content

Commit

Permalink
Switch to the local conda environment entirely if use_local=True.
Browse files Browse the repository at this point in the history
whitequark committed Mar 26, 2018
1 parent 6014006 commit 6b585f3
Showing 1 changed file with 15 additions and 16 deletions.
31 changes: 15 additions & 16 deletions master.cfg
Original file line number Diff line number Diff line change
@@ -108,27 +108,26 @@ def nextSlave(builder, slave_builders):

conda_env_name = 'buildbot-%(buildername)s-%(buildnumber)s'
def condaEnv(use_local=False, extra_vars={}):
local_bin_path = '%(dirsep)s'.join([
'%(builddir)s', '..', 'miniconda',
'envs', conda_env_name, '%(condabindir)s'
])

global_bin_path = '%(dirsep)s'.join([
'%(builddir)s', '..', 'miniconda', '%(condabindir)s'
])

# python.exe is in miniconda/ on Windows
root_path = '%(dirsep)s'.join([
'%(builddir)s', '..', 'miniconda',
])
if use_local:
bin_path = '%(dirsep)s'.join([
'%(builddir)s', '..', 'miniconda', 'envs', conda_env_name, '%(condabindir)s'
])
root_path = '%(dirsep)s'.join([
'%(builddir)s', '..', 'miniconda', 'envs', conda_env_name
])
else:
bin_path = '%(dirsep)s'.join([
'%(builddir)s', '..', 'miniconda', '%(condabindir)s'
])
root_path = '%(dirsep)s'.join([
'%(builddir)s', '..', 'miniconda',
])

path_entries = [
WithProperties(global_bin_path),
WithProperties(bin_path),
WithProperties(root_path),
'${PATH}'
]
if use_local:
path_entries.insert(0, WithProperties(local_bin_path))

env = {
'PATH': path_entries,

0 comments on commit 6b585f3

Please sign in to comment.