From f526b891209df16021785f93e2b87d4979f7de69 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Fri, 27 Oct 2023 09:39:45 -0700 Subject: [PATCH 01/15] s/opt/srv --- deployments/biology/image/Dockerfile | 4 ++-- deployments/data8/image/Dockerfile | 4 ++-- deployments/datahub/images/default/Dockerfile | 6 +++--- deployments/dev-r/images/default/Dockerfile | 20 +++++++++---------- deployments/julia/image/Dockerfile | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/deployments/biology/image/Dockerfile b/deployments/biology/image/Dockerfile index 9a8f39125..97a5db126 100644 --- a/deployments/biology/image/Dockerfile +++ b/deployments/biology/image/Dockerfile @@ -10,8 +10,8 @@ ENV DEBIAN_FRONTEND=noninteractive ENV NB_USER jovyan ENV NB_UID 1000 -ENV CONDA_DIR /opt/conda -ENV R_LIBS_USER /opt/r +ENV CONDA_DIR /srv/conda +ENV R_LIBS_USER /srv/r # Explicitly add littler to PATH # See https://github.com/conda-forge/r-littler-feedstock/issues/6 diff --git a/deployments/data8/image/Dockerfile b/deployments/data8/image/Dockerfile index 27c452afb..d28f05b82 100644 --- a/deployments/data8/image/Dockerfile +++ b/deployments/data8/image/Dockerfile @@ -1,6 +1,6 @@ FROM buildpack-deps:focal-scm -ENV CONDA_DIR /opt/conda +ENV CONDA_DIR /srv/conda # Set up common env variables ENV TZ=America/Los_Angeles @@ -17,7 +17,7 @@ RUN adduser --disabled-password --gecos "Default Jupyter user" ${NB_USER} # Create user owned R libs dir # This lets users temporarily install packages -ENV R_LIBS_USER /opt/r +ENV R_LIBS_USER /srv/r RUN install -d -o ${NB_USER} -g ${NB_USER} ${R_LIBS_USER} RUN apt-get -qq update --yes && \ diff --git a/deployments/datahub/images/default/Dockerfile b/deployments/datahub/images/default/Dockerfile index afe797cd2..373798943 100644 --- a/deployments/datahub/images/default/Dockerfile +++ b/deployments/datahub/images/default/Dockerfile @@ -11,8 +11,8 @@ ENV DEBIAN_FRONTEND=noninteractive ENV NB_USER jovyan ENV NB_UID 1000 -ENV CONDA_DIR /opt/conda -ENV R_LIBS_USER /opt/r +ENV CONDA_DIR /srv/conda +ENV R_LIBS_USER /srv/r RUN apt-get -qq update --yes && \ apt-get -qq install --yes locales && \ @@ -36,7 +36,7 @@ RUN install -d -o ${NB_USER} -g ${NB_USER} ${R_LIBS_USER} # Install R. # These packages must be installed into the base stage since they are in system -# paths rather than /opt. +# paths rather than /srv. # Pre-built R packages from rspm are built against system libs in jammy. ENV R_VERSION=4.3.1-1.2204.0 ENV LITTLER_VERSION=0.3.18-2.2204.0 diff --git a/deployments/dev-r/images/default/Dockerfile b/deployments/dev-r/images/default/Dockerfile index d07ac7202..d22b9e55e 100644 --- a/deployments/dev-r/images/default/Dockerfile +++ b/deployments/dev-r/images/default/Dockerfile @@ -11,8 +11,8 @@ ENV DEBIAN_FRONTEND=noninteractive ENV NB_USER jovyan ENV NB_UID 1000 # These are used by the python, R, and final stages -ENV CONDA_DIR /opt/conda -ENV R_LIBS_USER /opt/r +ENV CONDA_DIR /srv/conda +ENV R_LIBS_USER /srv/r RUN apt-get -qq update --yes && \ apt-get -qq install --yes locales && \ @@ -32,7 +32,7 @@ RUN apt-get -qq update --yes && \ # Install R. # These packages must be installed into the base stage since they are in system -# paths rather than /opt. +# paths rather than /srv. # Pre-built R packages from rspm are built against system libs in jammy. ENV R_VERSION=4.3.1-1.2204.0 ENV LITTLER_VERSION=0.3.18-2.2204.0 @@ -73,8 +73,8 @@ RUN sed -i -e '/^R_LIBS_USER=/s/^/#/' /etc/R/Renviron && \ echo "TZ=${TZ}" >> /etc/R/Renviron # ============================================================================= -# This stage exists to build /opt/r. -FROM base as opt-r +# This stage exists to build /srv/r. +FROM base as srv-r # Create user owned R libs dir # This lets users temporarily install packages @@ -96,8 +96,8 @@ COPY install.R /tmp/install.R RUN /tmp/install.R && rm -rf /tmp/downloaded_packages # ============================================================================= -# This stage exists to build /opt/conda. -FROM base as opt-conda +# This stage exists to build /srv/conda. +FROM base as srv-conda COPY install-mambaforge.bash /tmp/install-mambaforge.bash RUN /tmp/install-mambaforge.bash @@ -114,10 +114,10 @@ RUN mamba env update -p ${CONDA_DIR} -f /tmp/environment.yml && \ mamba clean -afy # ============================================================================= -# This stage consumes base and import /opt/r and /opt/conda. +# This stage consumes base and import /srv/r and /srv/conda. FROM base as final -COPY --from=opt-r /opt/r /opt/r -COPY --from=opt-conda /opt/conda /opt/conda +COPY --from=srv-r /srv/r /srv/r +COPY --from=srv-conda /srv/conda /srv/conda # Install IR kernelspec. Requires python and R. ENV PATH ${CONDA_DIR}/bin:${PATH}:${R_LIBS_USER}/bin diff --git a/deployments/julia/image/Dockerfile b/deployments/julia/image/Dockerfile index fc8c8ec5f..d6a669aca 100644 --- a/deployments/julia/image/Dockerfile +++ b/deployments/julia/image/Dockerfile @@ -8,8 +8,8 @@ ENV NB_USER jovyan ENV NB_UID 1000 ENV SHELL /bin/bash -ENV CONDA_DIR /opt/conda -ENV JULIA_DIR /opt/julia +ENV CONDA_DIR /srv/conda +ENV JULIA_DIR /srv/julia ENV PATH ${JULIA_DIR}/bin:${CONDA_DIR}/bin:$PATH From 24bb0c09f9c8774e1aedf9f24f9a62bfe11314d7 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Fri, 27 Oct 2023 09:41:21 -0700 Subject: [PATCH 02/15] new location for the ipython startup script --- hub/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hub/values.yaml b/hub/values.yaml index 7ca5cd729..8b5963f52 100644 --- a/hub/values.yaml +++ b/hub/values.yaml @@ -98,7 +98,7 @@ jupyterhub: # https://github.com/ipython/ipython/issues/9163 db_file: ":memory:" popularity-contest: - mountPath: /opt/conda/etc/ipython/startup/000-popularity-contest.py + mountPath: /srv/conda/envs/notebook/etc/ipython/startup/000-popularity-contest.py stringData: | import popularity_contest.reporter popularity_contest.reporter.setup_reporter() From 5e23ef5ebb05dbdf8806f29645a4693d759c0187 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Fri, 27 Oct 2023 11:05:38 -0700 Subject: [PATCH 03/15] move this to /etc --- hub/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hub/values.yaml b/hub/values.yaml index 8b5963f52..8bd546f47 100644 --- a/hub/values.yaml +++ b/hub/values.yaml @@ -98,7 +98,7 @@ jupyterhub: # https://github.com/ipython/ipython/issues/9163 db_file: ":memory:" popularity-contest: - mountPath: /srv/conda/envs/notebook/etc/ipython/startup/000-popularity-contest.py + mountPath: /etc/ipython/startup/000-popularity-contest.py stringData: | import popularity_contest.reporter popularity_contest.reporter.setup_reporter() From 50ebd07d02b6c7a76c1b22489e998231f9850c1b Mon Sep 17 00:00:00 2001 From: shane knapp Date: Fri, 27 Oct 2023 19:13:57 -0700 Subject: [PATCH 04/15] unblock other builds and fix this later --- deployments/julia/image/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployments/julia/image/Dockerfile b/deployments/julia/image/Dockerfile index d6a669aca..fc8c8ec5f 100644 --- a/deployments/julia/image/Dockerfile +++ b/deployments/julia/image/Dockerfile @@ -8,8 +8,8 @@ ENV NB_USER jovyan ENV NB_UID 1000 ENV SHELL /bin/bash -ENV CONDA_DIR /srv/conda -ENV JULIA_DIR /srv/julia +ENV CONDA_DIR /opt/conda +ENV JULIA_DIR /opt/julia ENV PATH ${JULIA_DIR}/bin:${CONDA_DIR}/bin:$PATH From 1afe48056bb8301d908e4f694210306e47da5f40 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 30 Oct 2023 13:20:18 -0700 Subject: [PATCH 05/15] chartpressed --- hub/Chart.yaml | 2 +- node-placeholder/Chart.yaml | 2 +- node-placeholder/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hub/Chart.yaml b/hub/Chart.yaml index 1b367d5df..51399e81a 100644 --- a/hub/Chart.yaml +++ b/hub/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: '1.0' description: Deployment Chart for JupyterHub name: hub -version: 0.0.1-0.dev.git.6847.h37aa9975 +version: 0.0.1-0.dev.git.6956.h5e23ef5e diff --git a/node-placeholder/Chart.yaml b/node-placeholder/Chart.yaml index 584e5c8f8..5c05c5f8c 100644 --- a/node-placeholder/Chart.yaml +++ b/node-placeholder/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.0.1-0.dev.git.6821.hfab4a361 +version: 0.0.1-0.dev.git.6946.hdccbf2f4 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/node-placeholder/values.yaml b/node-placeholder/values.yaml index 3402eff83..d18c4d8e9 100644 --- a/node-placeholder/values.yaml +++ b/node-placeholder/values.yaml @@ -4,7 +4,7 @@ image: repository: us-central1-docker.pkg.dev/ucb-datahub-2018/core/node-placeholder-scaler pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "0.0.1-0.dev.git.6607.h11654cae" + tag: "0.0.1-0.dev.git.6946.hdccbf2f4" imagePullSecrets: [] nameOverride: "" From 3796a9e182031a30b60b7ad0e8d2b132937f09e8 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 30 Oct 2023 20:33:52 -0700 Subject: [PATCH 06/15] traitlets bug --- deployments/biology/image/environment.yml | 1 + deployments/data8/image/environment.yml | 1 + deployments/datahub/images/default/environment.yml | 1 + deployments/dev-r/images/default/environment.yml | 1 + deployments/dev-r/images/secondary/environment.yml | 1 + 5 files changed, 5 insertions(+) diff --git a/deployments/biology/image/environment.yml b/deployments/biology/image/environment.yml index b9a293752..93b675643 100644 --- a/deployments/biology/image/environment.yml +++ b/deployments/biology/image/environment.yml @@ -66,3 +66,4 @@ dependencies: # Packages for MCB-160L iss #3942 - allensdk==2.13.6 - otter-grader==3.1.4 + - notebook==6.5.6 diff --git a/deployments/data8/image/environment.yml b/deployments/data8/image/environment.yml index adbaecca6..ff9ed3fa5 100644 --- a/deployments/data8/image/environment.yml +++ b/deployments/data8/image/environment.yml @@ -25,3 +25,4 @@ dependencies: - okpy==1.18.1 - datascience==0.17.0 - otter-grader==4.3.4 # Based on request from ericvd and sean.morris + - notebook==6.5.6 diff --git a/deployments/datahub/images/default/environment.yml b/deployments/datahub/images/default/environment.yml index c8d7d4f57..54f03225d 100644 --- a/deployments/datahub/images/default/environment.yml +++ b/deployments/datahub/images/default/environment.yml @@ -304,3 +304,4 @@ dependencies: # Used by MCB32, but incompatible with ipywidgets 8.x - qgrid==1.3.1 + - notebook==6.5.6 diff --git a/deployments/dev-r/images/default/environment.yml b/deployments/dev-r/images/default/environment.yml index 0009398a9..28a081302 100644 --- a/deployments/dev-r/images/default/environment.yml +++ b/deployments/dev-r/images/default/environment.yml @@ -17,3 +17,4 @@ dependencies: - pip: - -r infra-requirements.txt - jupyter-shiny-proxy==1.1 + - notebook==6.5.6 diff --git a/deployments/dev-r/images/secondary/environment.yml b/deployments/dev-r/images/secondary/environment.yml index 9f5511cd2..e80184105 100644 --- a/deployments/dev-r/images/secondary/environment.yml +++ b/deployments/dev-r/images/secondary/environment.yml @@ -15,3 +15,4 @@ dependencies: - pip: - -r infra-requirements.txt - jupyter-shiny-proxy==1.1 + - notebook==6.5.6 From 6050ce645f2d56dd03503a8fc1e8b05b0de90300 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 31 Oct 2023 10:22:13 -0700 Subject: [PATCH 07/15] conflict between infra-reqs and env.yaml --- deployments/biology/image/environment.yml | 4 +++- deployments/data8/image/environment.yml | 4 +++- deployments/datahub/images/default/environment.yml | 1 - deployments/dev-r/images/default/environment.yml | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/deployments/biology/image/environment.yml b/deployments/biology/image/environment.yml index 93b675643..ec2ba0052 100644 --- a/deployments/biology/image/environment.yml +++ b/deployments/biology/image/environment.yml @@ -53,6 +53,9 @@ dependencies: # compbio BioE c146, Fall 22 and into the future, issue 3785 - scikit-learn=1.1.2 +# bug w/notebook and traitlets: https://github.com/jupyter/notebook/issues/7048 +- traitlets=5.9.* + # For https://github.com/berkeley-dsep-infra/datahub/issues/1846 # Conda does not have these - pip: @@ -66,4 +69,3 @@ dependencies: # Packages for MCB-160L iss #3942 - allensdk==2.13.6 - otter-grader==3.1.4 - - notebook==6.5.6 diff --git a/deployments/data8/image/environment.yml b/deployments/data8/image/environment.yml index ff9ed3fa5..4b14cb09b 100644 --- a/deployments/data8/image/environment.yml +++ b/deployments/data8/image/environment.yml @@ -16,6 +16,9 @@ dependencies: # Spring 2023 https://github.com/berkeley-dsep-infra/datahub/issues/4291 - ipykernel==6.19.4 +# bug w/notebook and traitlets: https://github.com/jupyter/notebook/issues/7048 +- traitlets=5.9.* + # Items not in conda forge - pip: # Export notebooks as PDFs with Chrome @@ -25,4 +28,3 @@ dependencies: - okpy==1.18.1 - datascience==0.17.0 - otter-grader==4.3.4 # Based on request from ericvd and sean.morris - - notebook==6.5.6 diff --git a/deployments/datahub/images/default/environment.yml b/deployments/datahub/images/default/environment.yml index 54f03225d..c8d7d4f57 100644 --- a/deployments/datahub/images/default/environment.yml +++ b/deployments/datahub/images/default/environment.yml @@ -304,4 +304,3 @@ dependencies: # Used by MCB32, but incompatible with ipywidgets 8.x - qgrid==1.3.1 - - notebook==6.5.6 diff --git a/deployments/dev-r/images/default/environment.yml b/deployments/dev-r/images/default/environment.yml index 28a081302..99438b24c 100644 --- a/deployments/dev-r/images/default/environment.yml +++ b/deployments/dev-r/images/default/environment.yml @@ -2,6 +2,8 @@ dependencies: - python=3.10.* - pip=23.1.* - nodejs=18.* +# bug w/notebook and traitlets: https://github.com/jupyter/notebook/issues/7048 +- traitlets=5.9.* - jupyter-server-proxy==4.0.0 - jupyter-rsession-proxy==2.2.0 @@ -17,4 +19,3 @@ dependencies: - pip: - -r infra-requirements.txt - jupyter-shiny-proxy==1.1 - - notebook==6.5.6 From 1c49fc0c2f2e741b8abb86af4ad6969a496c6c70 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 31 Oct 2023 11:30:27 -0700 Subject: [PATCH 08/15] forgot about secondary subdir --- deployments/dev-r/images/secondary/environment.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/deployments/dev-r/images/secondary/environment.yml b/deployments/dev-r/images/secondary/environment.yml index e80184105..b03196ee4 100644 --- a/deployments/dev-r/images/secondary/environment.yml +++ b/deployments/dev-r/images/secondary/environment.yml @@ -12,7 +12,9 @@ dependencies: # for jupyter-tree-download - zip==3.0 + +# bug w/notebook and traitlets: https://github.com/jupyter/notebook/issues/7048 +- traitlets=5.9.* - pip: - -r infra-requirements.txt - jupyter-shiny-proxy==1.1 - - notebook==6.5.6 From 5f54d0c4917b114589a7fdd63ad8ebb77818c916 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 31 Oct 2023 11:58:04 -0700 Subject: [PATCH 09/15] update popcon to the hash of my PR --- deployments/a11y/image/infra-requirements.txt | 2 +- deployments/astro/image/infra-requirements.txt | 2 +- deployments/biology/image/infra-requirements.txt | 2 +- deployments/cee/image/infra-requirements.txt | 2 +- deployments/data100/image/environment.yml | 2 +- deployments/data100/image/infra-requirements.txt | 2 +- deployments/data101/image/environment.yml | 2 +- deployments/data101/image/infra-requirements.txt | 2 +- deployments/data102/image/environment.yml | 2 +- deployments/data102/image/infra-requirements.txt | 2 +- deployments/data8/image/infra-requirements.txt | 2 +- deployments/datahub/images/default/infra-requirements.txt | 2 +- deployments/dev-r/images/default/infra-requirements.txt | 2 +- deployments/dev-r/images/secondary/infra-requirements.txt | 2 +- deployments/eecs/image/infra-requirements.txt | 2 +- deployments/ischool/image/infra-requirements.txt | 2 +- deployments/julia/image/infra-requirements.txt | 2 +- deployments/publichealth/image/infra-requirements.txt | 2 +- deployments/shiny/image/infra-requirements.txt | 2 +- deployments/stat159/image/infra-requirements.txt | 2 +- deployments/stat20/image/infra-requirements.txt | 2 +- scripts/infra-packages/requirements.txt | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/deployments/a11y/image/infra-requirements.txt b/deployments/a11y/image/infra-requirements.txt index afa026881..75e9ab741 100644 --- a/deployments/a11y/image/infra-requirements.txt +++ b/deployments/a11y/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==0.4.1 +popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/astro/image/infra-requirements.txt b/deployments/astro/image/infra-requirements.txt index afa026881..75e9ab741 100644 --- a/deployments/astro/image/infra-requirements.txt +++ b/deployments/astro/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==0.4.1 +popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/biology/image/infra-requirements.txt b/deployments/biology/image/infra-requirements.txt index afa026881..75e9ab741 100644 --- a/deployments/biology/image/infra-requirements.txt +++ b/deployments/biology/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==0.4.1 +popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/cee/image/infra-requirements.txt b/deployments/cee/image/infra-requirements.txt index afa026881..75e9ab741 100644 --- a/deployments/cee/image/infra-requirements.txt +++ b/deployments/cee/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==0.4.1 +popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/data100/image/environment.yml b/deployments/data100/image/environment.yml index 7cb2ad85e..9ce421a8e 100644 --- a/deployments/data100/image/environment.yml +++ b/deployments/data100/image/environment.yml @@ -43,4 +43,4 @@ dependencies: - nbconvert==7.6.0 - pytest-notebook==0.8.1 - gh-scoped-creds==4.1 - - popularity-contest==0.4.1 + - popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 diff --git a/deployments/data100/image/infra-requirements.txt b/deployments/data100/image/infra-requirements.txt index afa026881..75e9ab741 100644 --- a/deployments/data100/image/infra-requirements.txt +++ b/deployments/data100/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==0.4.1 +popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/data101/image/environment.yml b/deployments/data101/image/environment.yml index 2e6f3a4f4..b890fbc2f 100644 --- a/deployments/data101/image/environment.yml +++ b/deployments/data101/image/environment.yml @@ -101,4 +101,4 @@ dependencies: - pytest-notebook==0.8.1 - pymongo==4.4.1 - dbt-postgres==1.6.0 - - popularity-contest==0.4.1 + - popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 diff --git a/deployments/data101/image/infra-requirements.txt b/deployments/data101/image/infra-requirements.txt index afa026881..75e9ab741 100644 --- a/deployments/data101/image/infra-requirements.txt +++ b/deployments/data101/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==0.4.1 +popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/data102/image/environment.yml b/deployments/data102/image/environment.yml index 040433b3f..891de231d 100644 --- a/deployments/data102/image/environment.yml +++ b/deployments/data102/image/environment.yml @@ -50,4 +50,4 @@ dependencies: - gh-scoped-creds==4.1 - nb2pdf==0.6.2 - nbpdfexport==0.2.1 - - popularity-contest==0.4.1 + - popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 diff --git a/deployments/data102/image/infra-requirements.txt b/deployments/data102/image/infra-requirements.txt index 7a274a480..4b5927047 100644 --- a/deployments/data102/image/infra-requirements.txt +++ b/deployments/data102/image/infra-requirements.txt @@ -25,7 +25,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==0.4.1 +popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/data8/image/infra-requirements.txt b/deployments/data8/image/infra-requirements.txt index afa026881..75e9ab741 100644 --- a/deployments/data8/image/infra-requirements.txt +++ b/deployments/data8/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==0.4.1 +popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/datahub/images/default/infra-requirements.txt b/deployments/datahub/images/default/infra-requirements.txt index afa026881..75e9ab741 100644 --- a/deployments/datahub/images/default/infra-requirements.txt +++ b/deployments/datahub/images/default/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==0.4.1 +popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/dev-r/images/default/infra-requirements.txt b/deployments/dev-r/images/default/infra-requirements.txt index afa026881..75e9ab741 100644 --- a/deployments/dev-r/images/default/infra-requirements.txt +++ b/deployments/dev-r/images/default/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==0.4.1 +popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/dev-r/images/secondary/infra-requirements.txt b/deployments/dev-r/images/secondary/infra-requirements.txt index afa026881..75e9ab741 100644 --- a/deployments/dev-r/images/secondary/infra-requirements.txt +++ b/deployments/dev-r/images/secondary/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==0.4.1 +popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/eecs/image/infra-requirements.txt b/deployments/eecs/image/infra-requirements.txt index afa026881..75e9ab741 100644 --- a/deployments/eecs/image/infra-requirements.txt +++ b/deployments/eecs/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==0.4.1 +popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/ischool/image/infra-requirements.txt b/deployments/ischool/image/infra-requirements.txt index afa026881..75e9ab741 100644 --- a/deployments/ischool/image/infra-requirements.txt +++ b/deployments/ischool/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==0.4.1 +popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/julia/image/infra-requirements.txt b/deployments/julia/image/infra-requirements.txt index afa026881..75e9ab741 100644 --- a/deployments/julia/image/infra-requirements.txt +++ b/deployments/julia/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==0.4.1 +popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/publichealth/image/infra-requirements.txt b/deployments/publichealth/image/infra-requirements.txt index afa026881..75e9ab741 100644 --- a/deployments/publichealth/image/infra-requirements.txt +++ b/deployments/publichealth/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==0.4.1 +popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/shiny/image/infra-requirements.txt b/deployments/shiny/image/infra-requirements.txt index afa026881..75e9ab741 100644 --- a/deployments/shiny/image/infra-requirements.txt +++ b/deployments/shiny/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==0.4.1 +popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/stat159/image/infra-requirements.txt b/deployments/stat159/image/infra-requirements.txt index afa026881..75e9ab741 100644 --- a/deployments/stat159/image/infra-requirements.txt +++ b/deployments/stat159/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==0.4.1 +popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/stat20/image/infra-requirements.txt b/deployments/stat20/image/infra-requirements.txt index afa026881..75e9ab741 100644 --- a/deployments/stat20/image/infra-requirements.txt +++ b/deployments/stat20/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==0.4.1 +popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/scripts/infra-packages/requirements.txt b/scripts/infra-packages/requirements.txt index afa026881..75e9ab741 100644 --- a/scripts/infra-packages/requirements.txt +++ b/scripts/infra-packages/requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==0.4.1 +popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality From a8599d32bfbecf53873a2253a0603db75ead370e Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 31 Oct 2023 12:17:27 -0700 Subject: [PATCH 10/15] don't forget about a11y! --- deployments/a11y/image/environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/deployments/a11y/image/environment.yml b/deployments/a11y/image/environment.yml index 71cc97f3c..7c295d736 100644 --- a/deployments/a11y/image/environment.yml +++ b/deployments/a11y/image/environment.yml @@ -30,6 +30,7 @@ dependencies: # https://github.com/berkeley-dsep-infra/datahub/issues/3693 - notebook==7.0.2 - jupyterlab==4.0.4 + - popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # ### # The items below are from infra-requirements, however lab conflicts with the # alpha notebook. From df61747200fb5cc4d3cbd1e1ae70397474c93c4c Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 31 Oct 2023 12:21:40 -0700 Subject: [PATCH 11/15] s/python-popularity==// --- deployments/a11y/image/environment.yml | 2 +- deployments/a11y/image/infra-requirements.txt | 2 +- deployments/astro/image/infra-requirements.txt | 2 +- deployments/biology/image/infra-requirements.txt | 2 +- deployments/cee/image/infra-requirements.txt | 2 +- deployments/data100/image/environment.yml | 2 +- deployments/data100/image/infra-requirements.txt | 2 +- deployments/data101/image/environment.yml | 2 +- deployments/data101/image/infra-requirements.txt | 2 +- deployments/data102/image/environment.yml | 2 +- deployments/data102/image/infra-requirements.txt | 2 +- deployments/data8/image/infra-requirements.txt | 2 +- deployments/datahub/images/default/infra-requirements.txt | 2 +- deployments/dev-r/images/default/infra-requirements.txt | 2 +- deployments/dev-r/images/secondary/infra-requirements.txt | 2 +- deployments/eecs/image/infra-requirements.txt | 2 +- deployments/ischool/image/infra-requirements.txt | 2 +- deployments/julia/image/infra-requirements.txt | 2 +- deployments/publichealth/image/infra-requirements.txt | 2 +- deployments/shiny/image/infra-requirements.txt | 2 +- deployments/stat159/image/infra-requirements.txt | 2 +- deployments/stat20/image/infra-requirements.txt | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/deployments/a11y/image/environment.yml b/deployments/a11y/image/environment.yml index 7c295d736..b457dad60 100644 --- a/deployments/a11y/image/environment.yml +++ b/deployments/a11y/image/environment.yml @@ -30,7 +30,7 @@ dependencies: # https://github.com/berkeley-dsep-infra/datahub/issues/3693 - notebook==7.0.2 - jupyterlab==4.0.4 - - popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 + - git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # ### # The items below are from infra-requirements, however lab conflicts with the # alpha notebook. diff --git a/deployments/a11y/image/infra-requirements.txt b/deployments/a11y/image/infra-requirements.txt index 75e9ab741..611bfb5d7 100644 --- a/deployments/a11y/image/infra-requirements.txt +++ b/deployments/a11y/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 +git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/astro/image/infra-requirements.txt b/deployments/astro/image/infra-requirements.txt index 75e9ab741..611bfb5d7 100644 --- a/deployments/astro/image/infra-requirements.txt +++ b/deployments/astro/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 +git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/biology/image/infra-requirements.txt b/deployments/biology/image/infra-requirements.txt index 75e9ab741..611bfb5d7 100644 --- a/deployments/biology/image/infra-requirements.txt +++ b/deployments/biology/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 +git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/cee/image/infra-requirements.txt b/deployments/cee/image/infra-requirements.txt index 75e9ab741..611bfb5d7 100644 --- a/deployments/cee/image/infra-requirements.txt +++ b/deployments/cee/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 +git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/data100/image/environment.yml b/deployments/data100/image/environment.yml index 9ce421a8e..de44dbd85 100644 --- a/deployments/data100/image/environment.yml +++ b/deployments/data100/image/environment.yml @@ -43,4 +43,4 @@ dependencies: - nbconvert==7.6.0 - pytest-notebook==0.8.1 - gh-scoped-creds==4.1 - - popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 + - git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 diff --git a/deployments/data100/image/infra-requirements.txt b/deployments/data100/image/infra-requirements.txt index 75e9ab741..611bfb5d7 100644 --- a/deployments/data100/image/infra-requirements.txt +++ b/deployments/data100/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 +git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/data101/image/environment.yml b/deployments/data101/image/environment.yml index b890fbc2f..ea13b9897 100644 --- a/deployments/data101/image/environment.yml +++ b/deployments/data101/image/environment.yml @@ -101,4 +101,4 @@ dependencies: - pytest-notebook==0.8.1 - pymongo==4.4.1 - dbt-postgres==1.6.0 - - popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 + - git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 diff --git a/deployments/data101/image/infra-requirements.txt b/deployments/data101/image/infra-requirements.txt index 75e9ab741..611bfb5d7 100644 --- a/deployments/data101/image/infra-requirements.txt +++ b/deployments/data101/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 +git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/data102/image/environment.yml b/deployments/data102/image/environment.yml index 891de231d..1e742de03 100644 --- a/deployments/data102/image/environment.yml +++ b/deployments/data102/image/environment.yml @@ -50,4 +50,4 @@ dependencies: - gh-scoped-creds==4.1 - nb2pdf==0.6.2 - nbpdfexport==0.2.1 - - popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 + - git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 diff --git a/deployments/data102/image/infra-requirements.txt b/deployments/data102/image/infra-requirements.txt index 4b5927047..b29032502 100644 --- a/deployments/data102/image/infra-requirements.txt +++ b/deployments/data102/image/infra-requirements.txt @@ -25,7 +25,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 +git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/data8/image/infra-requirements.txt b/deployments/data8/image/infra-requirements.txt index 75e9ab741..611bfb5d7 100644 --- a/deployments/data8/image/infra-requirements.txt +++ b/deployments/data8/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 +git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/datahub/images/default/infra-requirements.txt b/deployments/datahub/images/default/infra-requirements.txt index 75e9ab741..611bfb5d7 100644 --- a/deployments/datahub/images/default/infra-requirements.txt +++ b/deployments/datahub/images/default/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 +git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/dev-r/images/default/infra-requirements.txt b/deployments/dev-r/images/default/infra-requirements.txt index 75e9ab741..611bfb5d7 100644 --- a/deployments/dev-r/images/default/infra-requirements.txt +++ b/deployments/dev-r/images/default/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 +git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/dev-r/images/secondary/infra-requirements.txt b/deployments/dev-r/images/secondary/infra-requirements.txt index 75e9ab741..611bfb5d7 100644 --- a/deployments/dev-r/images/secondary/infra-requirements.txt +++ b/deployments/dev-r/images/secondary/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 +git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/eecs/image/infra-requirements.txt b/deployments/eecs/image/infra-requirements.txt index 75e9ab741..611bfb5d7 100644 --- a/deployments/eecs/image/infra-requirements.txt +++ b/deployments/eecs/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 +git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/ischool/image/infra-requirements.txt b/deployments/ischool/image/infra-requirements.txt index 75e9ab741..611bfb5d7 100644 --- a/deployments/ischool/image/infra-requirements.txt +++ b/deployments/ischool/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 +git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/julia/image/infra-requirements.txt b/deployments/julia/image/infra-requirements.txt index 75e9ab741..611bfb5d7 100644 --- a/deployments/julia/image/infra-requirements.txt +++ b/deployments/julia/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 +git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/publichealth/image/infra-requirements.txt b/deployments/publichealth/image/infra-requirements.txt index 75e9ab741..611bfb5d7 100644 --- a/deployments/publichealth/image/infra-requirements.txt +++ b/deployments/publichealth/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 +git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/shiny/image/infra-requirements.txt b/deployments/shiny/image/infra-requirements.txt index 75e9ab741..611bfb5d7 100644 --- a/deployments/shiny/image/infra-requirements.txt +++ b/deployments/shiny/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 +git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/stat159/image/infra-requirements.txt b/deployments/stat159/image/infra-requirements.txt index 75e9ab741..611bfb5d7 100644 --- a/deployments/stat159/image/infra-requirements.txt +++ b/deployments/stat159/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 +git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality diff --git a/deployments/stat20/image/infra-requirements.txt b/deployments/stat20/image/infra-requirements.txt index 75e9ab741..611bfb5d7 100644 --- a/deployments/stat20/image/infra-requirements.txt +++ b/deployments/stat20/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -popularity-contest==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 +git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality From e9982342c46585136ad39066be926859a9468394 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 31 Oct 2023 12:31:07 -0700 Subject: [PATCH 12/15] remove julia from this PR --- deployments/julia/image/infra-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/julia/image/infra-requirements.txt b/deployments/julia/image/infra-requirements.txt index 611bfb5d7..afa026881 100644 --- a/deployments/julia/image/infra-requirements.txt +++ b/deployments/julia/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 +popularity-contest==0.4.1 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality From f6619784d7b4e9ae5c0522e26e3276bbf3462e15 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 31 Oct 2023 12:46:20 -0700 Subject: [PATCH 13/15] install scikit before popcon --- deployments/astro/image/environment.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/deployments/astro/image/environment.yml b/deployments/astro/image/environment.yml index eb08ac0e9..91e981034 100644 --- a/deployments/astro/image/environment.yml +++ b/deployments/astro/image/environment.yml @@ -23,7 +23,9 @@ dependencies: - protobuf - mpich - mpi4py - +- scikit-learn==1.0.* +- scikit-image==0.19.* +- scipy==1.11.3 - pip - pip: @@ -33,9 +35,6 @@ dependencies: - opencv-python>=4.5.5.62 - nose2>=0.10.0 - sympy - - scipy - - scikit-learn==1.0.* - - scikit-image==0.19.* - beautifulsoup4 - tqdm - h5py From f9e3ea8dc81aec86bd5c2f5a426abf8694a707ba Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 31 Oct 2023 13:04:00 -0700 Subject: [PATCH 14/15] not sure why data8 is failing but it technically doesn't need this version of the package --- deployments/data8/image/infra-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/data8/image/infra-requirements.txt b/deployments/data8/image/infra-requirements.txt index 611bfb5d7..afa026881 100644 --- a/deployments/data8/image/infra-requirements.txt +++ b/deployments/data8/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 +popularity-contest==0.4.1 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality From 1ae1e7055795ca3540d0266fab7c59251bfebe8c Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 31 Oct 2023 13:19:26 -0700 Subject: [PATCH 15/15] fsking astro --- deployments/astro/image/infra-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/astro/image/infra-requirements.txt b/deployments/astro/image/infra-requirements.txt index 611bfb5d7..afa026881 100644 --- a/deployments/astro/image/infra-requirements.txt +++ b/deployments/astro/image/infra-requirements.txt @@ -24,7 +24,7 @@ jupyter-contrib-nbextensions==0.5.1 jupyter_nbextensions_configurator==0.4.1 # Measure popularity of different packages in our hubs # https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda -git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 +popularity-contest==0.4.1 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527 RISE==5.7.1 # syncthing for dropbox-like functionality