github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-01-22 12:28:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ian Bell
2016-04-01 09:47:46 -06:00
parent 6b9cf3c9c0 17dd671d54
commit 173a5881fe
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -391,8 +391,8 @@ def websiteFactory(platform, fullBuild=False):
#
# Create the factory to add the actions to
factory = getBaseFactory()
# Upgrade cython if needed
factory.addStep(ShellCommand(command=' '.join([docActivateCmd(), "pip", "install", "--upgrade", "cython"]), workdir= 'build/wrappers/Python', haltOnFailure = True))
## Upgrade cython if needed
#factory.addStep(ShellCommand(command=' '.join([docActivateCmd(), "pip", "install", "--upgrade", "cython"]), workdir= 'build/wrappers/Python', haltOnFailure = True))
# Make a wheel - this is advantageous because it forces pip to uninstall coolprop, ensuring that all files installed are from this wheel
factory.addStep(ShellCommand(command=' '.join([docActivateCmd(), "python", "setup.py", "bdist_wheel", '--dist-dir', 'dist']), workdir= 'build/wrappers/Python', haltOnFailure = True))
# List the files in the dist directory
@@ -462,8 +462,8 @@ def pythonFactory(pyID, pyCFG=PythonSlaveConfig("name")):
#
# Create the factory to add the actions to
factory = getBaseFactory()
# Upgrade cython
factory.addStep(ShellCommand(command=combinedCMD('pip install --upgrade cython'), workdir=workingFolder, haltOnFailure=True))
## Upgrade cython
#factory.addStep(ShellCommand(command=combinedCMD('pip install --upgrade cython'), workdir=workingFolder, haltOnFailure=True))
#
# Install dependencies
if installPackages and False: # disabled