update infra-reqs, all hubs etc to run latest popcon with better erro…

…r handling
berkeley-dsep-infra · Nov 7, 2023 · 688c28e · 688c28e
1 parent bbf59b1
commit 688c28e
Show file tree

Hide file tree

Showing 26 changed files with 37 additions and 29 deletions.
diff --git 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
-  - git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686
+  - git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
   # ###
   # 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
@@ -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
+git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
 # 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
@@ -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
+git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
 # 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
@@ -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
+git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
 # 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
@@ -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
+git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
 # 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
@@ -43,4 +43,4 @@ dependencies:
   - nbconvert==7.6.0
   - pytest-notebook==0.8.1
   - gh-scoped-creds==4.1
-  - git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686
+  - git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
diff --git 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
-git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686
+git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
 # 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
@@ -103,4 +103,4 @@ dependencies:
   - pytest-notebook==0.8.1
   - pymongo==4.4.1
   - dbt-postgres==1.6.0
-  - git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686
+  - git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
diff --git 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
-git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686
+git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
 # 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
@@ -50,4 +50,4 @@ dependencies:
   - gh-scoped-creds==4.1
   - nb2pdf==0.6.2
   - nbpdfexport==0.2.1
-  - git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686
+  - git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
diff --git a/deployments/data102/image/infra-requirements.txt b/deployments/data102/image/infra-requirements.txt
@@ -14,18 +14,17 @@ retrolab==0.3.21
 nbgitpuller==1.1.0
 jupyter-resource-usage==0.6.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==3.1.0
+jupyterhub==4.0.2
 appmode==0.8.0
 ipywidgets==7.7.2
-otter-grader==4.2.0
 jupyter-tree-download==1.0.1
 git-credential-helpers==0.2
 # Enough people like this, let's load it in.
 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
+git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
 # 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
@@ -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
+git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
 # 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
@@ -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
+git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
 # 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
@@ -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
+git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
 # 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
@@ -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
+git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
 # 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
@@ -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
+git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
 # 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/environment.yml b/deployments/julia/image/environment.yml
@@ -21,4 +21,3 @@ dependencies:
   - notebook==6.5.6
   - jupyter-desktop-server
   - otter-grader==3.1.4
-  - git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686
diff --git 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
+git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
 # 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/environment.yml b/deployments/publichealth/image/environment.yml
@@ -5,7 +5,6 @@ dependencies:
 - pip:
   # bug w/notebook and traitlets: https://github.com/jupyter/notebook/issues/7048
   - traitlets==5.9.0
-    # - -r /tmp/infra-requirements.txt
-# RStudio support
+  # - -r /tmp/infra-requirements.txt
+  # RStudio support
   - otter-grader==2.2.7  
-  - git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686
diff --git a/deployments/publichealth/image/infra-requirements.txt b/deployments/publichealth/image/infra-requirements.txt
@@ -8,7 +8,6 @@
 # everwhere one by one.
 
 # FIXME: Freeze this to get exact versions of all dependencies
-traitlets==5.9.0
 notebook==6.4.12
 jupyterlab==3.4.5
 retrolab==0.3.21
@@ -25,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
+git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
 # 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
@@ -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
+git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
 # 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/environment.yml b/deployments/stat159/image/environment.yml
@@ -158,3 +158,4 @@ dependencies:
     - jupyter-syncthing-proxy==1.0.3
     # Needed for RTC on NFS-backed hubs
     - git+https://github.com/berkeley-dsep-infra/tmpystore.git@84765e1
+    - git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
diff --git 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
-git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686
+git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
 # 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
@@ -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
+git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
 # 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/OUT b/scripts/OUT
@@ -0,0 +1,11 @@
+(dh) ➜  scripts git:(fix-pagination-bug) ✗ ./delete-unused-users.py --hub_url https://a11y.datahub.berkeley.edu/
+1: deleting XXXX
+2: deleting XXXX
+3: deleting XXXX
+4: deleting XXXX
+5: deleting XXXX
+6: deleting XXXX
+7: deleting XXXX
+8: deleting XXXX
+9: deleting XXXX
+Deleted 9 total users.
diff --git 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==git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686
+git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
 # RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527
 RISE==5.7.1
 # syncthing for dropbox-like functionality