diff --git a/hub-templates/basehub/values.yaml b/hub-templates/basehub/values.yaml index 02d3634ce0..9c39b2da9b 100644 --- a/hub-templates/basehub/values.yaml +++ b/hub-templates/basehub/values.yaml @@ -106,7 +106,7 @@ jupyterhub: hub.jupyter.org/node-purpose: user image: name: set_automatically_by_automation - tag: 524cf58 + tag: 0d5aa48 storage: type: static static: diff --git a/images/user/Dockerfile b/images/user/Dockerfile index 231e8d9381..fcf766700a 100644 --- a/images/user/Dockerfile +++ b/images/user/Dockerfile @@ -120,12 +120,9 @@ RUN sed -i -e '/^R_LIBS_USER=/s/^/#/' /etc/R/Renviron && \ USER ${NB_USER} -COPY environment.yml /tmp/ +COPY requirements.txt /tmp/ -RUN conda env update -p ${CONDA_DIR} -f /tmp/environment.yml - -COPY install-jupyter-extensions.bash /tmp/install-jupyter-extensions.bash -RUN /tmp/install-jupyter-extensions.bash +RUN python3 -m pip install -r /tmp/requirements.txt # Set CRAN mirror to rspm before we install anything COPY Rprofile.site /usr/lib/R/etc/Rprofile.site diff --git a/images/user/environment.yml b/images/user/environment.yml deleted file mode 100644 index 1c152837d6..0000000000 --- a/images/user/environment.yml +++ /dev/null @@ -1,52 +0,0 @@ -channels: - - conda-forge -dependencies: - - # language runtimes - - python=3.8.* - - - numpy - - scipy - - matplotlib - - pandas - - seaborn - - sympy - - networkx - - scikit-learn - - beautifulsoup4 - - statsmodels - - nltk - - spacy - - geopandas - # From https://github.com/utoronto-2i2c/jupyterhub-deploy/issues/29 - - astroquery - - astropy - - galpy - - catalystcoop.pudl - - dask==2020.12.0 - - distributed==2020.12.0 - - dask-gateway==0.9.0 - - - pip - - - pip: - # Infrastructure things - - jupyterlab==2.* - - voila==0.1.23 - - nbgitpuller==0.9.* - - jupyter-resource-usage==0.5.0 - - jupytext==1.6.* - - RISE==5.6.1 - - jupyter_contrib_nbextensions==0.5.1 - - notebook==6.1.4 - - jupyterhub==1.1.0 - - jupyter-server-proxy==1.5.0 - - jupyter-rsession-proxy==1.2 - - jupyter-tree-download==1.0.1 - - ipywidgets==7.5.1 - - otter-grader==2.1.7 - - - datascience - - geojson - - folium - - geopy diff --git a/images/user/install-jupyter-extensions.bash b/images/user/install-jupyter-extensions.bash deleted file mode 100755 index e6c69cf88b..0000000000 --- a/images/user/install-jupyter-extensions.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -set -euo pipefail - -jupyter labextension install --debug \ - @jupyter-widgets/jupyterlab-manager@2 \ - @jupyterlab/server-proxy@2.1.1 \ - jupyterlab-jupytext@1.2.1 - -# Install jupyter-contrib-nbextensions -jupyter contrib nbextension install --sys-prefix --symlink diff --git a/images/user/requirements.txt b/images/user/requirements.txt new file mode 100644 index 0000000000..1a794d5637 --- /dev/null +++ b/images/user/requirements.txt @@ -0,0 +1,42 @@ +numpy +scipy +matplotlib +pandas +seaborn +sympy +networkx +scikit-learn +beautifulsoup4 +statsmodels +nltk +spacy +geopandas +# From https://github.com/utoronto-2i2c/jupyterhub-deploy/issues/29 +astroquery +astropy +galpy +catalystcoop.pudl +dask==2020.12.0 +distributed==2020.12.0 +dask-gateway==0.9.0 +# Infrastructure things +jupyterlab==3.* +voila==0.2.6 +nbgitpuller==0.9.* +jupyter-resource-usage==0.5.0 +RISE==5.7.1 +jupyter_contrib_nbextensions==0.5.1 +notebook==6.1.4 +jupyterhub==1.3.0 +jupyter-rsession-proxy==1.2 +jupyter-tree-download==1.0.1 +ipywidgets==7.5.1 +otter-grader==2.1.7 +datascience +geojson +folium +geopy +# JupyterLab extensions +jupyterlab_widgets==1.0.* +jupytext==1.10.* +jupyter-server-proxy==3.0.2