diff --git a/Installers/InstallCellModellerLinux64_public.sh b/Installers/InstallCellModellerLinux64_public.sh index b6d1ec70..cae1c6ef 100755 --- a/Installers/InstallCellModellerLinux64_public.sh +++ b/Installers/InstallCellModellerLinux64_public.sh @@ -21,7 +21,6 @@ echo echo 1. Installing CellModeller and dependencies via Anaconda... echo ------------------------------------------------------------ echo -source ~/.bash_profile command -v conda >/dev/null 2>&1 || { echo "You must install Anaconda before running this installer..." >&2; exit 1; } @@ -69,7 +68,10 @@ echo ------------------------------------------------------- echo # Put an environment variable in bash_profile to tell CellModeller where things are # Also append our bin dir to PATH +touch $HOME/.bashrc +touch $HOME/.bash_profile echo export CMPATH=$CMDIR >> $HOME/.bash_profile echo export "PATH=$BINDIR:$PATH" >> $HOME/.bash_profile -source ~/.bash_profile +echo export CMPATH=$CMDIR >> $HOME/.bashrc +echo export "PATH=$BINDIR:$PATH" >> $HOME/.bashrc diff --git a/Installers/InstallCellModellerOSX_public.command b/Installers/InstallCellModellerOSX_public.command index b6d1ec70..cae1c6ef 100755 --- a/Installers/InstallCellModellerOSX_public.command +++ b/Installers/InstallCellModellerOSX_public.command @@ -21,7 +21,6 @@ echo echo 1. Installing CellModeller and dependencies via Anaconda... echo ------------------------------------------------------------ echo -source ~/.bash_profile command -v conda >/dev/null 2>&1 || { echo "You must install Anaconda before running this installer..." >&2; exit 1; } @@ -69,7 +68,10 @@ echo ------------------------------------------------------- echo # Put an environment variable in bash_profile to tell CellModeller where things are # Also append our bin dir to PATH +touch $HOME/.bashrc +touch $HOME/.bash_profile echo export CMPATH=$CMDIR >> $HOME/.bash_profile echo export "PATH=$BINDIR:$PATH" >> $HOME/.bash_profile -source ~/.bash_profile +echo export CMPATH=$CMDIR >> $HOME/.bashrc +echo export "PATH=$BINDIR:$PATH" >> $HOME/.bashrc diff --git a/setup.py b/setup.py index e14bac4a..10b38e61 100644 --- a/setup.py +++ b/setup.py @@ -16,14 +16,14 @@ with open(version_py, 'r') as fh: version_git = open(version_py).read().strip().split('=')[-1].replace('"','') -version_msg = "# Do not edit this file, pipeline versioning is governed by git tags" -with open(version_py, 'w') as fh: - fh.write(version_msg + os.linesep + "__version__='" + version_git + "'") +#version_msg = "# Do not edit this file, pipeline versioning is governed by git tags" +#with open(version_py, 'w') as fh: +# fh.write(version_msg + os.linesep + "__version__='" + version_git + "'") setup(name='CellModeller', - install_requires=['numpy', 'scipy', 'pyopengl', 'pyopencl==2014.1'], - setup_requires=['numpy', 'scipy', 'pyopengl', 'pyopencl==2014.1'], + install_requires=['numpy', 'scipy', 'pyopengl', 'pyopencl==2014.1', 'reportlab', 'matplotlib'], + setup_requires=['numpy', 'scipy', 'pyopengl', 'pyopencl==2014.1', 'reportlab', 'matplotlib'], #setup_requires=['numpy', 'pyopengl', 'mako', 'pyopencl'], packages=['CellModeller', 'CellModeller.Biophysics', @@ -34,5 +34,5 @@ 'CellModeller.Signalling', 'CellModeller.GUI'], package_data={'':['*.cl','*.ui']}, - version=version_git + version=str(version_git) )