Merge branch 'master' of https://github.com/coolprop/coolprop

dev/buildbot/master/master.cfg

@@ -50,6 +50,7 @@ c['change_source'].append(GitPoller(
 from buildbot.process.factory import BuildFactory
 from buildbot.steps.source.git import Git
 from buildbot.steps.shell import ShellCommand
+from buildbot.steps.master import MasterShellCommand
 from buildbot.steps.slave import MakeDirectory, RemoveDirectory, CopyDirectory
 from buildbot.steps.transfer import DirectoryUpload, FileDownload
 from buildbot.process import properties
@@ -1059,18 +1060,23 @@ for platform in ['windows', 'linux', 'OSX']:
 @properties.renderer
 def releaseCommand(props):
     if props.getProperty('dryrun', default = False):
-        release = 'release'
-    else:
         release = 'dryrun'
+    else:
+        release = 'release'
         
     version = props.getProperty('version')
        
-    return ' '.join(['${HOME}/buildbot/CoolProp.git/dev/scripts/release.sh',version, release])
+    return ' '.join(['${HOME}/buildbot/CoolProp.git/dev/scripts/release.bsh',version, release])
         
+def release_builder():
+    f = BuildFactory()
+    f.addStep(MasterShellCommand(command = releaseCommand))
+    return f
+
 c['builders'].append(
         BuilderConfig(name="release version",
-          slavenames=["windows-slave"], # Slave is not used, all commands run on master
-          factory = MasterShellCommand(command = releaseCommand)
+          slavenames=["OSX-slave"], # Slave is not used, all commands run on master
+          factory = release_builder()
           )
           )
 
@@ -1097,7 +1103,7 @@ c['schedulers'].append(ForceScheduler(
                             name="release_scheduler",
                             builderNames=['release version'],
                             properties=[
-                                StringParameter(name="version", label="Version number", default="0.0.0")],
+                                StringParameter(name="version", label="Version number", default="0.0.0"),
                                 BooleanParameter(name="dryrun", label="Do a dry-run of release", default=True)]
                                 ))
 c['schedulers'].append(ForceScheduler(