Skip to content

Commit bfb2be7

Browse files
authored
Merge pull request #1076 from romainx/update_2020_w18
Regular update 2020 W18
2 parents f9b134f + 7a239a1 commit bfb2be7

File tree

6 files changed

+34
-13
lines changed

6 files changed

+34
-13
lines changed

all-spark-notebook/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN conda install --quiet --yes \
2727
'r-ggplot2=3.3*' \
2828
'r-irkernel=1.1*' \
2929
'r-rcurl=1.98*' \
30-
'r-sparklyr=1.1*' \
30+
'r-sparklyr=1.2*' \
3131
&& \
3232
conda clean --all -f -y && \
3333
fix-permissions $CONDA_DIR && \

base-notebook/Dockerfile

Lines changed: 2 additions & 2 deletions
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-20200311@sha256:e5dd9dbb37df5b731a6688fa49f4003359f6f126958c9c928f937bec69836320
7+
ARG ROOT_CONTAINER=ubuntu:bionic-20200403@sha256:b58746c8a89938b8c9f5b77de3b8cf1fe78210c696ab03a1442e235eea65d84f
88
ARG BASE_CONTAINER=$ROOT_CONTAINER
99
FROM $BASE_CONTAINER
1010

@@ -112,7 +112,7 @@ RUN conda install --quiet --yes 'tini=0.18.0' && \
112112
RUN conda install --quiet --yes \
113113
'notebook=6.0.3' \
114114
'jupyterhub=1.1.0' \
115-
'jupyterlab=2.0.1' && \
115+
'jupyterlab=2.1.1' && \
116116
conda clean --all -f -y && \
117117
npm cache clean --force && \
118118
jupyter notebook --generate-config && \

datascience-notebook/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ RUN apt-get update && \
2323
# install Julia packages in /opt/julia instead of $HOME
2424
ENV JULIA_DEPOT_PATH=/opt/julia
2525
ENV JULIA_PKGDIR=/opt/julia
26-
ENV JULIA_VERSION=1.3.1
26+
ENV JULIA_VERSION=1.4.1
2727

2828
RUN mkdir /opt/julia-${JULIA_VERSION} && \
2929
cd /tmp && \
3030
wget -q https://julialang-s3.julialang.org/bin/linux/x64/`echo ${JULIA_VERSION} | cut -d. -f 1,2`/julia-${JULIA_VERSION}-linux-x86_64.tar.gz && \
31-
echo "faa707c8343780a6fe5eaf13490355e8190acf8e2c189b9e7ecbddb0fa2643ad *julia-${JULIA_VERSION}-linux-x86_64.tar.gz" | sha256sum -c - && \
31+
echo "fd6d8cadaed678174c3caefb92207a3b0e8da9f926af6703fb4d1e4e4f50610a *julia-${JULIA_VERSION}-linux-x86_64.tar.gz" | sha256sum -c - && \
3232
tar xzf julia-${JULIA_VERSION}-linux-x86_64.tar.gz -C /opt/julia-${JULIA_VERSION} --strip-components=1 && \
3333
rm /tmp/julia-${JULIA_VERSION}-linux-x86_64.tar.gz
3434
RUN ln -fs /opt/julia-*/bin/julia /usr/local/bin/julia
@@ -48,8 +48,8 @@ RUN conda install --quiet --yes \
4848
'r-base=3.6.3' \
4949
'r-caret=6.0*' \
5050
'r-crayon=1.3*' \
51-
'r-devtools=2.2*' \
52-
'r-forecast=8.11*' \
51+
'r-devtools=2.3*' \
52+
'r-forecast=8.12*' \
5353
'r-hexbin=1.28*' \
5454
'r-htmltools=0.4*' \
5555
'r-htmlwidgets=1.5*' \
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Copyright (c) Jupyter Development Team.
2+
# Distributed under the terms of the Modified BSD License.
3+
import logging
4+
5+
import pytest
6+
7+
LOGGER = logging.getLogger(__name__)
8+
9+
10+
def test_julia(container):
11+
"""Basic julia test"""
12+
LOGGER.info(f"Test that julia is correctly installed ...")
13+
running_container = container.run(
14+
tty=True, command=["start.sh", "bash", "-c", "sleep infinity"]
15+
)
16+
command = f"julia --version"
17+
cmd = running_container.exec_run(command)
18+
output = cmd.output.decode("utf-8")
19+
assert cmd.exit_code == 0, f"Command {command} failed {output}"
20+
LOGGER.debug(output)

r-notebook/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ RUN conda install --quiet --yes \
2828
'r-base=3.6.3' \
2929
'r-caret=6.0*' \
3030
'r-crayon=1.3*' \
31-
'r-devtools=2.2*' \
32-
'r-forecast=8.11*' \
31+
'r-devtools=2.3*' \
32+
'r-forecast=8.12*' \
3333
'r-hexbin=1.28*' \
3434
'r-htmltools=0.4*' \
3535
'r-htmlwidgets=1.5*' \

scipy-notebook/Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,20 @@ USER $NB_UID
1616

1717
# Install Python 3 packages
1818
RUN conda install --quiet --yes \
19-
'beautifulsoup4=4.8.*' \
19+
'beautifulsoup4=4.9.*' \
2020
'conda-forge::blas=*=openblas' \
2121
'bokeh=2.0.*' \
2222
'bottleneck=1.3.*' \
23-
'cloudpickle=1.3.*' \
23+
'cloudpickle=1.4.*' \
2424
'cython=0.29.*' \
25-
'dask=2.14.*' \
25+
'dask=2.15.*' \
2626
'dill=0.3.*' \
2727
'h5py=2.10.*' \
2828
'hdf5=1.10.*' \
2929
'ipywidgets=7.5.*' \
3030
'ipympl=0.5.*'\
3131
'matplotlib-base=3.2.*' \
32+
# numba update to 0.49 fails resolving deps.
3233
'numba=0.48.*' \
3334
'numexpr=2.7.*' \
3435
'pandas=1.0.*' \
@@ -44,7 +45,7 @@ RUN conda install --quiet --yes \
4445
'sympy=1.5.*' \
4546
'vincent=0.4.*' \
4647
'widgetsnbextension=3.5.*'\
47-
'xlrd' \
48+
'xlrd=1.2.*' \
4849
&& \
4950
conda clean --all -f -y && \
5051
# Activate ipywidgets extension in the environment that runs the notebook server

0 commit comments

Comments
 (0)