From b4799699272ec75e82edba48c6f0ed17f30f824e Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Mon, 1 Sep 2025 09:24:16 +0100 Subject: [PATCH 1/3] remove seci and treesize prompts --- .../ibex_install_utils/install_tasks.py | 4 -- .../ibex_install_utils/tasks/server_tasks.py | 18 -------- .../ibex_install_utils/tasks/system_tasks.py | 46 ------------------- 3 files changed, 68 deletions(-) diff --git a/installation_and_upgrade/ibex_install_utils/install_tasks.py b/installation_and_upgrade/ibex_install_utils/install_tasks.py index 50677fb..9aa5391 100644 --- a/installation_and_upgrade/ibex_install_utils/install_tasks.py +++ b/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() diff --git a/installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py b/installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py index 58ab4b4..37a708c 100644 --- a/installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py +++ b/installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py @@ -633,24 +633,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: diff --git a/installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py b/installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py index 5df7f7b..1a7214c 100644 --- a/installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py +++ b/installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py @@ -42,9 +42,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") @@ -83,49 +80,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: From da6531149516f901f4ea6afacff12f4838379ffb Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Mon, 1 Sep 2025 11:36:11 +0100 Subject: [PATCH 2/3] ruff --- .../ibex_install_utils/tasks/server_tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py b/installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py index 37a708c..ac3805e 100644 --- a/installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py +++ b/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 @@ -17,6 +16,7 @@ from contextlib2 import contextmanager import git + from ibex_install_utils.admin_runner import AdminCommandBuilder from ibex_install_utils.exceptions import ErrorInRun, ErrorInTask from ibex_install_utils.file_utils import LABVIEW_DAE_DIR, FileUtils From ee107fb9a5e28ed22b21a511bee6844e2d0d33af Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Mon, 1 Sep 2025 11:38:38 +0100 Subject: [PATCH 3/3] ruff but from root dir --- .../ibex_install_utils/tasks/server_tasks.py | 1 - 1 file changed, 1 deletion(-) diff --git a/installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py b/installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py index ac3805e..f26bc7f 100644 --- a/installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py +++ b/installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py @@ -16,7 +16,6 @@ from contextlib2 import contextmanager import git - from ibex_install_utils.admin_runner import AdminCommandBuilder from ibex_install_utils.exceptions import ErrorInRun, ErrorInTask from ibex_install_utils.file_utils import LABVIEW_DAE_DIR, FileUtils