fix conflicts

environment.yml

@@ -7,14 +7,14 @@ channels:
 dependencies:
   - python~=3.10.10
   # Required until https://github.com/jupyterhub/repo2docker/pull/1196 is merged
-  - jupyterhub==4.0.2
+  - jupyterhub-singleuser>=4.0
   # nbgitpuller is very helpful when distributing user content
-  - nbgitpuller~=1.1.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
   # This provides memory usage stats on JupyterLab and classic notebook
-  - jupyter-resource-usage~=0.7.1
+  - jupyter-resource-usage~=1.0.0
   # 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
@@ -28,23 +28,29 @@ dependencies:
 
   # VS Code support
   - jupyter-vscode-proxy==0.5
-  - code-server~=4.16.1
+#  - jupyter-vscode-server==0.0.10
+#  - code-server==4.20.0
 
   # Jupyter tools
-  - ipython~=8.20.0
-  - ipywidgets~=8.1.1
-  - jupyter-ai~=2.9.1
-  - jupyter-book~=0.15.1
-  - jupyter-offlinenotebook~=0.2.2
+  - 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-favorites~=3.2.1
-  - jupyterlab-geojson~=3.4.0
-  - jupyterlab-git~=0.50.0
+  - 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
-  - jupyterlab-myst~=2.1.0
+  - jupyter-book~=0.15.1
   - 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
@@ -102,10 +108,11 @@ dependencies:
   - intake-xarray==0.6.1
   - gcsfs>=2023.5.0
 
-  # Distributed computing
-  - dask>=2023.12.1
-  - dask-labextension~=7.0.0
+  # Distributed computing *
+  - dask==2024.1.0
+  - dask-labextension==7.0.0
   - dask-geopandas~=0.3.1
+
   # Other useful generic python packages
   - pillow~=10.2.0 # Python imaging library, useful for many image-related tasks
   - pytest==7.2.0