github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-01-20 03:18:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Playing around with the renderable properties

Browse Source
This commit is contained in:
Jorrit Wronski
2015-07-09 22:02:50 +02:00
parent 9fcac57aed
commit fbebec00aa
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dev/buildbot/master/master.cfg
View File

@@ -278,25 +278,25 @@ def fixPermissions(factory):
def upload_command(factory, slavesrc, masterdest=None, branch=None, platform=None, pyID=None):
"""Upload files to the master server. Avoids buildbot upload on platforms other than Windows."""
if (masterdest is None and branch is None) or \
(masterdest is not None and branch is not None):
if (masterdest is not None and branch is not None):
raise ValueError("Unknown target, specify either \"masterdest\" or \"branch\".")
if (platform is not None and pyID is not None):
raise ValueError("Unknown target, specify either \"platform\" or \"pyID\".")
if masterdest is not None: target = masterdest
elif branch is not None: target = _master_loc_rel(branch)
else: target = master_loc_rel
if platform is None and pyID is None: # default
if masterdest is not None: target = masterdest
else: target = _master_loc_rel(branch)
factory.addStep(DirectoryUpload(slavesrc=slavesrc, masterdest=target))
elif (platform is not None and platform == 'windows') or \
(pyID is not None and checkID(pyID, teID=100, strict=False)):
if masterdest is not None: target = masterdest
else: target = _master_loc_rel(branch)
factory.addStep(DirectoryUpload(slavesrc=slavesrc, masterdest=target))
else:
if masterdest is not None: target = masterdest
else: target = _master_loc_abs(branch)
rsyncCommand = ' '.join(['rsync', '-a', '--stats', '{0}/ {1}'.format(slavesrc,masterdest)])
factory.addStep(ShellCommand(command=rsyncCommand, haltOnFailure = False))
elif branch is not None: target = _master_loc_abs(branch)
else: target = master_loc_abs
rsyncCommand = ['rsync', '-aP', '--no-perms', '--no-owner', '--no-group', '--stats', '{0}/'.format(slavesrc), target]
factory.addStep(ShellCommand(command=rsyncCommand, haltOnFailure = True))
fixPermissions(factory)
@@ -452,7 +452,7 @@ def pythonFactory(pyID, pyCFG=PythonSlaveConfig("name")):
factory.addStep(ShellCommand(command=combinedCMD(installCMD), workdir='build', haltOnFailure=True))
if buildPyPI or buildConda:
upload_command(factory, installFolder, branch=_branch, pyID=pyID)
upload_command(factory, installFolder, pyID=pyID)
return factory