From f57d1cedd43ca58bfaf59e7097731c4ab313ea69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Ctsnow03=E2=80=9D?= <tsnow@mines.edu>
Date: Thu, 25 Jan 2024 19:17:28 -0700
Subject: [PATCH] fix rebase

---
 environment.yml | 76 ++++++++++++++++++++++---------------------------
 1 file changed, 34 insertions(+), 42 deletions(-)

diff --git a/environment.yml b/environment.yml
index 040e80f..e27542b 100644
--- a/environment.yml
+++ b/environment.yml
@@ -1,20 +1,16 @@
 name: cryocloud
 
-channels:
-  - conda-forge
-  - nodefaults
-
 dependencies:
-  - python~=3.10.10
+  - python~=3.11.0
   # Required until https://github.com/jupyterhub/repo2docker/pull/1196 is merged
-  - jupyterhub-singleuser>=4.0
+  - jupyterhub-singleuser~=4.0.1
   # nbgitpuller is very helpful when distributing user content
-  - nbgitpuller==1.2.0
+  - nbgitpuller~=1.2.0
   # Specify major version of jupyterlab to use. Manually bump it when you want to upgrade
   # jupyterlab version
-  - jupyterlab>=4.0
+  - jupyterlab>=4.0,<4.1
   # This provides memory usage stats on JupyterLab and classic notebook
-  - jupyter-resource-usage~=1.0.0
+  - jupyter-resource-usage~=1.0.1
   # https://syncthing.net/ provides a dropbox-like interface for syncing directories across users,
   # hubs and machines. Used along with `jupyter-syncthing-proxy`.
   - jupyter-syncthing-proxy==1.0.3
@@ -27,43 +23,39 @@ dependencies:
   - gh~=2.32.1
   
   # VS Code support
-  - jupyter-vscode-proxy==0.5
-#  - jupyter-vscode-server==0.0.10
-#  - code-server==4.20.0
+  - jupyter-vscode-proxy~=0.5
+  - code-server~=4.16.1
 
   # Jupyter tools
-  - ipython~=8.17.0
-
-  # Warning: There's a bug in ipykernel 6.18 that crashes hvplot.
-  # See https://github.com/ipython/ipykernel/pull/1037. Restriction
-  # can be relaxed once that's fixed.
-  - ipykernel=6.16.0
-
-  - ipywidgets~=8.0.0
-  - jupyterlab-favorites==3.2.0
-  - jupyterlab-geojson==3.4.0
-  - jupyter-collaboration~=2.0.1
-  - jupyterlab-git==0.50.0
-#  - jupyter-ai==2.9.1 # Requires pandas>=2.0.1
-  - jupyterlab-myst==2.1.0
-  - jupyterlab-h5web~=11.1.0
+  - ipython~=8.20.0
+  - ipywidgets~=8.1.1
+  - jupyter-ai~=2.9.1
   - jupyter-book~=0.15.1
+#  - jupyter-offlinenotebook~=0.2.2 # Outdated according to jupyterlab
+#  - jupyter-collaboration~=2.0.1 # Causing save issues
+  - jupyterlab-favorites~=3.2.1
+  - jupyterlab-geojson~=3.4.0
+  - jupyterlab-git~=0.50.0
+  - jupyterlab-h5web~=11.1.0
+  - jupyterlab-myst~=2.1.0
+#  - jupyterlab-plotly~=5.18.0 # Outdated accoring to jupyterlab
+  - jupyterlab_pygments~=0.3.0 # To bring extension uptodate
   - jupytext~=1.16.1
   - nbconvert==6.5.3
-  - nbdime==4.0.1
+  - nbdime~=4.0.1
 
   # Core scientific python stack
   - cython==0.29.32 # optimization, C API access
   - hypothesis==6.58.0 # needed by numpy testing tools
   - networkx==2.8.8
-  - numba==0.58.1 # high-performance numerics
-  - numpy~=1.26.0
-  - pandas==1.5.1
-  - scikit-image==0.22.0
-  - scikit-learn==1.4.0
+  - numba~=0.58.1 # high-performance numerics
+  - numpy==1.23.5
+  - pandas>=2.0.1,<3.0
+  - scikit-image==0.19.3
+  - scikit-learn>=1.2.2,<2.0.0
   - scipy==1.9.3
   - statsmodels==0.13.5
-  - sympy~=1.12.0
+  - sympy~=1.12
   - xarray>=2023.05.0
 
   # Visualization packages
@@ -72,9 +64,9 @@ dependencies:
   - geoviews~=1.10.1
   - hvplot~=0.8.4
   - ipyleaflet~=0.17.3
-  - ipympl==0.9.2 # This enables matplotlib interaction with jupyter widgets
+  - ipympl~=0.9.3 # This enables matplotlib interaction with jupyter widgets
   - matplotlib~=3.8.0
-  - plotly==5.18.0
+  - plotly~=5.18.0
   - seaborn==0.12.1 # statistical plotting with matplotlib
   - geemap~=0.30.0
 
@@ -108,9 +100,9 @@ dependencies:
   - intake-xarray==0.6.1
   - gcsfs>=2023.5.0
 
-  # Distributed computing *
-  - dask==2024.1.0
-  - dask-labextension==7.0.0
+  # Distributed computing
+  - dask>=2023.12.1
+  - dask-labextension~=7.0.0
   - dask-geopandas~=0.3.1
   
   # Other useful generic python packages
@@ -125,7 +117,7 @@ dependencies:
   - esmpy~=8.4.2
   - xmip~=0.7.1
 
-  # Packages specific to cryo work *
+  # Packages specific to cryo work
   - h5coro~=0.0.6
   - icepyx~=0.8.1
   - itslive~=0.3.2
@@ -137,7 +129,7 @@ dependencies:
   # Maybe needed for qgis? https://github.com/conda-forge/qgis-feedstock/issues/263
   - pyopencl
   # Resolves warning "No ICDs were found": https://github.com/CryoInTheCloud/hub-image/issues/50
-  # - ocl-icd-system
+  - ocl-icd-system
   # needed for Linux desktop to work
   - websockify>=0.10
   # Includes new subcommands (`switch` & `restore`) and vulnerability fixes
@@ -145,7 +137,7 @@ dependencies:
   - git>=2.39
 
   # Not all packages will be available from conda-forge, we install from pip when we need to.
-  - pip==23.3.2
+  - pip~=23.3.2
   - pip:
     # Access linux desktop from inside JupyterHub
     - jupyter-desktop-server==0.1.3