Skip to content

Commit

Permalink
Merge pull request #1076 from romainx/update_2020_w18
Browse files Browse the repository at this point in the history
Regular update 2020 W18
  • Loading branch information
parente committed May 3, 2020
2 parents f9b134f + 7a239a1 commit bfb2be7
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 13 deletions.
2 changes: 1 addition & 1 deletion all-spark-notebook/Dockerfile
Expand Up @@ -27,7 +27,7 @@ RUN conda install --quiet --yes \
'r-ggplot2=3.3*' \
'r-irkernel=1.1*' \
'r-rcurl=1.98*' \
'r-sparklyr=1.1*' \
'r-sparklyr=1.2*' \
&& \
conda clean --all -f -y && \
fix-permissions $CONDA_DIR && \
Expand Down
4 changes: 2 additions & 2 deletions base-notebook/Dockerfile
Expand Up @@ -4,7 +4,7 @@
# Ubuntu 18.04 (bionic)
# https://hub.docker.com/_/ubuntu/?tab=tags&name=bionic
# OS/ARCH: linux/amd64
ARG ROOT_CONTAINER=ubuntu:bionic-20200311@sha256:e5dd9dbb37df5b731a6688fa49f4003359f6f126958c9c928f937bec69836320
ARG ROOT_CONTAINER=ubuntu:bionic-20200403@sha256:b58746c8a89938b8c9f5b77de3b8cf1fe78210c696ab03a1442e235eea65d84f
ARG BASE_CONTAINER=$ROOT_CONTAINER
FROM $BASE_CONTAINER

Expand Down Expand Up @@ -112,7 +112,7 @@ RUN conda install --quiet --yes 'tini=0.18.0' && \
RUN conda install --quiet --yes \
'notebook=6.0.3' \
'jupyterhub=1.1.0' \
'jupyterlab=2.0.1' && \
'jupyterlab=2.1.1' && \
conda clean --all -f -y && \
npm cache clean --force && \
jupyter notebook --generate-config && \
Expand Down
8 changes: 4 additions & 4 deletions datascience-notebook/Dockerfile
Expand Up @@ -23,12 +23,12 @@ RUN apt-get update && \
# install Julia packages in /opt/julia instead of $HOME
ENV JULIA_DEPOT_PATH=/opt/julia
ENV JULIA_PKGDIR=/opt/julia
ENV JULIA_VERSION=1.3.1
ENV JULIA_VERSION=1.4.1

RUN mkdir /opt/julia-${JULIA_VERSION} && \
cd /tmp && \
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 && \
echo "faa707c8343780a6fe5eaf13490355e8190acf8e2c189b9e7ecbddb0fa2643ad *julia-${JULIA_VERSION}-linux-x86_64.tar.gz" | sha256sum -c - && \
echo "fd6d8cadaed678174c3caefb92207a3b0e8da9f926af6703fb4d1e4e4f50610a *julia-${JULIA_VERSION}-linux-x86_64.tar.gz" | sha256sum -c - && \
tar xzf julia-${JULIA_VERSION}-linux-x86_64.tar.gz -C /opt/julia-${JULIA_VERSION} --strip-components=1 && \
rm /tmp/julia-${JULIA_VERSION}-linux-x86_64.tar.gz
RUN ln -fs /opt/julia-*/bin/julia /usr/local/bin/julia
Expand All @@ -48,8 +48,8 @@ RUN conda install --quiet --yes \
'r-base=3.6.3' \
'r-caret=6.0*' \
'r-crayon=1.3*' \
'r-devtools=2.2*' \
'r-forecast=8.11*' \
'r-devtools=2.3*' \
'r-forecast=8.12*' \
'r-hexbin=1.28*' \
'r-htmltools=0.4*' \
'r-htmlwidgets=1.5*' \
Expand Down
20 changes: 20 additions & 0 deletions datascience-notebook/test/test_julia.py
@@ -0,0 +1,20 @@
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
import logging

import pytest

LOGGER = logging.getLogger(__name__)


def test_julia(container):
"""Basic julia test"""
LOGGER.info(f"Test that julia is correctly installed ...")
running_container = container.run(
tty=True, command=["start.sh", "bash", "-c", "sleep infinity"]
)
command = f"julia --version"
cmd = running_container.exec_run(command)
output = cmd.output.decode("utf-8")
assert cmd.exit_code == 0, f"Command {command} failed {output}"
LOGGER.debug(output)
4 changes: 2 additions & 2 deletions r-notebook/Dockerfile
Expand Up @@ -28,8 +28,8 @@ RUN conda install --quiet --yes \
'r-base=3.6.3' \
'r-caret=6.0*' \
'r-crayon=1.3*' \
'r-devtools=2.2*' \
'r-forecast=8.11*' \
'r-devtools=2.3*' \
'r-forecast=8.12*' \
'r-hexbin=1.28*' \
'r-htmltools=0.4*' \
'r-htmlwidgets=1.5*' \
Expand Down
9 changes: 5 additions & 4 deletions scipy-notebook/Dockerfile
Expand Up @@ -16,19 +16,20 @@ USER $NB_UID

# Install Python 3 packages
RUN conda install --quiet --yes \
'beautifulsoup4=4.8.*' \
'beautifulsoup4=4.9.*' \
'conda-forge::blas=*=openblas' \
'bokeh=2.0.*' \
'bottleneck=1.3.*' \
'cloudpickle=1.3.*' \
'cloudpickle=1.4.*' \
'cython=0.29.*' \
'dask=2.14.*' \
'dask=2.15.*' \
'dill=0.3.*' \
'h5py=2.10.*' \
'hdf5=1.10.*' \
'ipywidgets=7.5.*' \
'ipympl=0.5.*'\
'matplotlib-base=3.2.*' \
# numba update to 0.49 fails resolving deps.
'numba=0.48.*' \
'numexpr=2.7.*' \
'pandas=1.0.*' \
Expand All @@ -44,7 +45,7 @@ RUN conda install --quiet --yes \
'sympy=1.5.*' \
'vincent=0.4.*' \
'widgetsnbextension=3.5.*'\
'xlrd' \
'xlrd=1.2.*' \
&& \
conda clean --all -f -y && \
# Activate ipywidgets extension in the environment that runs the notebook server
Expand Down

0 comments on commit bfb2be7

Please sign in to comment.