review comments

Author: rerpha

installation_and_upgrade/calibration_files_updater.py

@@ -76,7 +76,7 @@ def __exit__(self, *args: Any) -> None:  # noqa: ANN401
 
 def get_instrument_hosts() -> Generator[str, None, None]:
     """
-    Returns: A collection of instrument host names
+    Returns: A generator yielding instrument host names
     """
     instlist_raw = caget("CS:INSTLIST")
     if instlist_raw is None:

installation_and_upgrade/developer_update.bat

@@ -19,4 +19,4 @@ IF ERRORLEVEL 1 (
 )
 
 start /wait cmd /c "%START_IBEX%"
-call rmdir /s /q %UV_TEMP_VENV%
+call rmdir /s /q %UV_TEMP_VENV%

installation_and_upgrade/ibex_install_utils/install_tasks.py

@@ -267,32 +267,6 @@ def run_instrument_deploy_pre_stop(self) -> None:
         Current the server can not be started or stopped in this python script.
         """
         self._system_tasks.user_confirm_upgrade_type_on_machine("Client/Server Machine")
-
-        # Check whether inst is SECI or not
-        try:
-            central_inst_info = caget("CS:INSTLIST")
-            assert central_inst_info is not None and isinstance(central_inst_info, np.ndarray)
-            central_inst_info = FileUtils.dehex_and_decompress(central_inst_info.tobytes()).decode(
-                "utf-8"
-            )
-            central_inst_info = json.loads(central_inst_info)
-        except Exception:
-            central_inst_info = {}
-
-        _, _, my_pv_prefix = get_machine_details_from_identifier()
-
-        central_specific_inst_info = None
-        for inst in central_inst_info:
-            if inst["name"] == my_pv_prefix[3:-1]:
-                central_specific_inst_info = inst
-                break
-
-        if central_specific_inst_info is None:
-            warnings.warn("Unable to find instrument in central list of instruments.", UserWarning)
-        else:
-            if central_specific_inst_info["seci"] == "true":
-                self._system_tasks.record_running_vis()
-
         self._server_tasks.save_motor_blocks_blockserver_to_file()
 
     def run_truncate_database(self) -> None:

installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py

@@ -59,14 +59,6 @@ class SystemTasks(BaseTasks):
      firewalls, etc.
     """
 
-    @task("Record running LabVIEW VIs or any relevant looking other programs")
-    def record_running_vis(self) -> None:
-        """
-        Get user to record running vis
-        """
-        self.prompt.prompt_and_raise_if_not_yes(
-            "Write down any LabVIEW VIs/relevant looking programs which are running for use later?"
-        )
 
     @task("Upgrading Notepad++. Please follow system dialogs")
     def upgrade_notepad_pp(self) -> None:

installation_and_upgrade/instrument_install.bat

@@ -8,6 +8,7 @@ if %errorlevel% neq 0 goto ERROR
 
 set "SOURCE=\\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\Releases"
 
+call "%~dp0set_epics_ca_addr_list.bat"
 call "%~dp0install_or_update_uv.bat"
 call "%~dp0set_up_venv.bat"
 if %errorlevel% neq 0 goto ERROR

installation_and_upgrade/instrument_test.bat

@@ -1,11 +1,12 @@
 setlocal EnableDelayedExpansion
 set "SOURCE=\\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\Releases"
 
+call "%~dp0set_epics_ca_addr_list.bat"
 call "%~dp0install_or_update_uv.bat"
 call "%~dp0set_up_venv.bat"
 if %errorlevel% neq 0 goto ERROR
 
-call "%LATEST_PYTHON%" "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --confirm_step instrument_test
+call python "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --confirm_step instrument_test
 if %errorlevel% neq 0 goto ERROR
 
 call rmdir /s /q %UV_TEMP_VENV%

installation_and_upgrade/set_up_venv.bat

@@ -3,6 +3,6 @@ REM sets up temporary virtual environment for deployment and installs requiremen
 set UV_TEMP_VENV=C:\Instrument\Var\tmp\.deployscriptvenv
 set UV_PYTHON=3.12
 REM use the on-disk location as we'll be using a venv anyway so it won't dirty the install
-uv venv %UV_TEMP_VENV%
-call %UV_TEMP_VENV%\scripts\activate
-uv pip install -r %~dp0\requirements.txt --no-build
+uv venv "%UV_TEMP_VENV%"
+call "%UV_TEMP_VENV%\scripts\activate"
+uv pip install -r "%~dp0\requirements.txt" --no-build

installation_and_upgrade/vhd_build.bat

@@ -12,7 +12,7 @@ IF EXIST "C:\Instrument\Apps\EPICS\stop_ibex_server.bat" (
   start /wait cmd /c "C:\Instrument\Apps\EPICS\stop_ibex_server.bat"
 )
 
-call "%LATEST_PYTHON%" "%~dp0IBEX_upgrade.py" --kits_icp_dir "%KITS_ICP_PATH%" create_vhds --quiet --no_log_to_var
+call python "%~dp0IBEX_upgrade.py" --kits_icp_dir "%KITS_ICP_PATH%" create_vhds --quiet --no_log_to_var
 IF %ERRORLEVEL% NEQ 0 (
   set errcode = %ERRORLEVEL%
   call rmdir /s /q %UV_TEMP_VENV%