Skip to content

Commit ac3d08c

Browse files
authored
Merge branch 'master' into add-vim
2 parents 31262fe + ac657b7 commit ac3d08c

File tree

7 files changed

+19
-15
lines changed

7 files changed

+19
-15
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
dist: xenial
1+
dist: bionic
22
language: python
33
python:
44
- 3.7

all-spark-notebook/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ USER $NB_UID
2323

2424
# R packages
2525
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*' \
2828
'r-irkernel=1.1*' \
2929
'r-rcurl=1.98*' \
3030
'r-sparklyr=1.1*' \

base-notebook/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Ubuntu 18.04 (bionic)
55
# https://hub.docker.com/_/ubuntu/?tab=tags&name=bionic
66
# OS/ARCH: linux/amd64
7-
ARG ROOT_CONTAINER=ubuntu:bionic-20200219@sha256:0925d086715714114c1988f7c947db94064fd385e171a63c07730f1fa014e6f9
7+
ARG ROOT_CONTAINER=ubuntu:bionic-20200311@sha256:e5dd9dbb37df5b731a6688fa49f4003359f6f126958c9c928f937bec69836320
88
ARG BASE_CONTAINER=$ROOT_CONTAINER
99
FROM $BASE_CONTAINER
1010

datascience-notebook/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ USER $NB_UID
4545

4646
# R packages including IRKernel which gets installed globally.
4747
RUN conda install --quiet --yes \
48-
'r-base=3.6.2' \
48+
'r-base=3.6.3' \
4949
'r-caret=6.0*' \
5050
'r-crayon=1.3*' \
5151
'r-devtools=2.2*' \
52-
'r-forecast=8.10*' \
52+
'r-forecast=8.11*' \
5353
'r-hexbin=1.28*' \
5454
'r-htmltools=0.4*' \
5555
'r-htmlwidgets=1.5*' \
@@ -60,8 +60,8 @@ RUN conda install --quiet --yes \
6060
'r-rcurl=1.98*' \
6161
'r-reshape2=1.4*' \
6262
'r-rmarkdown=2.1*' \
63-
'r-rsqlite=2.1*' \
64-
'r-shiny=1.3*' \
63+
'r-rsqlite=2.2*' \
64+
'r-shiny=1.4*' \
6565
'r-tidyverse=1.3*' \
6666
'rpy2=3.1*' \
6767
&& \

r-notebook/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ USER $NB_UID
2525

2626
# R packages
2727
RUN conda install --quiet --yes \
28-
'r-base=3.6.2' \
28+
'r-base=3.6.3' \
2929
'r-caret=6.0*' \
3030
'r-crayon=1.3*' \
3131
'r-devtools=2.2*' \
@@ -41,7 +41,7 @@ RUN conda install --quiet --yes \
4141
'r-reshape2=1.4*' \
4242
'r-rmarkdown=2.1*' \
4343
'r-rodbc=1.3*' \
44-
'r-rsqlite=2.1*' \
44+
'r-rsqlite=2.2*' \
4545
'r-shiny=1.4*' \
4646
'r-tidyverse=1.3*' \
4747
'unixodbc=2.3.*' \

scipy-notebook/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ USER $NB_UID
1818
RUN conda install --quiet --yes \
1919
'beautifulsoup4=4.8.*' \
2020
'conda-forge::blas=*=openblas' \
21-
'bokeh=1.4.*' \
21+
'bokeh=2.0.*' \
2222
'cloudpickle=1.3.*' \
2323
'cython=0.29.*' \
24-
'dask=2.11.*' \
24+
'dask=2.14.*' \
2525
'dill=0.3.*' \
2626
'h5py=2.10.*' \
2727
'hdf5=1.10.*' \
2828
'ipywidgets=7.5.*' \
2929
'ipympl=0.5.*'\
30-
'matplotlib-base=3.1.*' \
30+
'matplotlib-base=3.2.*' \
3131
'numba=0.48.*' \
3232
'numexpr=2.7.*' \
3333
'pandas=1.0.*' \
@@ -53,8 +53,8 @@ RUN conda install --quiet --yes \
5353
jupyter labextension install @jupyter-widgets/jupyterlab-manager@^2.0.0 --no-build && \
5454
jupyter labextension install @bokeh/jupyter_bokeh@^2.0.0 --no-build && \
5555
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 && \
5858
npm cache clean --force && \
5959
rm -rf /home/$NB_USER/.cache/yarn && \
6060
rm -rf /home/$NB_USER/.node-gyp && \

test/helpers.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,11 @@ def _execute_command(self, command):
8787
@staticmethod
8888
def _packages_from_json(env_export):
8989
"""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"))
9091
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)
9195
packages_dict = dict()
9296
for split in map(lambda x: x.split("=", 1), dependencies):
9397
# default values

0 commit comments

Comments
 (0)