Merge pull request #279 from ISISComputingGroup/remove_seci

remove seci and treesize prompts

Author: Tom-Willemsen

installation_and_upgrade/ibex_install_utils/install_tasks.py

@@ -169,9 +169,6 @@ def run_instrument_install(self) -> None:
         self._system_tasks.install_or_upgrade_git()
         self._system_tasks.check_java_installation()
 
-        self._system_tasks.remove_seci_shortcuts()
-        self._system_tasks.remove_seci_one()
-        self._system_tasks.remove_treesize_shortcuts()
         self._system_tasks.restrict_ie()
 
         self._server_tasks.install_ibex_server()
@@ -222,7 +219,6 @@ def run_instrument_deploy_post_start(self) -> None:
         self._server_tasks.perform_server_tests()
         self._server_tasks.run_config_checker()
         self._server_tasks.save_motor_blocks_blockserver_to_file()
-        self._server_tasks.set_alert_url_and_password()
         self._system_tasks.put_autostart_script_in_startup_area()
         self._system_tasks.inform_instrument_scientists()
 

installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py

@@ -9,7 +9,6 @@
 from typing import Generator, LiteralString, TextIO
 
 import lxml.etree
-from ibex_install_utils.user_prompt import UserPrompt
 
 try:
     from contextlib import contextmanager
@@ -633,24 +632,6 @@ def update_icp(self, icp_in_labview_modules: bool, register_icp: bool = True) ->
         else:
             print("Not registering ICP as running a non-interactive deploy")
 
-    @task(
-        "Set username and password for alerts (only required if this is a SECI to IBEX migration)"
-    )
-    def set_alert_url_and_password(self) -> None:
-        print(
-            "The URL and password for alerts are at http://www.facilities.rl.ac.uk/isis/computing/instruments/Lists/Access/AllItems.aspx"
-        )
-        url = self.prompt.prompt("Input URL for alerts: ", possibles=UserPrompt.ANY, default=None)
-        password = self.prompt.prompt(
-            "Input password for alerts: ", possibles=UserPrompt.ANY, default=None
-        )
-
-        if url is not None and password is not None:
-            self._ca.set_pv("CS:AC:ALERTS:URL:SP", url, is_local=True)
-            self._ca.set_pv("CS:AC:ALERTS:PW:SP", password, is_local=True)
-        else:
-            print("No username/password provided - skipping step")
-
     @task("Run config checker")
     def run_config_checker(self) -> None:
         with tempfile.TemporaryDirectory() as tmpdir:

installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py

@@ -44,9 +44,6 @@
     "C:\\", "ProgramData", "Microsoft", "Windows", "Start Menu", "Programs", "Startup"
 )
 
-SECI = "SECI User interface.lnk"
-SECI_ONE_PATH = os.path.join("C:\\", "Program Files (x86)", "CCLRC ISIS Facility")
-SECI_AUTOSTART_LOCATIONS = [os.path.join(USER_STARTUP, SECI), os.path.join(ALLUSERS_STARTUP, SECI)]
 EPICS_CRTL_PATH = os.path.join(EPICS_PATH, "crtl")
 
 
@@ -85,49 +82,6 @@ def clean_up_desktop_ibex_training_folder(self) -> None:
         """
         self._file_utils.remove_tree(DESKTOP_TRAINING_FOLDER_PATH, self.prompt)
 
-    @task("Remove SECI shortcuts")
-    def remove_seci_shortcuts(self) -> None:
-        """
-        Remove (or at least ask the user to remove) all Seci shortcuts
-        """
-        for path in SECI_AUTOSTART_LOCATIONS:
-            if os.path.exists(path):
-                self.prompt.prompt_and_raise_if_not_yes(
-                    f"SECI autostart found in {path}, delete this."
-                )
-
-        self.prompt.prompt_and_raise_if_not_yes("Remove task bar shortcut to SECI")
-        self.prompt.prompt_and_raise_if_not_yes("Remove desktop shortcut to SECI")
-        self.prompt.prompt_and_raise_if_not_yes("Remove start menu shortcut to SECI")
-
-    @task("Remove Treesize shortcuts")
-    def remove_treesize_shortcuts(self) -> None:
-        """
-        Remove (or at least ask the user to remove) all Treesize shortcuts.
-
-        For justification see https://github.com/ISISComputingGroup/IBEX/issues/4214
-        """
-        self.prompt.prompt_and_raise_if_not_yes("Remove task bar shortcut to Treesize if it exists")
-        self.prompt.prompt_and_raise_if_not_yes("Remove desktop shortcut to Treesize if it exists")
-        self.prompt.prompt_and_raise_if_not_yes(
-            "Remove start menu shortcut to Treesize if it exists"
-        )
-
-    @task("Remove SECI 1 Path")
-    def remove_seci_one(self) -> None:
-        """
-        Removes SECI 1
-        """
-        if os.path.exists(SECI_ONE_PATH):
-            try:
-                self._file_utils.remove_tree(SECI_ONE_PATH, self.prompt, use_robocopy=False)
-            except (IOError, WindowsError) as e:
-                self.prompt.prompt_and_raise_if_not_yes(
-                    f"Failed to remove SECI 1 (located in '{SECI_ONE_PATH}') "
-                    f"because '{e}'. Please remove it manually and type 'Y'"
-                    f" to confirm"
-                )
-
     @version_check(Java())
     @task("Install java")
     def check_java_installation(self) -> None: