Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Lifeware
biocham
Commits
567c1cd9
Commit
567c1cd9
authored
Jan 06, 2020
by
FAGES Francois
Browse files
merge
Merge branch 'develop' of gitlab.inria.fr:lifeware/biocham into develop
parents
8594410a
c2405e5a
Changes
5
Hide whitespace changes
Inline
Side-by-side
about.pl
View file @
567c1cd9
...
...
@@ -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'
...
...
biocham_jupyter/guinbextension/package.json
View file @
567c1cd9
{
"name"
:
"gui"
,
"version"
:
"4.3.
1
"
,
"version"
:
"4.3.
4
"
,
"description"
:
"biocham gui in jupyter notebook"
,
"main"
:
"src/index.js"
,
"scripts"
:
{
...
...
biocham_jupyter/kernel/biocham_kernel/__init__.py
View file @
567c1cd9
"""Example magic"""
__version__
=
'4.3.
1
'
__version__
=
'4.3.
4
'
install.sh
View file @
567c1cd9
...
...
@@ -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
...
...
web/index.html
View file @
567c1cd9
...
...
@@ -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>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment