Merge pull request #5912 from ryanlovett/datahub-aug-workshop

Add tools for summer workshop.
berkeley-dsep-infra · Aug 6, 2024 · 05e5e5d · 05e5e5d
2 parents 986a168 + c483db5
commit 05e5e5d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/deployments/datahub/images/default/apt.txt b/deployments/datahub/images/default/apt.txt
@@ -78,3 +78,7 @@ libgdal-dev
 libgeos-dev
 libproj-dev
 libmysqlclient-dev
+
+# 2024-08 workshop
+# https://github.com/berkeley-dsep-infra/datahub/issues/5906
+man
diff --git a/deployments/datahub/images/default/environment.yml b/deployments/datahub/images/default/environment.yml
@@ -2,7 +2,7 @@
 # For conda, == is exact constraint, while = is fuzzy constraint.
 # pip uses https://peps.python.org/pep-0440/ which does not have =.
 dependencies:
-- nodejs=16.*
+- nodejs=18.*
 - traitlets=5.9.*
 - pip=22.2.*
 - python=3.11.*
@@ -18,7 +18,7 @@ dependencies:
 # Base scientific packages that other conda packages we install depend on
 # We don't want to have conda packages depend on pip packages if possible
 - numpy=1.26.*
-- matplotlib=3.7.*
+- matplotlib=3.9.*
 - scipy=1.10.0
 - ipympl=0.9.*
 - pandas==2.2.2
@@ -99,9 +99,21 @@ dependencies:
 - obspy==1.4.1
 
 # Install VSCode for ESPM courses - https://github.com/berkeley-dsep-infra/datahub/issues/5716
-- nodejs=16 # code-server requires node < 17
-- jupyter-vscode-proxy==0.5
-- code-server==4.10.1
+- jupyter-vscode-proxy==0.6
+- code-server==4.23.1
+
+# 2024-08 workshop, #5908
+- tree==2.1.3
+- ruff==0.5.6
+
+# Stat 165/265 requires prophet, Spring, 2024
+- prophet==1.1.5
+
+# [DH-319] https://github.com/berkeley-dsep-infra/datahub/issues/5827, ESPM 157
+- altair==5.3.0
+- leafmap==0.36.4
+- mystmd==1.3.1
+- jupyterlab-git==0.50.1
 
 - pip:
   # - -r /tmp/infra-requirements.txt
@@ -205,9 +217,6 @@ dependencies:
   # pulled in by ottr, if not pinned to 1.16.2, 1.16.3 causes DH-323
   - jupytext==1.16.2
 
-  # Stat 165/265 requires prophet, Spring, 2024
-  - prophet==1.1.5
-
   # https://github.com/berkeley-dsep-infra/datahub/issues/5497
   - ottr-force-save-labextension==0.1.1
 
@@ -219,8 +228,6 @@ dependencies:
   - rtree==1.2.0
 
   # [DH-319] https://github.com/berkeley-dsep-infra/datahub/issues/5827, ESPM 157
-  - altair==5.3.0
   - ibis-framework[pandas]==9.2.0
-  - leafmap==0.36.1
-  - mystmd==1.3.0
-  - jupyterlab-git==0.50.1
+
+  # ATTEMPT TO PUT NEW PACKAGES IN THE CONDA LIST ABOVE FIRST, RATHER THAN PIP