From ef03485f1fbfe1fcaf0076d94e166168df41ab06 Mon Sep 17 00:00:00 2001
From: Emma Ai <emmaai@users.noreply.github.com>
Date: Tue, 5 Mar 2024 10:37:25 +1030
Subject: [PATCH] make everything compatible with jupyterlab=3.6.x (#280)

* make everything compatible with jupyterlab=3.6.x

* increase size limit to 8G

* pin pytest as 8.1.0 not working

---------

Co-authored-by: Emma Ai <emma.ai@ga.gov.au>
---
 .github/workflows/dive.yml | 2 +-
 docker/Dockerfile          | 6 +++---
 docker/env.yaml            | 7 ++++---
 docker/requirements.txt    | 3 +++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/dive.yml b/.github/workflows/dive.yml
index 4f37cc4..6d7863a 100644
--- a/.github/workflows/dive.yml
+++ b/.github/workflows/dive.yml
@@ -91,4 +91,4 @@ jobs:
         uses: wemake-services/docker-image-size-limit@master
         with:
           image: ${{ env.ORG }}/${{ env.IMAGE}}:_build
-          size: "7 GiB"
+          size: "8 GiB"
diff --git a/docker/Dockerfile b/docker/Dockerfile
index fd52837..d1d613c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM mambaorg/micromamba:git-e4f55ab-jammy as sandbox-conda
+FROM mambaorg/micromamba:git-df79b72-jammy as sandbox-conda
 
 USER root
 COPY env.yaml /conf/
@@ -16,7 +16,7 @@ ENV CC=/env/bin/x86_64-conda_cos6-linux-gnu-gcc \
 RUN micromamba run -p /env pip install --no-cache-dir \
     --no-build-isolation -r /conf/requirements.txt
 
-FROM ubuntu:jammy-20230816
+FROM ubuntu:jammy-20240212
 
 ARG nb_user=jovyan
 ARG nb_uid=1000
@@ -38,7 +38,7 @@ ENV LC_ALL=C.UTF-8 \
 USER $nb_user
 # NOTE - JupyterLab extensions can now be distributed as prebuilt extensions and available to PyPI
 RUN echo "Enable jupyter lab extensions" \
-  && jupyter labextension install jupyterlab-theme-toggle \
+  && jupyter labextension install jupyterlab-topbar-extension jupyterlab-theme-toggle \
   && jupyter labextension list \
   && echo "...done"
 
diff --git a/docker/env.yaml b/docker/env.yaml
index 0b0c010..1011679 100644
--- a/docker/env.yaml
+++ b/docker/env.yaml
@@ -52,7 +52,7 @@ dependencies:
   - datadog
   - deepdiff
   - defusedxml
-  - distributed
+  - distributed>=2023.11
   - docutils
   - ephem
   - fiona
@@ -109,7 +109,7 @@ dependencies:
   - pyrsistent
   - pystac
   - pystac-client
-  - pytest
+  - pytest!=8.1.0
   - python-dateutil
   - python-rapidjson
   - python-slugify
@@ -221,7 +221,8 @@ dependencies:
   - jupyterlab-topbar
   - jupyterlab-system-monitor
   - jupyterhub
-  - jupytext
+  - jupytext<1.14
+  - jupyterlab_pygments<0.3.0
   - jupyter-resource-usage
   - jupyter_server
   - jupyter-server-proxy
diff --git a/docker/requirements.txt b/docker/requirements.txt
index d32aaaa..379674b 100644
--- a/docker/requirements.txt
+++ b/docker/requirements.txt
@@ -6,6 +6,9 @@ jupyterlab-logout
 jupyter-contrib-core
 jupyter-contrib-nbextensions
 jupyter-nbextensions-configurator
+# pin for jupyterlab=3.x
+jupyterlab-topbar-text==0.6.2
+jupyterlab-logout==0.5.0
 
 # ODC/DEA: these are installed in builder stage
 otps