Merge pull request #545 from chriszs/lab-31

Upgrade to the first JupyterLab beta v0.31

base-notebook/Dockerfile

@@ -77,9 +77,9 @@ RUN cd /tmp && \
 RUN conda install --quiet --yes \
     'notebook=5.2.*' \
     'jupyterhub=0.8.*' \
-    'jupyterlab=0.30.*' \
+    'jupyterlab=0.31.*' \
     && conda clean -tipsy && \
-    jupyter labextension install @jupyterlab/hub-extension@^0.7.0 && \
+    jupyter labextension install @jupyterlab/hub-extension@^0.8.0 && \
     npm cache clean && \
     rm -rf $CONDA_DIR/share/jupyter/lab/staging && \
     fix-permissions $CONDA_DIR

base-notebook/test/test_container_options.py

@@ -68,7 +68,7 @@ def test_sudo(container):
         command=['start.sh', 'sudo', 'id']
     )
     rv = c.wait(timeout=10)
-    assert rv == 0
+    assert rv == 0 or rv["StatusCode"] == 0
     assert 'uid=0(root)' in c.logs(stdout=True).decode('utf-8')
 
 
@@ -81,7 +81,7 @@ def test_sudo_path(container):
         command=['start.sh', 'sudo', 'which', 'jupyter']
     )
     rv = c.wait(timeout=10)
-    assert rv == 0
+    assert rv == 0 or rv["StatusCode"] == 0
     assert c.logs(stdout=True).decode('utf-8').rstrip().endswith('/opt/conda/bin/jupyter')
 
 
@@ -93,7 +93,7 @@ def test_sudo_path_without_grant(container):
         command=['start.sh', 'which', 'jupyter']
     )
     rv = c.wait(timeout=10)
-    assert rv == 0
+    assert rv == 0 or rv["StatusCode"] == 0
     assert c.logs(stdout=True).decode('utf-8').rstrip().endswith('/opt/conda/bin/jupyter')
 
 
@@ -107,5 +107,5 @@ def test_group_add(container, tmpdir):
         command=['start.sh', 'id']
     )
     rv = c.wait(timeout=5)
-    assert rv == 0
+    assert rv == 0 or rv["StatusCode"] == 0
     assert 'uid=1010 gid=1010 groups=1010,100(users)' in c.logs(stdout=True).decode('utf-8')

scipy-notebook/Dockerfile

@@ -19,7 +19,7 @@ USER $NB_USER
 # use notebook-friendly backends in these images
 RUN conda install --quiet --yes \
     'nomkl' \
-    'ipywidgets=7.0*' \
+    'ipywidgets=7.1*' \
     'pandas=0.19*' \
     'numexpr=2.6*' \
     'matplotlib=2.0*' \
@@ -47,7 +47,7 @@ RUN conda install --quiet --yes \
     # Activate ipywidgets extension in the environment that runs the notebook server
     jupyter nbextension enable --py widgetsnbextension --sys-prefix && \
     # Also activate ipywidgets extension for JupyterLab
-    jupyter labextension install @jupyter-widgets/jupyterlab-manager@^0.31.0 && \
+    jupyter labextension install @jupyter-widgets/jupyterlab-manager@^0.33.1 && \
     npm cache clean && \
     rm -rf $CONDA_DIR/share/jupyter/lab/staging && \
     fix-permissions $CONDA_DIR