Commit 9ab7d965 authored by SOLIMAN Sylvain's avatar SOLIMAN Sylvain
Browse files

Merge branch 'master' into develop

parents 39b3f284 cde7cbbe
...@@ -200,6 +200,8 @@ gadagne_restart: gadagne ...@@ -200,6 +200,8 @@ gadagne_restart: gadagne
release: release:
@read -p "Version number (e.g. 4.1.0): " version && \ @read -p "Version number (e.g. 4.1.0): " version && \
sed -i'' -e "s/^version('.*')/version('$$version')/" about.pl && \ sed -i'' -e "s/^version('.*')/version('$$version')/" about.pl && \
sed -i'' -e "s/\"version\": \"\(.*\)\"/\"version\": \"$$version\"/" biocham_jupyter/guinbextension/package.json && \
sed -i'' -e "s/__version__ = '\(.*\)'/__version__ = '$$version'/" biocham_jupyter/kernel/biocham_kernel/__init__.py && \
LC_ALL=C sed -i'' -e "s+^<h1>version.*</h1>+<h1>version $$version $(shell date '+%B %Y')</h1>+" web/index.html && \ LC_ALL=C sed -i'' -e "s+^<h1>version.*</h1>+<h1>version $$version $(shell date '+%B %Y')</h1>+" web/index.html && \
git commit about.pl web/index.html -m "Version $$version" && \ git commit about.pl web/index.html -m "Version $$version" && \
git tag -a v$$version -m "Version $$version" && \ git tag -a v$$version -m "Version $$version" && \
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
about/0 about/0
]). ]).
version('4.2.0'). 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'
......
{ {
"name": "gui", "name": "gui",
"version": "4.1.29", "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": {
......
"""Example magic""" """Example magic"""
__version__ = '4.1.29' __version__ = '4.2.2'
...@@ -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
......
...@@ -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.0, 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