Disable action to create new console in an environment that is installing spyder-kernels.

Note that setIconVisibleInMenu(False) at SpyderAction instantiation results in the environment menu item not reflecting its enabled state in the menubar. Removing this, or setting it to True (QAction defaults to True), produces the correct behavior. Also note that menubar items still do not show the icon for macOS (as desired) because setIconVisibleInMenu is called in set_menu_icons.

Author: mrclary

spyder/plugins/ipythonconsole/utils/kernelspec.py

@@ -121,14 +121,14 @@ def argv(self):
             if self.path_to_custom_interpreter:
                 pyexec = self.path_to_custom_interpreter
 
-            has_spyder_kernels(pyexec)
-
             if not is_python_interpreter(pyexec):
                 pyexec = get_python_executable()
                 self.set_conf('executable', '', section='main_interpreter')
                 self.set_conf('default', True, section='main_interpreter')
                 self.set_conf('custom', False, section='main_interpreter')
 
+            has_spyder_kernels(pyexec)
+
         # Command used to start kernels
         kernel_cmd = []
 

spyder/plugins/ipythonconsole/widgets/client.py

@@ -180,6 +180,7 @@ def __init__(
         self.kernel_loading_page = self._create_loading_page()
         self.env_loading_page = self._create_loading_page(kind="env")
         self.spyk_installing_page = self._create_loading_page(kind="install")
+        self._pyexec = None
 
         if self.is_remote():
             # Keep a reference
@@ -404,7 +405,8 @@ def _set_initial_cwd_in_kernel(self):
 
     @Slot()
     def _install_spyder_kernels(self, pyexec):
-        # TODO: Disable create new client with same environment
+        self._pyexec = pyexec
+        self.container.environment_menu_item_state(pyexec, enable=False)
 
         # Store existing error page for reuse later, if necessary
         self.installwidget.info_page = self.info_page
@@ -562,7 +564,10 @@ def stop_button_click_handler(self):
             self.shellwidget.pdb_execute_command('exit')
 
     def process_kernel_install(self, exit_code, exit_status, output=None):
-        # TODO: Re-enable create new client with same environment
+        if self._pyexec:
+            self.container.environment_menu_item_state(
+                self._pyexec, enable=True
+            )
 
         if exit_code == 0 and exit_status == 0:
             # Success!

spyder/plugins/ipythonconsole/widgets/main_widget.py

@@ -304,6 +304,7 @@ def __init__(self, name=None, plugin=None, parent=None):
         self.interrupt_action = None
         self.registered_spyder_kernel_handlers = {}
         self.envs = {}
+        self._envs_disabled = set()
 
         # Attributes needed for the restart dialog
         self._restart_dialog = ConsoleRestartDialog(self)
@@ -1314,6 +1315,9 @@ def _update_environment_menu(self):
                 tip=text,
             )
 
+            # Disable action for environments while installing spyder-kernels
+            action.setEnabled(path_to_interpreter not in self._envs_disabled)
+
             # Add default env as the first entry in the menu
             if text.startswith(_("Default")):
                 self.add_item_to_menu(
@@ -1578,6 +1582,19 @@ def infowidget(self):
         except AttributeError:
             return None
 
+    def environment_menu_item_state(self, pyexec, enable=False):
+        if enable and pyexec in self._envs_disabled:
+            self._envs_disabled.remove(pyexec)
+        elif not enable:
+            self._envs_disabled.add(pyexec)
+
+        default_interpreter = self.get_conf(
+            "executable", section="main_interpreter"
+        )
+        self.create_client_action.setEnabled(
+            default_interpreter not in self._envs_disabled
+        )
+
     # ---- General
     # -------------------------------------------------------------------------
     def update_edit_menu(self) -> None:

spyder/utils/qthelpers.py

@@ -612,8 +612,6 @@ def __init__(self, *args, action_id=None, **kwargs):
         """Spyder QAction class wrapper to handle cross platform patches."""
         super().__init__(*args, **kwargs)
         self.action_id = action_id
-        if sys.platform == "darwin":
-            self.setIconVisibleInMenu(False)
 
     def __str__(self):
         return "SpyderAction('{0}')".format(self.text())