hazza/docker-stacks
1
0
Fork 0
mirror of https://github.com/jupyter/docker-stacks.git synced 2025-10-11 12:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #545 from chriszs/lab-31

Browse Source 
Upgrade to the first JupyterLab beta v0.31
This commit is contained in:
Peter Parente
2018-02-04 14:28:34 -05:00
committed by GitHub
parent b214741486 8cbf385b6d
commit c54800018c
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
base-notebook/Dockerfile
View File

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

8
base-notebook/test/test_container_options.py
View File

@@ -68,7 +68,7 @@ def test_sudo(container):
command=['start.sh', 'sudo', 'id'] command=['start.sh', 'sudo', 'id']
) )
rv = c.wait(timeout=10) 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') 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'] command=['start.sh', 'sudo', 'which', 'jupyter']
) )
rv = c.wait(timeout=10) 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') 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'] command=['start.sh', 'which', 'jupyter']
) )
rv = c.wait(timeout=10) 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') 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'] command=['start.sh', 'id']
) )
rv = c.wait(timeout=5) 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') assert 'uid=1010 gid=1010 groups=1010,100(users)' in c.logs(stdout=True).decode('utf-8')

4
scipy-notebook/Dockerfile
View File

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