diff --git a/Jenkinsfile b/Jenkinsfile index 6333587b..4c14815f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { // https://jenkins.io/doc/book/pipeline/syntax/ agent { docker { - image "pavics/workflow-tests:200914.1" + image "pavics/workflow-tests:200925.1" label 'linux && docker' } } diff --git a/binder/Dockerfile b/binder/Dockerfile index e86c97c7..56420c19 100644 --- a/binder/Dockerfile +++ b/binder/Dockerfile @@ -1,4 +1,4 @@ -FROM pavics/workflow-tests:200914.1 +FROM pavics/workflow-tests:200925.1 USER root diff --git a/docker/Dockerfile b/docker/Dockerfile index 98844b3a..15a84267 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -38,7 +38,12 @@ RUN jupyter labextension install @jupyter-widgets/jupyterlab-manager \ && jupyter labextension install @jupyter-widgets/jupyterlab-manager jupyter-leaflet \ && jupyter labextension install @bokeh/jupyter_bokeh \ && jupyter labextension install @pyviz/jupyterlab_pyviz \ - && jupyter labextension install @jupyterlab/debugger + && jupyter labextension install @jupyterlab/debugger \ + && jupyter labextension install jupyterlab-topbar-extension \ + jupyterlab-system-monitor \ + jupyterlab-topbar-text \ + jupyterlab-logout \ + jupyterlab-theme-toggle # && jupyter labextension install jupyterlab-clipboard diff --git a/docker/environment.yml b/docker/environment.yml index 9bb5c57c..65579e9d 100644 --- a/docker/environment.yml +++ b/docker/environment.yml @@ -40,9 +40,7 @@ dependencies: # pinning hvplot did not solve the problem with violin plot. - hvplot - nc-time-axis - # can re-enable xclim from conda once we have write access to - # https://github.com/conda-forge/xclim-feedstock - # - xclim + - xclim # for esgf notebooks - esgf-compute-api - cdms2 @@ -72,7 +70,6 @@ dependencies: - pip - pip: - birdhouse-birdy - - xclim # visual debugger for Jupyter Notebook, not working with JupyterLab at this moment - pixiedust - requests-magpie @@ -82,3 +79,11 @@ dependencies: # pencil: write the symbolic formula, followed by numeric substitutions, # and then the result. - handcalcs + # https://github.com/ShopRunner/jupyter-notify + # Jupyter Magic For Browser Notifications of Cell Completion. + - jupyternotify + # Needed for https://github.com/jtpio/jupyterlab-topbar + - nbresuse + # Needed to run notebook tests. Missing indirect recursive dependencies + # somewhere, should not need to manually add it here. + - pytest-tornasync diff --git a/launchcontainer b/launchcontainer index a75d231d..e8a14423 100755 --- a/launchcontainer +++ b/launchcontainer @@ -1,7 +1,7 @@ #!/bin/sh -x if [ -z "$DOCKER_IMAGE" ]; then - DOCKER_IMAGE="pavics/workflow-tests:200914.1" + DOCKER_IMAGE="pavics/workflow-tests:200925.1" fi if [ -z "$CONTAINER_NAME" ]; then diff --git a/launchnotebook b/launchnotebook index 4f3121c5..ef88df74 100755 --- a/launchnotebook +++ b/launchnotebook @@ -7,7 +7,7 @@ if [ -z "$PORT" ]; then fi if [ -z "$DOCKER_IMAGE" ]; then - DOCKER_IMAGE="pavics/workflow-tests:200914.1" + DOCKER_IMAGE="pavics/workflow-tests:200925.1" fi if [ -z "$CONTAINER_NAME" ]; then