Move packages from pip section to conda.

deployments/datahub/images/default/environment.yml

@@ -104,8 +104,17 @@ dependencies:
 - code-server==4.10.1
 
 # 2024-08 workshop, #5908
-- tree
-- ruff
+- 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
@@ -209,9 +218,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
 
@@ -223,8 +229,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