fix: pin versions to resolve conflicts

closes #39 closes #40
SwissDataScienceCenter · Jul 23, 2019 · a39d523 · a39d523
1 parent 1fbdb2b
commit a39d523
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
@@ -44,11 +44,10 @@ COPY requirements.txt /tmp/requirements.txt
 RUN python3 -m pip install -U pip && \
     pip install -r /tmp/requirements.txt && \
     jupyter labextension update @jupyterlab/hub-extension --no-build && \
-    jupyter labextension install @jupyterlab/git && \
-    jupyter labextension install renku-jupyterlab-ts --no-build && \
+    jupyter labextension install @jupyterlab/[email protected] && \
     jupyter lab build && \
     jupyter labextension list && \
-    pip install jupyterlab-git==0.5.0 && \
+    pip install jupyterlab-git==0.6.0 && \
     jupyter serverextension enable --py jupyterlab_git
 
 # fix https://github.com/SwissDataScienceCenter/renku-jupyter/issues/14

diff --git a/docker/base/requirements.txt b/docker/base/requirements.txt
@@ -1,3 +1,3 @@
-papermill
+papermill>=1.0.0
 requests>=2.20.0
-jupyterlab>=0.35.4
+jupyterlab>=0.35.4<1.0.0