File tree Expand file tree Collapse file tree 7 files changed +19
-15
lines changed Expand file tree Collapse file tree 7 files changed +19
-15
lines changed Original file line number Diff line number Diff line change 1
- dist : xenial
1
+ dist : bionic
2
2
language : python
3
3
python :
4
4
- 3.7
Original file line number Diff line number Diff line change @@ -23,8 +23,8 @@ USER $NB_UID
23
23
24
24
# R packages
25
25
RUN conda install --quiet --yes \
26
- 'r-base=3.6.2 ' \
27
- 'r-ggplot2=3.2 *' \
26
+ 'r-base=3.6.3 ' \
27
+ 'r-ggplot2=3.3 *' \
28
28
'r-irkernel=1.1*' \
29
29
'r-rcurl=1.98*' \
30
30
'r-sparklyr=1.1*' \
Original file line number Diff line number Diff line change 4
4
# Ubuntu 18.04 (bionic)
5
5
# https://hub.docker.com/_/ubuntu/?tab=tags&name=bionic
6
6
# OS/ARCH: linux/amd64
7
- ARG ROOT_CONTAINER=ubuntu:bionic-20200219 @sha256:0925d086715714114c1988f7c947db94064fd385e171a63c07730f1fa014e6f9
7
+ ARG ROOT_CONTAINER=ubuntu:bionic-20200311 @sha256:e5dd9dbb37df5b731a6688fa49f4003359f6f126958c9c928f937bec69836320
8
8
ARG BASE_CONTAINER=$ROOT_CONTAINER
9
9
FROM $BASE_CONTAINER
10
10
Original file line number Diff line number Diff line change @@ -45,11 +45,11 @@ USER $NB_UID
45
45
46
46
# R packages including IRKernel which gets installed globally.
47
47
RUN conda install --quiet --yes \
48
- 'r-base=3.6.2 ' \
48
+ 'r-base=3.6.3 ' \
49
49
'r-caret=6.0*' \
50
50
'r-crayon=1.3*' \
51
51
'r-devtools=2.2*' \
52
- 'r-forecast=8.10 *' \
52
+ 'r-forecast=8.11 *' \
53
53
'r-hexbin=1.28*' \
54
54
'r-htmltools=0.4*' \
55
55
'r-htmlwidgets=1.5*' \
@@ -60,8 +60,8 @@ RUN conda install --quiet --yes \
60
60
'r-rcurl=1.98*' \
61
61
'r-reshape2=1.4*' \
62
62
'r-rmarkdown=2.1*' \
63
- 'r-rsqlite=2.1 *' \
64
- 'r-shiny=1.3 *' \
63
+ 'r-rsqlite=2.2 *' \
64
+ 'r-shiny=1.4 *' \
65
65
'r-tidyverse=1.3*' \
66
66
'rpy2=3.1*' \
67
67
&& \
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ USER $NB_UID
25
25
26
26
# R packages
27
27
RUN conda install --quiet --yes \
28
- 'r-base=3.6.2 ' \
28
+ 'r-base=3.6.3 ' \
29
29
'r-caret=6.0*' \
30
30
'r-crayon=1.3*' \
31
31
'r-devtools=2.2*' \
@@ -41,7 +41,7 @@ RUN conda install --quiet --yes \
41
41
'r-reshape2=1.4*' \
42
42
'r-rmarkdown=2.1*' \
43
43
'r-rodbc=1.3*' \
44
- 'r-rsqlite=2.1 *' \
44
+ 'r-rsqlite=2.2 *' \
45
45
'r-shiny=1.4*' \
46
46
'r-tidyverse=1.3*' \
47
47
'unixodbc=2.3.*' \
Original file line number Diff line number Diff line change @@ -18,16 +18,16 @@ USER $NB_UID
18
18
RUN conda install --quiet --yes \
19
19
'beautifulsoup4=4.8.*' \
20
20
'conda-forge::blas=*=openblas' \
21
- 'bokeh=1.4 .*' \
21
+ 'bokeh=2.0 .*' \
22
22
'cloudpickle=1.3.*' \
23
23
'cython=0.29.*' \
24
- 'dask=2.11 .*' \
24
+ 'dask=2.14 .*' \
25
25
'dill=0.3.*' \
26
26
'h5py=2.10.*' \
27
27
'hdf5=1.10.*' \
28
28
'ipywidgets=7.5.*' \
29
29
'ipympl=0.5.*' \
30
- 'matplotlib-base=3.1 .*' \
30
+ 'matplotlib-base=3.2 .*' \
31
31
'numba=0.48.*' \
32
32
'numexpr=2.7.*' \
33
33
'pandas=1.0.*' \
@@ -53,8 +53,8 @@ RUN conda install --quiet --yes \
53
53
jupyter labextension install @jupyter-widgets/jupyterlab-manager@^2.0.0 --no-build && \
54
54
jupyter labextension install @bokeh/jupyter_bokeh@^2.0.0 --no-build && \
55
55
jupyter labextension install jupyter-matplotlib@^0.7.2 --no-build && \
56
- jupyter lab build && \
57
- jupyter lab clean && \
56
+ jupyter lab build -y && \
57
+ jupyter lab clean -y && \
58
58
npm cache clean --force && \
59
59
rm -rf /home/$NB_USER/.cache/yarn && \
60
60
rm -rf /home/$NB_USER/.node-gyp && \
Original file line number Diff line number Diff line change @@ -87,7 +87,11 @@ def _execute_command(self, command):
87
87
@staticmethod
88
88
def _packages_from_json (env_export ):
89
89
"""Extract packages and versions from the lines returned by the list of specifications"""
90
+ #dependencies = filter(lambda x: isinstance(x, str), json.loads(env_export).get("dependencies"))
90
91
dependencies = json .loads (env_export ).get ("dependencies" )
92
+ # Filtering packages installed through pip in this case it's a dict {'pip': ['toree==0.3.0']}
93
+ # Since we only manage packages installed through conda here
94
+ dependencies = filter (lambda x : isinstance (x , str ), dependencies )
91
95
packages_dict = dict ()
92
96
for split in map (lambda x : x .split ("=" , 1 ), dependencies ):
93
97
# default values
You can’t perform that action at this time.
0 commit comments