From ab30854dfe77bb24accfb73d60bb933fa8e86cda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rok=20Ro=C5=A1kar?= <rok.roskar@sdsc.ethz.ch>
Date: Fri, 24 Apr 2020 20:07:27 +0000
Subject: [PATCH] Update Dockerfile
---
Dockerfile | 9 ++++-----
environment.yml | 1 +
notebooks/datasets_summary.ipynb | 6 +++++-
requirements.txt | 8 +++-----
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 4037aa43d..6e0e13c98 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,12 +23,11 @@ RUN R -f /tmp/install.R
COPY requirements.txt environment.yml /tmp/
RUN conda env update -q -f /tmp/environment.yml && \
/opt/conda/bin/pip install --ignore-installed -r /tmp/requirements.txt && \
- jupyter labextension install --no-build @jupyter-voila/jupyterlab-preview \
- @jupyter-widgets/jupyterlab-manager \
- @jupyterlab/celltags && \
+ jupyter labextension install --no-build @jupyter-voila/jupyterlab-preview && \
+ jupyter labextension install --no-build @jupyter-widgets/jupyterlab-manager && \
+ jupyter lab build && \
conda clean -y --all && \
- conda env export -n "root" && \
- jupyter lab build
+ conda env export -n "root"
# install our utilities package
diff --git a/environment.yml b/environment.yml
index 757a4f132..5f61d4d62 100644
--- a/environment.yml
+++ b/environment.yml
@@ -7,3 +7,4 @@ dependencies:
- bokeh=2.0.0=py37_0
- holoviews=1.13.0=py_0
- panel=0.9.3=py_0
+ - jupyterlab~=2.0
diff --git a/notebooks/datasets_summary.ipynb b/notebooks/datasets_summary.ipynb
index 7955695df..0e329bc23 100644
--- a/notebooks/datasets_summary.ipynb
+++ b/notebooks/datasets_summary.ipynb
@@ -78,7 +78,11 @@
{
"cell_type": "code",
"execution_count": 5,
- "metadata": {},
+ "metadata": {
+ "tags": [
+ "parameters"
+ ]
+ },
"outputs": [],
"source": [
"data_path = \"../data\"\n",
diff --git a/requirements.txt b/requirements.txt
index 99397cd20..2dc9be5bb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -38,12 +38,10 @@ jsonschema==3.2.0
jupyter-client==6.0.0
jupyter-core==4.6.3
jupyter-rsession-proxy==1.1
+jupyterlab_server>=1.1.0
jupyter-server-proxy==1.2.0
jupyter-telemetry==0.0.5
-jupyterhub==0.9.6
-jupyterlab==1.2.5
-jupyterlab-git==0.9.0
-jupyterlab-server==1.0.6
+jupyterlab-git==0.20.0rc0
kiwisolver==1.1.0
Mako==1.1.0
MarkupSafe==1.1.1
@@ -51,7 +49,7 @@ matplotlib==3.2.1
mistune==0.8.4
multidict==4.7.5
nbconvert==5.6.1
-nbdime==1.1.0
+nbdime~=2.0
nbformat==5.0.4
notebook==6.0.3
numpy==1.18.1
--
GitLab