merge

Merge branch 'develop' of gitlab.inria.fr:lifeware/biocham into develop

merge
Merge branch 'develop' of gitlab.inria.fr:lifeware/biocham into develop
567c1cd9 · FAGES Francois · 8594410a · c2405e5a · 567c1cd9 · 567c1cd9
Commit 567c1cd9 authored Jan 06, 2020 by FAGES Francois
5 changed files
--- a/about.pl
+++ b/about.pl
@@ -8,7 +8,7 @@
    about/0
  ]).

-version('4.3.1').
+version('4.3.4').

 copyright(
  'Copyright (C) 2003-2020 Inria, EPI Lifeware, Saclay-Île de France, France'

--- a/biocham_jupyter/guinbextension/package.json
+++ b/biocham_jupyter/guinbextension/package.json
 {
  "name": "gui",
-  "version": "4.3.1",
+  "version": "4.3.4",
  "description": "biocham gui in jupyter notebook",
  "main": "src/index.js",
  "scripts": {

--- a/biocham_jupyter/kernel/biocham_kernel/__init__.py
+++ b/biocham_jupyter/kernel/biocham_kernel/__init__.py
 """Example magic"""
-__version__ = '4.3.1'
+__version__ = '4.3.4'
--- a/install.sh
+++ b/install.sh
@@ -119,22 +119,18 @@ fi

 ### Jupyter and python-sat
 packages='python-sat jupyter bokeh ipywidgets'
-if hash pip3 2>/dev/null
+if (hash pip3 2>/dev/null) || \
+  (hash pip 2> /dev/null) && [[ $(pip --version) == *"python 3"* ]]
 then
-  pip3 install -U $packages
-elif (hash pip 2> /dev/null) && [[ "pip --version" = "*python 3*" ]]
-then
-  pip install -U $packages
+  python3 -m pip install -U $packages
 else
  if hash conda 2>/dev/null
  then
    conda install -y pip
-    pip install -U $packages
  else
    if [[ "$conda_arch" == "Linux" ]]
    then
      sudo apt-get -qy install python3-pip
-      pip install -U $packages
    else
      # Note that miniconda is available through brew cask, but to avoid adding
      # brew cask if not necessary, we just do without
@@ -144,9 +140,9 @@ else
      echo 'export PATH=${HOME}/miniconda3/bin:${PATH}' >> ${HOME}/.profile
      export PATH=${HOME}/miniconda3/bin:${PATH}
      conda install -y pip
-      pip install -U $packages
    fi
  fi
+  python3 -m pip install -U $packages
 fi

 ### trust all our notebooks but make them read-only

--- a/web/index.html
+++ b/web/index.html
@@ -32,7 +32,7 @@
 </head>
 <body>
 <h1>The Biochemical Abstract Machine BIOCHAM 4</h1>
-<h1>version 4.3.1, January 2020</h1>
+<h1>version 4.3.4, January 2020</h1>

 <div class="authors">
 <p>