From d0385dffdccd0ed409a20f9c68cbaa84c6b88e88 Mon Sep 17 00:00:00 2001
From: dalthviz <16781833+dalthviz@users.noreply.github.com>
Date: Mon, 18 Nov 2024 18:41:12 -0500
Subject: [PATCH 1/3] Appearance: Handle error when trying to get
 invalid/unavailable custom syntac highlighting themes

---
 spyder/plugins/appearance/confpage.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/spyder/plugins/appearance/confpage.py b/spyder/plugins/appearance/confpage.py
index 803b0d4fdc1..cc6ca4d466e 100644
--- a/spyder/plugins/appearance/confpage.py
+++ b/spyder/plugins/appearance/confpage.py
@@ -6,6 +6,7 @@
 
 """Appearance entry in Preferences."""
 
+import configparser
 import sys
 
 import qstylizer.style
@@ -279,8 +280,17 @@ def setup_page(self):
         for name in names:
             self.scheme_editor_dialog.add_color_scheme_stack(name)
 
+        valid_custom_names = []
         for name in custom_names:
-            self.scheme_editor_dialog.add_color_scheme_stack(name, custom=True)
+            try:
+                self.scheme_editor_dialog.add_color_scheme_stack(name, custom=True)
+                valid_custom_names.append(name)
+            except configparser.NoOptionError:
+                # Ignore invalid custom syntax highlighting themes
+                # See spyder-ide/spyder#22492
+                pass
+
+        self.set_option("custom_names", valid_custom_names)
 
         if sys.platform == 'darwin':
             system_font_checkbox.checkbox.setEnabled(False)

From b494219654f5bc5ee668f51179da868b944bfaf4 Mon Sep 17 00:00:00 2001
From: dalthviz <16781833+dalthviz@users.noreply.github.com>
Date: Tue, 19 Nov 2024 16:24:26 -0500
Subject: [PATCH 2/3] Code format

---
 spyder/plugins/appearance/confpage.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spyder/plugins/appearance/confpage.py b/spyder/plugins/appearance/confpage.py
index cc6ca4d466e..0dfa21795ed 100644
--- a/spyder/plugins/appearance/confpage.py
+++ b/spyder/plugins/appearance/confpage.py
@@ -283,7 +283,9 @@ def setup_page(self):
         valid_custom_names = []
         for name in custom_names:
             try:
-                self.scheme_editor_dialog.add_color_scheme_stack(name, custom=True)
+                self.scheme_editor_dialog.add_color_scheme_stack(
+                    name, custom=True
+                )
                 valid_custom_names.append(name)
             except configparser.NoOptionError:
                 # Ignore invalid custom syntax highlighting themes

From 0aa84d865052f8390c259d0148b7c3c53d58364b Mon Sep 17 00:00:00 2001
From: Carlos Cordoba <ccordoba12@gmail.com>
Date: Tue, 19 Nov 2024 11:16:54 -0500
Subject: [PATCH 3/3] CI: Pin Jedi to 0.19.1 for now on Linux

- That's necessary to make test_update_outline pass on CIs (it passes
locally just fine).
- Also, increase number of times test_update_outline is rerun because
it's too flaky.
---
 .github/scripts/install.sh          | 11 +++++++++++
 spyder/app/tests/test_mainwindow.py |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/scripts/install.sh b/.github/scripts/install.sh
index f62334ec370..53fe89be5d0 100755
--- a/.github/scripts/install.sh
+++ b/.github/scripts/install.sh
@@ -42,6 +42,12 @@ if [ "$USE_CONDA" = "true" ]; then
     # Remove pylsp before installing its subrepo below
     micromamba remove --force python-lsp-server python-lsp-server-base -y
 
+    # Pin Jedi to 0.19.1 because test_update_outline fails frequently with
+    # 0.19.2, although it passes locally
+    if [ "$OS" = "linux" ]; then
+        micromamba install jedi=0.19.1
+    fi
+
 else
     # Update pip and setuptools
     python -m pip install -U pip setuptools wheel build
@@ -58,6 +64,11 @@ else
     # To check our manifest
     pip install -q check-manifest
 
+    # Pin Jedi to 0.19.1 because test_update_outline fails frequently with
+    # 0.19.2, although it passes locally
+    if [ "$OS" = "linux" ]; then
+        pip install jedi==0.19.1
+    fi
 
 fi
 
diff --git a/spyder/app/tests/test_mainwindow.py b/spyder/app/tests/test_mainwindow.py
index fecf76108ae..b79f2fbc30a 100644
--- a/spyder/app/tests/test_mainwindow.py
+++ b/spyder/app/tests/test_mainwindow.py
@@ -4750,7 +4750,7 @@ def test_tour_message(main_window, qtbot):
     qtbot.wait(2000)
 
 
-@flaky(max_runs=3)
+@flaky(max_runs=20)
 @pytest.mark.use_introspection
 @pytest.mark.order(after="test_debug_unsaved_function")
 @pytest.mark.preload_complex_project