Merge branch 'main' of github.com:brown-ccv/jupyterhub-docker-images …

…into main
brown-ccv · Jul 29, 2021 · bd397cd · bd397cd
2 parents be5e89e + 13ab997
commit bd397cd
Show file tree

Hide file tree

Showing 17 changed files with 47 additions and 23 deletions.
diff --git a/.github/workflows/apma0360.yml b/.github/workflows/apma0360.yml
@@ -33,6 +33,9 @@ jobs:
 
       - name: Configure Docker
         run: gcloud auth configure-docker
+      - uses: satackey/[email protected]
+        # Ignore the failure of a step and avoid terminating the job.
+        continue-on-error: true
       - name: Build and Push JH Image
         run: |
           COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose up jh_image

diff --git a/.github/workflows/biol1595.yml b/.github/workflows/biol1595.yml
@@ -35,6 +35,9 @@ jobs:
 
       - name: Configure Docker
         run: gcloud auth configure-docker
+      - uses: satackey/[email protected]
+        # Ignore the failure of a step and avoid terminating the job.
+        continue-on-error: true
       - name: Build and Push JH Image
         run: |
           COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose up jh_image

diff --git a/.github/workflows/data1010.yml b/.github/workflows/data1010.yml
@@ -37,6 +37,9 @@ jobs:
 
       - name: Configure Docker
         run: gcloud auth configure-docker
+      - uses: satackey/[email protected]
+        # Ignore the failure of a step and avoid terminating the job.
+        continue-on-error: true
       - name: Build and Push JH Image
         run: |
           COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose up jh_image

diff --git a/.github/workflows/econ2070.yml b/.github/workflows/econ2070.yml
@@ -34,6 +34,9 @@ jobs:
 
       - name: Configure Docker
         run: gcloud auth configure-docker
+      - uses: satackey/[email protected]
+        # Ignore the failure of a step and avoid terminating the job.
+        continue-on-error: true
       - name: Build and Push JH Image
         run: |
           COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose up jh_image

diff --git a/.github/workflows/eeps1310.yml b/.github/workflows/eeps1310.yml
@@ -35,6 +35,9 @@ jobs:
 
       - name: Configure Docker
         run: gcloud auth configure-docker
+      - uses: satackey/[email protected]
+        # Ignore the failure of a step and avoid terminating the job.
+        continue-on-error: true
       - name: Build and Push JH Image
         run: |
           COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose up jh_image

diff --git a/.github/workflows/engn1120.yml b/.github/workflows/engn1120.yml
@@ -35,6 +35,9 @@ jobs:
 
       - name: Configure Docker
         run: gcloud auth configure-docker
+      - uses: satackey/[email protected]
+        # Ignore the failure of a step and avoid terminating the job.
+        continue-on-error: true
       - name: Build and Push JH Image
         run: |
           COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose up jh_image

diff --git a/.github/workflows/geol1430.yml b/.github/workflows/geol1430.yml
@@ -34,6 +34,9 @@ jobs:
 
       - name: Configure Docker
         run: gcloud auth configure-docker
+      - uses: satackey/[email protected]
+        # Ignore the failure of a step and avoid terminating the job.
+        continue-on-error: true
       - name: Build and Push JH Image
         run: |
           COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose up jh_image

diff --git a/.github/workflows/mpa2065.yml b/.github/workflows/mpa2065.yml
@@ -38,6 +38,9 @@ jobs:
 
       - name: Configure Docker
         run: gcloud auth configure-docker
+      - uses: satackey/[email protected]
+        # Ignore the failure of a step and avoid terminating the job.
+        continue-on-error: true
       - name: Build and Push JH Image
         run: |
           COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose up jh_image

diff --git a/.github/workflows/neur1630.yml b/.github/workflows/neur1630.yml
@@ -34,6 +34,9 @@ jobs:
 
       - name: Configure Docker
         run: gcloud auth configure-docker
+      - uses: satackey/[email protected]
+        # Ignore the failure of a step and avoid terminating the job.
+        continue-on-error: true
       - name: Build and Push JH Image
         run: |
           COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose up jh_image

diff --git a/.github/workflows/phys1600.yml b/.github/workflows/phys1600.yml
@@ -35,6 +35,9 @@ jobs:
 
       - name: Configure Docker
         run: gcloud auth configure-docker
+      - uses: satackey/[email protected]
+        # Ignore the failure of a step and avoid terminating the job.
+        continue-on-error: true
       - name: Build and Push JH Image
         run: |
           COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose up jh_image

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
-ARG ROOT_CONTAINER="jupyter/base-notebook:lab-2.2.9"
+ARG ROOT_CONTAINER="jupyter/base-notebook:lab-3.0.16"
 FROM ${ROOT_CONTAINER} as base
 
 ARG CLASS
@@ -87,9 +87,9 @@ RUN jupyter serverextension enable --py 'jupyterlab_git' --sys-prefix && \
     jupyter labextension install '@jupyterlab/server-proxy' --no-build && \
     jupyter nbextension install 'jupytext' --py --sys-prefix && \
     jupyter nbextension enable 'jupytext' --py --sys-prefix && \
-    jupyter serverextension enable --sys-prefix 'jupyterlab_latex' && \
-    jupyter labextension install '@jupyterlab/latex' --no-build && \
-    jupyter labextension install '@jupyter-widgets/[email protected]' '[email protected]' --no-build && \
+    # jupyter serverextension enable --sys-prefix 'jupyterlab_latex' && \
+    # jupyter labextension install '@jupyterlab/latex' --no-build && \
+    # jupyter labextension install '@jupyter-widgets/[email protected]' '[email protected]' --no-build && \
     jupyter lab build && \
     jupyter lab clean -y && \
     npm cache clean --force && \

diff --git a/dev/templates/class_workflow.yml b/dev/templates/class_workflow.yml
@@ -35,6 +35,9 @@ jobs:
 
       - name: Configure Docker
         run: gcloud auth configure-docker
+      - uses: satackey/[email protected]
+        # Ignore the failure of a step and avoid terminating the job.
+        continue-on-error: true
       - name: Build and Push JH Image
         run: |
           COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose up jh_image

diff --git a/requirements/classes/apma0350/requirements.txt b/requirements/classes/apma0350/requirements.txt
@@ -1,4 +1,6 @@
 #add extra pkgs here
+ipywidgets
+
 #basic scipy
 matplotlib-base 
 numpy 

diff --git a/requirements/classes/biol1595/requirements.txt b/requirements/classes/biol1595/requirements.txt
@@ -1,13 +1,15 @@
 # add class-specific packages here:
+ipywidgets
 
 # these are the scipy base packages ( YOU PROBABLY DON'T WANT TO REMOVE THESE )
 dask 
-pandas
-numexpr
 matplotlib
+numexpr
+pandas
+pytables
+scikit-learn
 scipy
 seaborn
-scikit-learn
 sympy
 statsmodels
 cloudpickle
@@ -18,7 +20,7 @@ hdf5
 vincent
 protobuf
 xlrd
-pytables
+
 
 # these are the base r packages in the r-notebook image ( YOU PROBABLY WANT THESE IF YOUR TARGET IN DOCKER IS r_lang OR r_julia )
 

diff --git a/requirements/classes/data1010/requirements.jl b/requirements/classes/data1010/requirements.jl
@@ -10,7 +10,6 @@ const julia_packages = [
                    "DecisionTree",
                    "Flux",
                    "GLM",
-                   "GLMNet",
                    "HypothesisTests",
                    "Ipopt",
                    "JuMP",
@@ -19,23 +18,18 @@ const julia_packages = [
                    "Optim",
                    "StatsBase",
                    "MLDatasets",
+                   "MLJ",
                    "Images",
                    "ProgressMeter",
                    "TableView",
                    "Query",
-                   "Weave",
                    "QuadGK",
                    "NLopt",
                    "LaTeXStrings",
                    "Feather",
-                   "SymPy",
                    "Gadfly",
                    "GR",
                    "Plots",
                    "VegaLite",
-                   "StatsPlots",
-                   "DataVoyager",
-                   "Interact",
-                   "VegaDatasets", 
                    "RDatasets"
                     ]
diff --git a/requirements/classes/mpa2065/requirements.jl b/requirements/classes/mpa2065/requirements.jl
@@ -10,7 +10,6 @@ const julia_packages = [
                    "DecisionTree",
                    "Flux",
                    "GLM",
-                   "GLMNet",
                    "HypothesisTests",
                    "Ipopt",
                    "JuMP",
@@ -21,23 +20,16 @@ const julia_packages = [
                    "MLDatasets",
                    "MLJ",
                    "Images",
-                   "TSne",
                    "ProgressMeter",
                    "TableView",
                    "Query",
-                   "Weave",
                    "QuadGK",
                    "NLopt",
                    "LaTeXStrings",
                    "Feather",
-                   "SymPy",
                    "Gadfly",
                    "GR",
                    "Plots",
                    "VegaLite",
-                   "StatsPlots",
-                   "DataVoyager",
-                   "Interact",
-                   "VegaDatasets", 
                    "RDatasets"
                     ]
diff --git a/requirements/common/requirements.pip.txt b/requirements/common/requirements.pip.txt
@@ -9,3 +9,4 @@ jupytext
 jupyterlab_latex
 pyppeteer
 nbconvert
+jupyterlab_widgets