From c2738e7fe92138d76a6cf4177514aa58b4b45c16 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 7 Nov 2023 11:48:22 -0800 Subject: [PATCH 1/6] bump popcon --- deployments/astro/image/infra-requirements.txt | 2 +- deployments/data8/image/environment.yml | 1 + deployments/data8/image/infra-requirements.txt | 2 +- deployments/julia/image/environment.yml | 1 + deployments/publichealth/image/environment.yml | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/deployments/astro/image/infra-requirements.txt b/deployments/astro/image/infra-requirements.txt index afa026881..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==0.4.1 +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/environment.yml b/deployments/data8/image/environment.yml index 4b14cb09b..5817f56f9 100644 --- a/deployments/data8/image/environment.yml +++ b/deployments/data8/image/environment.yml @@ -18,6 +18,7 @@ dependencies: # bug w/notebook and traitlets: https://github.com/jupyter/notebook/issues/7048 - traitlets=5.9.* +- git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # Items not in conda forge - pip: diff --git a/deployments/data8/image/infra-requirements.txt b/deployments/data8/image/infra-requirements.txt index afa026881..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==0.4.1 +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/environment.yml b/deployments/julia/image/environment.yml index 41eb14d50..6720072f8 100644 --- a/deployments/julia/image/environment.yml +++ b/deployments/julia/image/environment.yml @@ -14,6 +14,7 @@ dependencies: # Required for issue #3057 - xlrd==2.0.1 +- git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # For https://github.com/berkeley-dsep-infra/datahub/issues/3079 - websockify diff --git a/deployments/publichealth/image/environment.yml b/deployments/publichealth/image/environment.yml index 028a6ad9a..6f90f9c42 100644 --- a/deployments/publichealth/image/environment.yml +++ b/deployments/publichealth/image/environment.yml @@ -2,6 +2,7 @@ dependencies: - pip - syncthing==1.18.6 - jupyter-rsession-proxy==2.2.0 +- git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 - pip: # bug w/notebook and traitlets: https://github.com/jupyter/notebook/issues/7048 - traitlets==5.9.0 From 724ae40ff0b00996ec1a6a2ff2294c6d6cf9ae7e Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 7 Nov 2023 11:58:02 -0800 Subject: [PATCH 2/6] pip not conda --- deployments/data8/image/environment.yml | 2 +- deployments/julia/image/environment.yml | 2 +- deployments/publichealth/image/environment.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deployments/data8/image/environment.yml b/deployments/data8/image/environment.yml index 5817f56f9..6d689e994 100644 --- a/deployments/data8/image/environment.yml +++ b/deployments/data8/image/environment.yml @@ -18,7 +18,6 @@ dependencies: # bug w/notebook and traitlets: https://github.com/jupyter/notebook/issues/7048 - traitlets=5.9.* -- git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # Items not in conda forge - pip: @@ -29,3 +28,4 @@ dependencies: - okpy==1.18.1 - datascience==0.17.0 - otter-grader==4.3.4 # Based on request from ericvd and sean.morris + - git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 diff --git a/deployments/julia/image/environment.yml b/deployments/julia/image/environment.yml index 6720072f8..b2b013985 100644 --- a/deployments/julia/image/environment.yml +++ b/deployments/julia/image/environment.yml @@ -14,7 +14,6 @@ dependencies: # Required for issue #3057 - xlrd==2.0.1 -- git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 # For https://github.com/berkeley-dsep-infra/datahub/issues/3079 - websockify @@ -22,3 +21,4 @@ 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/publichealth/image/environment.yml b/deployments/publichealth/image/environment.yml index 6f90f9c42..f60ff2a69 100644 --- a/deployments/publichealth/image/environment.yml +++ b/deployments/publichealth/image/environment.yml @@ -2,10 +2,10 @@ dependencies: - pip - syncthing==1.18.6 - jupyter-rsession-proxy==2.2.0 -- git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 - pip: # bug w/notebook and traitlets: https://github.com/jupyter/notebook/issues/7048 - traitlets==5.9.0 # - -r /tmp/infra-requirements.txt # RStudio support - otter-grader==2.2.7 + - git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 From d7a97b22242bd8234e5cdf957634021c7a742873 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 7 Nov 2023 12:26:08 -0800 Subject: [PATCH 3/6] already being installed via infra-reqs --- deployments/data8/image/environment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/deployments/data8/image/environment.yml b/deployments/data8/image/environment.yml index 6d689e994..4b14cb09b 100644 --- a/deployments/data8/image/environment.yml +++ b/deployments/data8/image/environment.yml @@ -28,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 - - git+https://github.com/yuvipanda/python-popularity-contest@9e30ec414e45615e75a0e86424141b7093c8f686 From bbf59b11abc2b5abe21078b5dbce222e1341ae6b Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 7 Nov 2023 12:45:36 -0800 Subject: [PATCH 4/6] using my fork seems to work --- 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..ca42d16bb 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 +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 From 688c28ebd44ff2da533ac0c42e187c17cc0541c5 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 7 Nov 2023 13:47:47 -0800 Subject: [PATCH 5/6] update infra-reqs, all hubs etc to run latest popcon with better error handling --- 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 | 5 ++--- .../datahub/images/default/infra-requirements.txt | 2 +- .../dev-r/images/default/infra-requirements.txt | 2 +- .../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/environment.yml | 1 - deployments/julia/image/infra-requirements.txt | 2 +- deployments/publichealth/image/environment.yml | 5 ++--- deployments/publichealth/image/infra-requirements.txt | 3 +-- deployments/shiny/image/infra-requirements.txt | 2 +- deployments/stat159/image/environment.yml | 1 + deployments/stat159/image/infra-requirements.txt | 2 +- deployments/stat20/image/infra-requirements.txt | 2 +- scripts/OUT | 11 +++++++++++ scripts/infra-packages/requirements.txt | 2 +- 26 files changed, 37 insertions(+), 29 deletions(-) create mode 100644 scripts/OUT diff --git a/deployments/a11y/image/environment.yml b/deployments/a11y/image/environment.yml index b457dad60..bc8a61a29 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 - - 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 index 611bfb5d7..ca42d16bb 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 -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 index 611bfb5d7..ca42d16bb 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 +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 index 611bfb5d7..ca42d16bb 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 -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 index 611bfb5d7..ca42d16bb 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 -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 index de44dbd85..32e744a62 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 - - 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 index 611bfb5d7..ca42d16bb 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 -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 index 3bda10cc8..1a7d7aa08 100644 --- 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 index 611bfb5d7..ca42d16bb 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 -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 index 1e742de03..983266d1c 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 - - 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 index b29032502..ca42d16bb 100644 --- a/deployments/data102/image/infra-requirements.txt +++ b/deployments/data102/image/infra-requirements.txt @@ -14,10 +14,9 @@ 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. @@ -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 -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 index 611bfb5d7..ca42d16bb 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 -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 index 611bfb5d7..ca42d16bb 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 -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 index 611bfb5d7..ca42d16bb 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 -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 index 611bfb5d7..ca42d16bb 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 -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 index 611bfb5d7..ca42d16bb 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 -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 index b2b013985..41eb14d50 100644 --- 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 index afa026881..ca42d16bb 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 +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 index f60ff2a69..f6e64698e 100644 --- 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 index 3e379452d..ca42d16bb 100644 --- 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 index 611bfb5d7..ca42d16bb 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 -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 index 85b4f2416..b6aaa4e08 100644 --- 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 index 611bfb5d7..ca42d16bb 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 -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 index 611bfb5d7..ca42d16bb 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 -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 new file mode 100644 index 000000000..04a1baa98 --- /dev/null +++ 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 index 75e9ab741..ca42d16bb 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==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 From c18ced8a9d62f4ad59aab41b2aa1dde36ecaa4c8 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 7 Nov 2023 13:49:41 -0800 Subject: [PATCH 6/6] remove old debug output --- scripts/OUT | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 scripts/OUT diff --git a/scripts/OUT b/scripts/OUT deleted file mode 100644 index 04a1baa98..000000000 --- a/scripts/OUT +++ /dev/null @@ -1,11 +0,0 @@ -(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.