Merge branch 'hotfix/4.3.4'

71e891c9 · SOLIMAN Sylvain · 63bf19a8 · c28d7edc · 71e891c9 · 71e891c9
Commit 71e891c9 authored Jan 06, 2020 by SOLIMAN Sylvain
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,7 +66,7 @@ docker:
        - if [[ -n "$(docker images -f "dangling=true" -q)" ]] ; then docker rmi $(docker images -f "dangling=true" -q) ; fi
        - if [[ -n "$(docker images -q)" ]] ; then docker rmi $(docker images -q) ; fi
        - export IMAGE_TAG=$CI_REGISTRY_IMAGE${CI_COMMIT_TAG:+":$CI_COMMIT_TAG"}
-        - docker build --no-cache -t $IMAGE_TAG --build-arg tag=${CI_COMMIT_TAG:-latest} tmpnb/lifeware_biocham/ --build-arg PYTHON_VERSION=3.7
+        - docker build --no-cache -t $IMAGE_TAG --build-arg tag=${CI_COMMIT_TAG:-latest} tmpnb/lifeware_biocham/
        - docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY
        - docker push $IMAGE_TAG
        - docker rmi $IMAGE_TAG

--- a/about.pl
+++ b/about.pl
@@ -8,7 +8,7 @@
    about/0
  ]).

-version('4.3.3').
+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.3",
+  "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.3'
+__version__ = '4.3.4'
--- a/install.sh
+++ b/install.sh
@@ -120,7 +120,7 @@ fi
 ### Jupyter and python-sat
 packages='python-sat jupyter bokeh ipywidgets'
 if (hash pip3 2>/dev/null) || \
-  (hash pip 2> /dev/null) && [[ "pip --version" = "*python 3*" ]]
+  (hash pip 2> /dev/null) && [[ $(pip --version) == *"python 3"* ]]
 then
  python3 -m pip install -U $packages
 else

--- 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.3, January 2020</h1>
+<h1>version 4.3.4, January 2020</h1>

 <div class="authors">
 <p>