github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-04-23 03:00:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make pip install more verbose; remove constants shared library if needed

Browse Source 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
This commit is contained in:
Ian Bell
2014-12-31 16:47:16 -05:00
parent 5341709dca
commit bd1e045a32
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -252,12 +252,6 @@ def websiteFactory(platform, gitMode='incremental', fullBuild=False):
# List the files in the dist directory
factory.addStep(ShellCommand(command=' '.join([docActivateCmd(), "ls", 'dist/*.*']), workdir= 'build/wrappers/Python', haltOnFailure = True))
# Install the wheel - this will uninstall the old version
factory.addStep(ShellCommand(command=' '.join([docActivateCmd(), "pip", "uninstall", "-y", "coolprop"]), workdir= 'build/wrappers/Python', haltOnFailure = False))
factory.addStep(ShellCommand(command=' '.join([docActivateCmd(), "pip", "uninstall", "-y", "coolprop"]), workdir= 'build/wrappers/Python', haltOnFailure = False))
factory.addStep(ShellCommand(command=' '.join([docActivateCmd(), "pip", "uninstall", "-y", "coolprop"]), workdir= 'build/wrappers/Python', haltOnFailure = False))
factory.addStep(ShellCommand(command=' '.join([docActivateCmd(), "pip", "uninstall", "-y", "coolprop"]), workdir= 'build/wrappers/Python', haltOnFailure = False))
factory.addStep(ShellCommand(command=' '.join([docActivateCmd(), "pip", "uninstall", "-y", "coolprop"]), workdir= 'build/wrappers/Python', haltOnFailure = False))
# Install the wheel - this will uninstall the old version
factory.addStep(ShellCommand(command=' '.join([docActivateCmd(), "pip", "-vvv", "install", "--force-reinstall", "--ignore-installed", "--upgrade", "--no-index", "--use-wheel", "`ls dist/CoolProp*.whl`"]), workdir= 'build/wrappers/Python', haltOnFailure = True))
# Remove the generated wheel
factory.addStep(ShellCommand(command=' '.join([docActivateCmd(), "rm", 'dist/*.whl']), workdir= 'build/wrappers/Python', haltOnFailure = True))

8
wrappers/Python/CoolProp/__init__.py
View File

@@ -1,5 +1,13 @@
from __future__ import absolute_import
# If there is a constants.[pyd|so|dylib] in the main directory, it will be imported instead of the constants.py file.
# It should be removed
import constants
if constants.__file__.rsplit('.', 1) not in ['pyc','pyo','py']:
print("constants shared library has been removed. Please restart your python code")
os.remove(constants.__file__)
quit()
try:
import matplotlib
except ImportError: