From 136fe52e07d3b7f953c2f52e76993264adb385aa Mon Sep 17 00:00:00 2001
From: Carlos Cordoba <ccordoba12@gmail.com>
Date: Thu, 23 Nov 2023 11:04:03 -0500
Subject: [PATCH 1/2] CI: Pin IPykernel to 6.26.0 and QDarkstyle to 3.2.0

This avoids IPykernel 6.27.0, which broke the %edit magic, and
QDarkstyle 3.2.1, which doesn't work with PyQt 5.12.
---
 .github/scripts/install.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/scripts/install.sh b/.github/scripts/install.sh
index 5d15665bcb0..2674858f71d 100755
--- a/.github/scripts/install.sh
+++ b/.github/scripts/install.sh
@@ -26,6 +26,9 @@ if [ "$USE_CONDA" = "true" ]; then
     # Remove pylsp before installing its subrepo below
     micromamba remove --force python-lsp-server python-lsp-server-base -y
 
+    # Prevent error in a test for the %edit magic
+    micromamba install ipykernel=6.26.0 -q -y
+
 else
     # Update pip and setuptools
     python -m pip install -U pip setuptools wheel build
@@ -42,12 +45,18 @@ else
     # To check our manifest
     pip install -q check-manifest
 
-    # This allows the test suite to run more reliably on Linux
     if [ "$OS" = "linux" ]; then
+        # This allows the test suite to run more reliably on Linux
         pip uninstall pyqt5 pyqt5-qt5 pyqt5-sip pyqtwebengine pyqtwebengine-qt5 -q -y
         pip install pyqt5==5.12.* pyqtwebengine==5.12.*
+
+        # QDarkstyle 3.2.1 doesn't work with PyQt 5.12
+        pip install qdarkstyle==3.2
     fi
 
+    # Prevent error in a test for the %edit magic
+    pip install ipykernel==6.26.0
+
 fi
 
 # Install subrepos from source

From 80d7744b31c9ef029fb5a18cb276f9748a252765 Mon Sep 17 00:00:00 2001
From: Carlos Cordoba <ccordoba12@gmail.com>
Date: Thu, 23 Nov 2023 11:25:49 -0500
Subject: [PATCH 2/2] Installers: Fix conda-based installer workflow

---
 .github/workflows/installers-conda.yml | 8 ++++----
 installers-conda/build-environment.yml | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/installers-conda.yml b/.github/workflows/installers-conda.yml
index b8f2c70fa47..a41428e38b2 100644
--- a/.github/workflows/installers-conda.yml
+++ b/.github/workflows/installers-conda.yml
@@ -61,10 +61,10 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Build Environment
-        uses: mamba-org/provision-with-micromamba@main
+        uses: mamba-org/setup-micromamba@v1
         with:
           environment-file: installers-conda/build-environment.yml
-          extra-specs: python=${{ matrix.python-version }}
+          create-args: python=${{ matrix.python-version }}
 
       - name: Build Conda Packages
         run: python build_conda_pkgs.py --build $pkg
@@ -127,10 +127,10 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Build Environment
-        uses: mamba-org/provision-with-micromamba@main
+        uses: mamba-org/setup-micromamba@v1
         with:
           environment-file: installers-conda/build-environment.yml
-          extra-specs: python=${{ matrix.python-version }}
+          create-args: python=${{ matrix.python-version }}
 
       - name: Env Variables
         run: |
diff --git a/installers-conda/build-environment.yml b/installers-conda/build-environment.yml
index 54c4dd62262..45401fd2b84 100644
--- a/installers-conda/build-environment.yml
+++ b/installers-conda/build-environment.yml
@@ -7,5 +7,6 @@ dependencies:
   - conda-standalone
   - constructor
   - gitpython
+  - mamba
   - ruamel.yaml.jinja2
   - setuptools_scm