Skip to content
GitLab
Commit cde7cbbe authored by SOLIMAN Sylvain's avatar SOLIMAN Sylvain
Browse files

conda has no python-sat, but has pip

parent 8c504c32
Hide whitespace changes
Inline Side-by-side
about.pl
View file @ cde7cbbe
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
about/0 about/0
]). ]).
version('4.2.1'). version('4.2.2').
copyright( copyright(
'Copyright (C) 2003-2019 Inria, EPI Lifeware, Saclay-Île de France, France' 'Copyright (C) 2003-2019 Inria, EPI Lifeware, Saclay-Île de France, France'
......
biocham_jupyter/guinbextension/package.json
View file @ cde7cbbe
{ {
"name": "gui", "name": "gui",
"version": "4.2.1", "version": "4.2.2",
"description": "biocham gui in jupyter notebook", "description": "biocham gui in jupyter notebook",
"main": "src/index.js", "main": "src/index.js",
"scripts": { "scripts": {
......
biocham_jupyter/kernel/biocham_kernel/__init__.py
View file @ cde7cbbe
"""Example magic""" """Example magic"""
__version__ = '4.2.1' __version__ = '4.2.2'
install.sh
View file @ cde7cbbe
...@@ -122,15 +122,19 @@ packages='python-sat jupyter bokeh ipywidgets' ...@@ -122,15 +122,19 @@ packages='python-sat jupyter bokeh ipywidgets'
if hash pip3 2>/dev/null if hash pip3 2>/dev/null
then then
pip3 install -U $packages pip3 install -U $packages
elif (hash pip 2> /dev/null) && [[ "pip --version" = "*python 3*" ]]
then
pip install -U $packages
else else
if hash conda 2>/dev/null if hash conda 2>/dev/null
then then
conda install -y $packages conda install -y pip
pip install -U $packages
else else
if [[ "$conda_arch" == "Linux" ]] if [[ "$conda_arch" == "Linux" ]]
then then
sudo apt-get -qy install python3-pip sudo apt-get -qy install python3-pip
pip3 install -U $packages pip install -U $packages
else else
# Note that miniconda is available through brew cask, but to avoid adding # Note that miniconda is available through brew cask, but to avoid adding
# brew cask if not necessary, we just do without # brew cask if not necessary, we just do without
...@@ -139,7 +143,8 @@ else ...@@ -139,7 +143,8 @@ else
./Miniconda3-latest-${conda_arch}-x86_64.sh -b -p ${HOME}/miniconda3 ./Miniconda3-latest-${conda_arch}-x86_64.sh -b -p ${HOME}/miniconda3
echo 'export PATH=${HOME}/miniconda3/bin:${PATH}' >> ${HOME}/.profile echo 'export PATH=${HOME}/miniconda3/bin:${PATH}' >> ${HOME}/.profile
export PATH=${HOME}/miniconda3/bin:${PATH} export PATH=${HOME}/miniconda3/bin:${PATH}
conda install -y $packages conda install -y pip
pip install -U $packages
fi fi
fi fi
fi fi
......
web/index.html
View file @ cde7cbbe
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</head> </head>
<body> <body>
<h1>The Biochemical Abstract Machine BIOCHAM 4</h1> <h1>The Biochemical Abstract Machine BIOCHAM 4</h1>
<h1>version 4.2.1, August 2019</h1> <h1>version 4.2.2, August 2019</h1>
<div class="authors"> <div class="authors">
<p> <p>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment