Merge branch 'spyder-ide:master' into master

.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
 

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

spyder/plugins/appearance/confpage.py

@@ -6,6 +6,7 @@
 
 """Appearance entry in Preferences."""
 
+import configparser
 import sys
 
 import qstylizer.style
@@ -279,8 +280,19 @@ 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)