From 999338f706c753aa82ed75787cf392c4ae6122bb Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Thu, 6 Oct 2022 10:54:01 -0700
Subject: [PATCH 01/41] Call it cee instead

---
 apt.txt                | 27 +++++++++++++++++++++++++++
 environment.yml        | 16 ++++++++++++++++
 infra-requirements.txt | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+)
 create mode 100644 apt.txt
 create mode 100644 environment.yml
 create mode 100644 infra-requirements.txt

diff --git a/apt.txt b/apt.txt
new file mode 100644
index 0000000..fe946e3
--- /dev/null
+++ b/apt.txt
@@ -0,0 +1,27 @@
+# For desktop environment
+dbus-x11
+xfce4
+xfce4-panel
+xfce4-session
+xfce4-settings
+xubuntu-icon-theme
+xauth
+# You definitely need a browser
+firefox
+# And a text editor
+gedit
+# And a terminal
+xfce4-terminal
+
+# https://github.com/berkeley-dsep-infra/datahub/issues/2535
+emacs
+
+# vim4ever!
+vim
+
+# https://github.com/berkeley-dsep-infra/datahub/issues/3679
+texlive-xetex
+# https://github.com/berkeley-dsep-infra/datahub/issues/3721
+texlive-fonts-recommended
+texlive-plain-generic
+texlive-lang-chinese
diff --git a/environment.yml b/environment.yml
new file mode 100644
index 0000000..7425f0f
--- /dev/null
+++ b/environment.yml
@@ -0,0 +1,16 @@
+channels:
+- conda-forge
+
+# Almost all libraries should be added in requirements.txt
+# Only libraries *not* available in PyPI should be here
+dependencies:
+- python=3.9.*
+
+# A linux desktop environment
+- websockify
+
+- pip
+- pip:
+# For desktop environment
+  - jupyter-desktop-server==0.1.3
+  - -r infra-requirements.txt
diff --git a/infra-requirements.txt b/infra-requirements.txt
new file mode 100644
index 0000000..cf0e9c8
--- /dev/null
+++ b/infra-requirements.txt
@@ -0,0 +1,32 @@
+# WARNING: Original source at scripts/infra-packages/requirements.txt
+# PLEASE DO NOT EDIT ELSEWHERE
+# After editing scripts/infra-packages/requirements.txt, please run
+# scripts/infra-packages/sync.bash.
+
+# This file pins versions of notebook related python packages we want
+# across all hubs. This makes sure we don't need to upgrade them
+# everwhere one by one.
+
+# FIXME: Freeze this to get exact versions of all dependencies
+notebook==6.4.12
+jupyterlab==3.4.5
+retrolab==0.3.21
+nbgitpuller==1.1.0
+jupyter-resource-usage==0.6.1
+# Matches version in images/hub/Dockerfile
+jupyterhub==2.3.1
+appmode==0.8.0
+ipywidgets==7.7.2
+otter-grader==3.1.4
+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
+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
+jupyter-syncthing-proxy==1.0.3
\ No newline at end of file

From 5db0b08ebf5833c8d679b6df53b4efa42a0bdbff Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Thu, 6 Oct 2022 10:59:44 -0700
Subject: [PATCH 02/41] Add qgis

---
 environment.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 7425f0f..3eaedf9 100644
--- a/environment.yml
+++ b/environment.yml
@@ -6,9 +6,11 @@ channels:
 dependencies:
 - python=3.9.*
 
-# A linux desktop environment
+# Needed for linux desktop environment
 - websockify
 
+- qgis=3.22.*
+
 - pip
 - pip:
 # For desktop environment

From 8ed5837fe973121b63a6d02e2c62a2a20b184e4f Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Thu, 6 Oct 2022 11:01:08 -0700
Subject: [PATCH 03/41] Add a shortcut to the desktop

---
 qgis.desktop | 6 ++++++
 start        | 8 ++++++++
 2 files changed, 14 insertions(+)
 create mode 100755 qgis.desktop
 create mode 100755 start

diff --git a/qgis.desktop b/qgis.desktop
new file mode 100755
index 0000000..3c5efdd
--- /dev/null
+++ b/qgis.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=qgis
+Exec=qgis
+Icon=/srv/conda/envs/notebook/share/qgis/images/icons/qgis-icon-512x512.png
\ No newline at end of file
diff --git a/start b/start
new file mode 100755
index 0000000..1ff95e4
--- /dev/null
+++ b/start
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -euo pipefail
+
+mkdir -p $HOME/Desktop
+
+cp $REPO_DIR/*.desktop $HOME/Desktop/
+
+exec "$@"
\ No newline at end of file

From 64d6a5bde118224feb997061d7c063b5cdeb6d2b Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Thu, 6 Oct 2022 14:46:23 -0700
Subject: [PATCH 04/41] Try install qgis from apt instead

From conda-forge, it fails with an OpenCL error
---
 apt.txt         | 2 ++
 environment.yml | 2 --
 qgis.desktop    | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apt.txt b/apt.txt
index fe946e3..9114c68 100644
--- a/apt.txt
+++ b/apt.txt
@@ -25,3 +25,5 @@ texlive-xetex
 texlive-fonts-recommended
 texlive-plain-generic
 texlive-lang-chinese
+
+qgis
diff --git a/environment.yml b/environment.yml
index 3eaedf9..36fab41 100644
--- a/environment.yml
+++ b/environment.yml
@@ -9,8 +9,6 @@ dependencies:
 # Needed for linux desktop environment
 - websockify
 
-- qgis=3.22.*
-
 - pip
 - pip:
 # For desktop environment
diff --git a/qgis.desktop b/qgis.desktop
index 3c5efdd..97172b7 100755
--- a/qgis.desktop
+++ b/qgis.desktop
@@ -2,5 +2,4 @@
 Version=1.0
 Type=Application
 Name=qgis
-Exec=qgis
-Icon=/srv/conda/envs/notebook/share/qgis/images/icons/qgis-icon-512x512.png
\ No newline at end of file
+Exec=qgis
\ No newline at end of file

From 8eb2afefb5d8f8c7705df0a69d2ed221778477d7 Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Mon, 10 Oct 2022 12:12:11 -0700
Subject: [PATCH 05/41] Try installing qgis from conda-forge again

They made a new release!
---
 apt.txt         | 2 --
 environment.yml | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apt.txt b/apt.txt
index 9114c68..fe946e3 100644
--- a/apt.txt
+++ b/apt.txt
@@ -25,5 +25,3 @@ texlive-xetex
 texlive-fonts-recommended
 texlive-plain-generic
 texlive-lang-chinese
-
-qgis
diff --git a/environment.yml b/environment.yml
index 36fab41..3eaedf9 100644
--- a/environment.yml
+++ b/environment.yml
@@ -9,6 +9,8 @@ dependencies:
 # Needed for linux desktop environment
 - websockify
 
+- qgis=3.22.*
+
 - pip
 - pip:
 # For desktop environment

From 94b23b8e929d72440f47d6b1bff8919326b3e4df Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Mon, 10 Oct 2022 13:13:02 -0700
Subject: [PATCH 06/41] Try fixing qgis from conda-forge

---
 apt.txt         | 3 +++
 environment.yml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/apt.txt b/apt.txt
index fe946e3..4554f57 100644
--- a/apt.txt
+++ b/apt.txt
@@ -25,3 +25,6 @@ texlive-xetex
 texlive-fonts-recommended
 texlive-plain-generic
 texlive-lang-chinese
+
+# Needed for qgis maybe? https://github.com/conda-forge/pygridgen-feedstock/issues/10
+libgl1-mesa-glx
diff --git a/environment.yml b/environment.yml
index 3eaedf9..5338cd2 100644
--- a/environment.yml
+++ b/environment.yml
@@ -11,6 +11,9 @@ dependencies:
 
 - qgis=3.22.*
 
+# Maybe needed for qgis? https://github.com/conda-forge/qgis-feedstock/issues/263
+- pyopencl
+
 - pip
 - pip:
 # For desktop environment

From 43abc56926d4ef30f0fd96ad4a6485fd198ea775 Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Mon, 10 Oct 2022 13:55:12 -0700
Subject: [PATCH 07/41] Fix qgis on CEE with a hack

Ref https://github.com/conda-forge/qgis-feedstock/issues/263
---
 postBuild | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100755 postBuild

diff --git a/postBuild b/postBuild
new file mode 100755
index 0000000..0fba2b2
--- /dev/null
+++ b/postBuild
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -eou pipefail
+
+# HORRIBLE HACK to get qgis working. conda-forge brings in libgsl 2.7, but this seems
+# to require libgsl 2.5? And I can't force conda to install that. This might break something
+# deep somewhere. See https://github.com/conda-forge/qgis-feedstock/issues/263
+# for upstream discussion
+ln -s /srv/conda/envs/notebook/lib/libgsl.so.27 /srv/conda/envs/notebook/lib/libgsl.so.25
\ No newline at end of file

From 5952ea3e3a1b0ff1023482ba984f674c7e000a47 Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Mon, 10 Oct 2022 14:17:16 -0700
Subject: [PATCH 08/41] Add desktop qgis icon

---
 qgis.desktop | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qgis.desktop b/qgis.desktop
index 97172b7..3c5efdd 100755
--- a/qgis.desktop
+++ b/qgis.desktop
@@ -2,4 +2,5 @@
 Version=1.0
 Type=Application
 Name=qgis
-Exec=qgis
\ No newline at end of file
+Exec=qgis
+Icon=/srv/conda/envs/notebook/share/qgis/images/icons/qgis-icon-512x512.png
\ No newline at end of file

From 9152bbfea68ed3d03c236afed62c0d7749e47ff4 Mon Sep 17 00:00:00 2001
From: sitarn <74383268+sitarn@users.noreply.github.com>
Date: Thu, 3 Nov 2022 16:56:25 -0700
Subject: [PATCH 09/41] Update environment.yml

I would like to add math functionality. As far as I was able to check scipy, & mpld3  are specifically missing for the codes I am running (error functions etc)...
So, this is a test of my understanding how this environment works.
Thanks.
---
 environment.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/environment.yml b/environment.yml
index 5338cd2..ea500e6 100644
--- a/environment.yml
+++ b/environment.yml
@@ -5,6 +5,9 @@ channels:
 # Only libraries *not* available in PyPI should be here
 dependencies:
 - python=3.9.*
+#adding math functionality (not sure what should be here and what should be in PyPI) 
+- matplotlib
+
 
 # Needed for linux desktop environment
 - websockify
@@ -19,3 +22,7 @@ dependencies:
 # For desktop environment
   - jupyter-desktop-server==0.1.3
   - -r infra-requirements.txt
+  
+  #needed for math functions
+  - scipy
+  - mpld3

From edc065fe73fef966f11266806a40b505f165f716 Mon Sep 17 00:00:00 2001
From: sitarn <74383268+sitarn@users.noreply.github.com>
Date: Thu, 3 Nov 2022 17:53:39 -0700
Subject: [PATCH 10/41] Update environment.yml

Moved the math libraries to the conda-forge environment per suggestion.
---
 environment.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/environment.yml b/environment.yml
index ea500e6..b17d582 100644
--- a/environment.yml
+++ b/environment.yml
@@ -5,9 +5,10 @@ channels:
 # Only libraries *not* available in PyPI should be here
 dependencies:
 - python=3.9.*
-#adding math functionality (not sure what should be here and what should be in PyPI) 
+#adding math functionality 
 - matplotlib
-
+- scipy
+- mpld3
 
 # Needed for linux desktop environment
 - websockify
@@ -23,6 +24,4 @@ dependencies:
   - jupyter-desktop-server==0.1.3
   - -r infra-requirements.txt
   
-  #needed for math functions
-  - scipy
-  - mpld3
+

From 67360a2ce31c456ae9075eb2a6e46f5303bec6aa Mon Sep 17 00:00:00 2001
From: Balaji Alwar <balajialwar@berkeley.edu>
Date: Thu, 1 Dec 2022 18:42:26 -0800
Subject: [PATCH 11/41] Adding test update for a docker file and information
 about jupyter tree download in comments

---
 apt.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apt.txt b/apt.txt
index 4554f57..bebcb93 100644
--- a/apt.txt
+++ b/apt.txt
@@ -28,3 +28,6 @@ texlive-lang-chinese
 
 # Needed for qgis maybe? https://github.com/conda-forge/pygridgen-feedstock/issues/10
 libgl1-mesa-glx
+
+# For jupyter-tree-download. Ref: https://github.com/berkeley-dsep-infra/datahub/issues/3979			
+zip
\ No newline at end of file

From 3fc549ffcb4f401c4fcbf5dca7115398a7106693 Mon Sep 17 00:00:00 2001
From: ryanlovett <rylo@berkeley.edu>
Date: Mon, 19 Dec 2022 09:44:18 -0800
Subject: [PATCH 12/41] Bump jupyterhub to 3.1.0.

Per slack with @yuvipanda.
---
 infra-requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/infra-requirements.txt b/infra-requirements.txt
index cf0e9c8..c557c7a 100644
--- a/infra-requirements.txt
+++ b/infra-requirements.txt
@@ -14,7 +14,7 @@ retrolab==0.3.21
 nbgitpuller==1.1.0
 jupyter-resource-usage==0.6.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==2.3.1
+jupyterhub==3.1.0
 appmode==0.8.0
 ipywidgets==7.7.2
 otter-grader==3.1.4
@@ -29,4 +29,4 @@ 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
-jupyter-syncthing-proxy==1.0.3
\ No newline at end of file
+jupyter-syncthing-proxy==1.0.3

From 083ad80b77b362e411ef5bf7bcb26a6c015cbed7 Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Tue, 28 Mar 2023 12:01:13 -0700
Subject: [PATCH 13/41] upgrade jupyterhub to 4.0.0b2, normalize python env
 files

---
 environment.yml        | 2 +-
 infra-requirements.txt | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/environment.yml b/environment.yml
index b17d582..a90d5ca 100644
--- a/environment.yml
+++ b/environment.yml
@@ -23,5 +23,5 @@ dependencies:
 # For desktop environment
   - jupyter-desktop-server==0.1.3
   - -r infra-requirements.txt
-  
+  - otter-grader==3.1.4  
 
diff --git a/infra-requirements.txt b/infra-requirements.txt
index c557c7a..4a6e199 100644
--- a/infra-requirements.txt
+++ b/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.0b2
 appmode==0.8.0
 ipywidgets==7.7.2
-otter-grader==3.1.4
 jupyter-tree-download==1.0.1
 git-credential-helpers==0.2
 # Enough people like this, let's load it in.

From db563a7052f1923985db731f3fade57492e11e02 Mon Sep 17 00:00:00 2001
From: balajialg <balajialwar@berkeley.edu>
Date: Tue, 16 May 2023 16:01:04 -0700
Subject: [PATCH 14/41] Version unversioned packages in the CEE image

---
 environment.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/environment.yml b/environment.yml
index a90d5ca..9e3d3da 100644
--- a/environment.yml
+++ b/environment.yml
@@ -6,17 +6,17 @@ channels:
 dependencies:
 - python=3.9.*
 #adding math functionality 
-- matplotlib
-- scipy
-- mpld3
+- matplotlib=3.7.*
+- scipy=1.10.*
+- mpld3=0.5.*
 
 # Needed for linux desktop environment
-- websockify
+- websockify=0.11.0
 
 - qgis=3.22.*
 
 # Maybe needed for qgis? https://github.com/conda-forge/qgis-feedstock/issues/263
-- pyopencl
+- pyopencl=2023.1
 
 - pip
 - pip:

From 37219778d66ed458b1c0dcf6f2d3005fe63e2695 Mon Sep 17 00:00:00 2001
From: Jonathan Felder <felder@berkeley.edu>
Date: Tue, 1 Aug 2023 16:40:19 -0700
Subject: [PATCH 15/41] postBuild ln complains that file exists, so do we
 need?"

---
 postBuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/postBuild b/postBuild
index 0fba2b2..0b401ab 100755
--- a/postBuild
+++ b/postBuild
@@ -5,4 +5,4 @@ set -eou pipefail
 # to require libgsl 2.5? And I can't force conda to install that. This might break something
 # deep somewhere. See https://github.com/conda-forge/qgis-feedstock/issues/263
 # for upstream discussion
-ln -s /srv/conda/envs/notebook/lib/libgsl.so.27 /srv/conda/envs/notebook/lib/libgsl.so.25
\ No newline at end of file
+#ln -s /srv/conda/envs/notebook/lib/libgsl.so.27 /srv/conda/envs/notebook/lib/libgsl.so.25

From dc963487fa227ff37b865e55405ba873877ede83 Mon Sep 17 00:00:00 2001
From: ryanlovett <rylo@berkeley.edu>
Date: Mon, 14 Aug 2023 21:04:02 -0700
Subject: [PATCH 16/41] Run infra-packages script.

---
 infra-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra-requirements.txt b/infra-requirements.txt
index 4a6e199..afa0268 100644
--- a/infra-requirements.txt
+++ b/infra-requirements.txt
@@ -14,7 +14,7 @@ retrolab==0.3.21
 nbgitpuller==1.1.0
 jupyter-resource-usage==0.6.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.0.0b2
+jupyterhub==4.0.2
 appmode==0.8.0
 ipywidgets==7.7.2
 jupyter-tree-download==1.0.1

From c4f149cce225970c48a5c4f79840120048db05e8 Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Tue, 31 Oct 2023 11:58:04 -0700
Subject: [PATCH 17/41] update popcon to the hash of my PR

---
 infra-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra-requirements.txt b/infra-requirements.txt
index afa0268..75e9ab7 100644
--- a/infra-requirements.txt
+++ b/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

From 458c875eca6d3dcbe8e4928ba9a49d3644124bb9 Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Tue, 31 Oct 2023 12:21:40 -0700
Subject: [PATCH 18/41] s/python-popularity==//

---
 infra-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra-requirements.txt b/infra-requirements.txt
index 75e9ab7..611bfb5 100644
--- a/infra-requirements.txt
+++ b/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 6faa171c27b3d0447bb87210330edfb6a9a2ee67 Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Tue, 7 Nov 2023 13:47:47 -0800
Subject: [PATCH 19/41] update infra-reqs, all hubs etc to run latest popcon
 with better error handling

---
 infra-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra-requirements.txt b/infra-requirements.txt
index 611bfb5..ca42d16 100644
--- a/infra-requirements.txt
+++ b/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 ca8753801e5ccb9fe37352b579e087f48b4822b7 Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Thu, 16 Nov 2023 14:40:08 -0800
Subject: [PATCH 20/41] less means more (images built)

---
 apt.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apt.txt b/apt.txt
index bebcb93..fdb6e7b 100644
--- a/apt.txt
+++ b/apt.txt
@@ -1,3 +1,6 @@
+# installing less as more just isn't enough
+less
+
 # For desktop environment
 dbus-x11
 xfce4
@@ -30,4 +33,4 @@ texlive-lang-chinese
 libgl1-mesa-glx
 
 # For jupyter-tree-download. Ref: https://github.com/berkeley-dsep-infra/datahub/issues/3979			
-zip
\ No newline at end of file
+zip

From ef2cb6b94aa601b261d6ea86b89ffa94cf081aa9 Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Thu, 11 Jan 2024 13:09:37 -0800
Subject: [PATCH 21/41] jupyterlab 4.0.10 redux

---
 infra-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra-requirements.txt b/infra-requirements.txt
index ca42d16..6493f7d 100644
--- a/infra-requirements.txt
+++ b/infra-requirements.txt
@@ -9,7 +9,7 @@
 
 # FIXME: Freeze this to get exact versions of all dependencies
 notebook==6.4.12
-jupyterlab==3.4.5
+jupyterlab==4.0.10
 retrolab==0.3.21
 nbgitpuller==1.1.0
 jupyter-resource-usage==0.6.1

From ed16271b46d3bffff6d1f8fad0bc63a82c98ba28 Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Thu, 11 Jan 2024 13:20:15 -0800
Subject: [PATCH 22/41] remove retrolab

---
 infra-requirements.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/infra-requirements.txt b/infra-requirements.txt
index 6493f7d..664bf97 100644
--- a/infra-requirements.txt
+++ b/infra-requirements.txt
@@ -10,7 +10,6 @@
 # FIXME: Freeze this to get exact versions of all dependencies
 notebook==6.4.12
 jupyterlab==4.0.10
-retrolab==0.3.21
 nbgitpuller==1.1.0
 jupyter-resource-usage==0.6.1
 # Matches version in images/hub/Dockerfile

From 79d5de01ad9a4af22019d490fad0ccebb319f242 Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Thu, 11 Jan 2024 13:29:04 -0800
Subject: [PATCH 23/41] bump jupyter-resource-usage

---
 infra-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra-requirements.txt b/infra-requirements.txt
index 664bf97..ffe5c10 100644
--- a/infra-requirements.txt
+++ b/infra-requirements.txt
@@ -11,7 +11,7 @@
 notebook==6.4.12
 jupyterlab==4.0.10
 nbgitpuller==1.1.0
-jupyter-resource-usage==0.6.1
+jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
 jupyterhub==4.0.2
 appmode==0.8.0

From 8710466ed8a945c99a5cc330af95771f3301822a Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Thu, 11 Jan 2024 13:41:37 -0800
Subject: [PATCH 24/41] adding jupyter-archive to all hubs

---
 infra-requirements.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/infra-requirements.txt b/infra-requirements.txt
index ffe5c10..f36a59a 100644
--- a/infra-requirements.txt
+++ b/infra-requirements.txt
@@ -28,3 +28,5 @@ git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handli
 RISE==5.7.1
 # syncthing for dropbox-like functionality
 jupyter-syncthing-proxy==1.0.3
+# jupyter archival tool for easy user downloads
+jupyter-archive==3.4.0

From 8551a20194e11dc43f6e8dd88fa4584a5a12e3b8 Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Sun, 14 Jan 2024 09:48:12 -0800
Subject: [PATCH 25/41] fix datahub build

---
 infra-requirements.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/infra-requirements.txt b/infra-requirements.txt
index f36a59a..ef16a52 100644
--- a/infra-requirements.txt
+++ b/infra-requirements.txt
@@ -10,17 +10,17 @@
 # FIXME: Freeze this to get exact versions of all dependencies
 notebook==6.4.12
 jupyterlab==4.0.10
-nbgitpuller==1.1.0
+nbgitpuller==1.2.0
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
 jupyterhub==4.0.2
 appmode==0.8.0
-ipywidgets==7.7.2
+ipywidgets==8.0.7
 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
+jupyter-contrib-nbextensions==0.7.0
+jupyter_nbextensions_configurator==0.6.3
 # 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/shaneknapp/python-popularity-contest.git@add-error-handling

From 3e6f22c2a8ad2257b80fa742086b0a1b9aa55467 Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Sun, 14 Jan 2024 12:49:20 -0800
Subject: [PATCH 26/41] bump notebook to 7

---
 infra-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra-requirements.txt b/infra-requirements.txt
index ef16a52..e08dea3 100644
--- a/infra-requirements.txt
+++ b/infra-requirements.txt
@@ -8,7 +8,7 @@
 # everwhere one by one.
 
 # FIXME: Freeze this to get exact versions of all dependencies
-notebook==6.4.12
+notebook==7.0.6
 jupyterlab==4.0.10
 nbgitpuller==1.2.0
 jupyter-resource-usage==1.0.1

From ae540617a9bc1eee1cdc992c29de40aebe776975 Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Thu, 18 Jan 2024 11:34:53 -0800
Subject: [PATCH 27/41] notebook export for cee

---
 environment.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 9e3d3da..4cc3b7b 100644
--- a/environment.yml
+++ b/environment.yml
@@ -24,4 +24,7 @@ dependencies:
   - jupyter-desktop-server==0.1.3
   - -r infra-requirements.txt
   - otter-grader==3.1.4  
-
+  # for notebook exporting
+  - nbconvert==7.6.0
+  - nb2pdf==0.6.2
+  - nbpdfexport==0.2.1

From 08b5d876e55de5e3ad13c3f9d5459897e564dadf Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Mon, 29 Jan 2024 11:30:56 -0800
Subject: [PATCH 28/41] remove deprecated nbconvert packages

---
 infra-requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/infra-requirements.txt b/infra-requirements.txt
index e08dea3..0b14278 100644
--- a/infra-requirements.txt
+++ b/infra-requirements.txt
@@ -19,8 +19,8 @@ ipywidgets==8.0.7
 jupyter-tree-download==1.0.1
 git-credential-helpers==0.2
 # Enough people like this, let's load it in.
-jupyter-contrib-nbextensions==0.7.0
-jupyter_nbextensions_configurator==0.6.3
+# jupyter-contrib-nbextensions==0.7.0
+# jupyter_nbextensions_configurator==0.6.3
 # 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/shaneknapp/python-popularity-contest.git@add-error-handling

From 840b474680462612122299759249100b124795f3 Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Mon, 29 Jan 2024 11:34:57 -0800
Subject: [PATCH 29/41] remove rather than comment out

---
 infra-requirements.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/infra-requirements.txt b/infra-requirements.txt
index 0b14278..d029ba5 100644
--- a/infra-requirements.txt
+++ b/infra-requirements.txt
@@ -18,9 +18,6 @@ appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1
 git-credential-helpers==0.2
-# Enough people like this, let's load it in.
-# jupyter-contrib-nbextensions==0.7.0
-# jupyter_nbextensions_configurator==0.6.3
 # 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/shaneknapp/python-popularity-contest.git@add-error-handling

From ed9fe321f8da610cf510a5c49709591cb7726ad6 Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Tue, 6 Feb 2024 10:05:17 -0800
Subject: [PATCH 30/41] notebook 7.0.7

---
 infra-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra-requirements.txt b/infra-requirements.txt
index d029ba5..52a0479 100644
--- a/infra-requirements.txt
+++ b/infra-requirements.txt
@@ -8,7 +8,7 @@
 # everwhere one by one.
 
 # FIXME: Freeze this to get exact versions of all dependencies
-notebook==7.0.6
+notebook==7.0.7
 jupyterlab==4.0.10
 nbgitpuller==1.2.0
 jupyter-resource-usage==1.0.1

From 29cb0d3cfde430f091481a51e8550070ba6666aa Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Tue, 6 Feb 2024 10:09:05 -0800
Subject: [PATCH 31/41] jupyterlab via infra-reqs to 4.0.11

---
 infra-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra-requirements.txt b/infra-requirements.txt
index 52a0479..af781f4 100644
--- a/infra-requirements.txt
+++ b/infra-requirements.txt
@@ -9,7 +9,7 @@
 
 # FIXME: Freeze this to get exact versions of all dependencies
 notebook==7.0.7
-jupyterlab==4.0.10
+jupyterlab==4.0.11
 nbgitpuller==1.2.0
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile

From 7b77549f3f5321aa168680a32328ba95ce3ca14a Mon Sep 17 00:00:00 2001
From: ryanlovett <rylo@berkeley.edu>
Date: Wed, 13 Mar 2024 12:44:34 -0700
Subject: [PATCH 32/41] Bump jupyter-server-proxy to 4.1.1.

Upgrade, and also explicitly add as dependency where this version wouldn't normally be pulled in. Also bump jupyter-rsession-proxy where relevant.
---
 environment.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/environment.yml b/environment.yml
index 4cc3b7b..7daeafc 100644
--- a/environment.yml
+++ b/environment.yml
@@ -5,6 +5,7 @@ channels:
 # Only libraries *not* available in PyPI should be here
 dependencies:
 - python=3.9.*
+- jupyter-server-proxy==4.1.1
 #adding math functionality 
 - matplotlib=3.7.*
 - scipy=1.10.*

From f9355e984f238505077709ed69a49785da78f440 Mon Sep 17 00:00:00 2001
From: ryanlovett <rylo@berkeley.edu>
Date: Wed, 13 Mar 2024 16:56:04 -0700
Subject: [PATCH 33/41] Bump to jupyter-server-proxy 4.1.2.

It was released earlier today after a regression was spotted in 4.1.1.
---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 7daeafc..2720b3c 100644
--- a/environment.yml
+++ b/environment.yml
@@ -5,7 +5,7 @@ channels:
 # Only libraries *not* available in PyPI should be here
 dependencies:
 - python=3.9.*
-- jupyter-server-proxy==4.1.1
+- jupyter-server-proxy==4.1.2
 #adding math functionality 
 - matplotlib=3.7.*
 - scipy=1.10.*

From 30f35efea8d67ba572abeddd81fb3a8c72b2b4dc Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Sat, 30 Mar 2024 16:18:22 -0700
Subject: [PATCH 34/41] bump jupyterhub

---
 infra-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra-requirements.txt b/infra-requirements.txt
index af781f4..62504c7 100644
--- a/infra-requirements.txt
+++ b/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.0
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.0.2
+jupyterhub==4.1.0
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1

From 69340cffa8fccf304a988ded3928a48a87e86257 Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Mon, 1 Apr 2024 14:28:47 -0700
Subject: [PATCH 35/41] more bumping

---
 infra-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra-requirements.txt b/infra-requirements.txt
index 62504c7..d4feb19 100644
--- a/infra-requirements.txt
+++ b/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.0
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.0
+jupyterhub==4.1.4
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1

From 9d928818322af16099ce48eae93584c1d85a2302 Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Thu, 4 Apr 2024 22:27:05 -0700
Subject: [PATCH 36/41] debump jh 4.1.4

---
 infra-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra-requirements.txt b/infra-requirements.txt
index d4feb19..96b9029 100644
--- a/infra-requirements.txt
+++ b/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.0
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.4
+jupyterhub==4.0.1
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1

From 57fc2522ee94fff4770632d3367456636aee9a25 Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Fri, 5 Apr 2024 13:52:42 -0700
Subject: [PATCH 37/41] upgrading is fun

---
 infra-requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/infra-requirements.txt b/infra-requirements.txt
index 96b9029..b01c9d8 100644
--- a/infra-requirements.txt
+++ b/infra-requirements.txt
@@ -10,10 +10,10 @@
 # FIXME: Freeze this to get exact versions of all dependencies
 notebook==7.0.7
 jupyterlab==4.0.11
-nbgitpuller==1.2.0
+nbgitpuller==1.2.1
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.0.1
+jupyterhub==4.1.5
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1

From 8b7fdaaaffd327265fff8f9cb9705c3a79c02de1 Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Mon, 6 May 2024 12:23:00 -0700
Subject: [PATCH 38/41] bump python to 3.11

---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 2720b3c..c084aa2 100644
--- a/environment.yml
+++ b/environment.yml
@@ -4,7 +4,7 @@ channels:
 # Almost all libraries should be added in requirements.txt
 # Only libraries *not* available in PyPI should be here
 dependencies:
-- python=3.9.*
+- python=3.11.*
 - jupyter-server-proxy==4.1.2
 #adding math functionality 
 - matplotlib=3.7.*

From 4e4eda488d121506380ae08ba0efcdd3bdc2b99d Mon Sep 17 00:00:00 2001
From: ryanlovett <rylo@berkeley.edu>
Date: Mon, 17 Jun 2024 00:15:09 -0700
Subject: [PATCH 39/41] Bump jupyter-server-proxy for security update.

https://github.com/jupyterhub/jupyter-server-proxy/security/advisories/GHSA-fvcq-4x64-hqxr
---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index c084aa2..1c7f9b0 100644
--- a/environment.yml
+++ b/environment.yml
@@ -5,7 +5,7 @@ channels:
 # Only libraries *not* available in PyPI should be here
 dependencies:
 - python=3.11.*
-- jupyter-server-proxy==4.1.2
+- jupyter-server-proxy==4.2.0
 #adding math functionality 
 - matplotlib=3.7.*
 - scipy=1.10.*

From 061ae6e668cd369085a7e23eb14881b56e32f671 Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Wed, 3 Jul 2024 12:04:05 -0700
Subject: [PATCH 40/41] ran yamllint and fixed all of the pertinent errors

---
 environment.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/environment.yml b/environment.yml
index 1c7f9b0..7ce6957 100644
--- a/environment.yml
+++ b/environment.yml
@@ -6,7 +6,7 @@ channels:
 dependencies:
 - python=3.11.*
 - jupyter-server-proxy==4.2.0
-#adding math functionality 
+#adding math functionality
 - matplotlib=3.7.*
 - scipy=1.10.*
 - mpld3=0.5.*
@@ -24,7 +24,7 @@ dependencies:
 # For desktop environment
   - jupyter-desktop-server==0.1.3
   - -r infra-requirements.txt
-  - otter-grader==3.1.4  
+  - otter-grader==3.1.4
   # for notebook exporting
   - nbconvert==7.6.0
   - nb2pdf==0.6.2

From f5ca212b8b43a8af77ff897ab53d6e5ea5ac5819 Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Thu, 15 Aug 2024 10:17:07 -0700
Subject: [PATCH 41/41] bumping jupyterhub

---
 infra-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra-requirements.txt b/infra-requirements.txt
index b01c9d8..0fb0bd9 100644
--- a/infra-requirements.txt
+++ b/infra-requirements.txt
@@ -13,7 +13,7 @@ jupyterlab==4.0.11
 nbgitpuller==1.2.1
 jupyter-resource-usage==1.0.1
 # Matches version in images/hub/Dockerfile
-jupyterhub==4.1.5
+jupyterhub==4.1.6
 appmode==0.8.0
 ipywidgets==8.0.7
 jupyter-tree-download==1.0.1