Skip to content

remove seci and treesize prompts #279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 1, 2025
Merged

remove seci and treesize prompts #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b479969
remove seci and treesize prompts
rerpha Sep 1, 2025
da65311
ruff
rerpha Sep 1, 2025
ee107fb
ruff but from root dir
rerpha Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions installation_and_upgrade/ibex_install_utils/install_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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()

Expand Down
19 changes: 0 additions & 19 deletions installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
46 changes: 0 additions & 46 deletions installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")


Expand Down Expand Up @@ -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:
Expand Down
Loading