Skip to content

Commit

Permalink
Get rid of %(pathsep).
Browse files Browse the repository at this point in the history
buildbot does this by itself.
whitequark committed Feb 15, 2018
1 parent d387b6d commit bded5fc
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions master.cfg
Original file line number Diff line number Diff line change
@@ -23,8 +23,8 @@ def merge(dicta, dictb):
result.update(dictb)
return result

lin_properties = { 'dirsep': '/', 'pathsep': ':', 'condabindir': 'bin' }
win_properties = { 'dirsep': '\\', 'pathsep': ';', 'condabindir': 'Scripts' }
lin_properties = { 'dirsep': '/', 'condabindir': 'bin' }
win_properties = { 'dirsep': '\\', 'condabindir': 'Scripts' }

# without max_builds=1, conda build --output breaks horribly.
c['slaves'] = [
@@ -120,10 +120,9 @@ def condaEnv(use_local=False, extra_vars={}):
path_entries = [global_bin_path, '${PATH}']
if use_local:
path_entries.insert(0, local_bin_path)
path = WithProperties('%(pathsep)s'.join(path_entries))

env = {
'PATH': path,
'PATH': path_entries,
'BUILDNUMBER': WithProperties('%(buildnumber)s'),
# otherwise, conda's stdout and tests' stderr output interleaves badly.
'PYTHONUNBUFFERED': '1'

0 comments on commit bded5fc

Please sign in to comment.