From 4434ba413c22279b9a006825f0584b957fb544b9 Mon Sep 17 00:00:00 2001 From: Alistair McGann Date: Tue, 16 Jun 2020 09:19:38 +0100 Subject: [PATCH] Pulling latest definitions moved to script generator --- .../ibex_install_utils/install_tasks.py | 2 -- .../ibex_install_utils/tasks/python_tasks.py | 10 ---------- 2 files changed, 12 deletions(-) diff --git a/installation_and_upgrade/ibex_install_utils/install_tasks.py b/installation_and_upgrade/ibex_install_utils/install_tasks.py index 7d308a27..fa47a13c 100644 --- a/installation_and_upgrade/ibex_install_utils/install_tasks.py +++ b/installation_and_upgrade/ibex_install_utils/install_tasks.py @@ -138,7 +138,6 @@ def run_instrument_install(self): self._system_tasks.update_web_dashboard() self._system_tasks.update_kafka_topics() self._system_tasks.put_autostart_script_in_startup_area() - self._python_tasks.update_script_definitions() def run_instrument_deploy(self): """ @@ -188,7 +187,6 @@ def run_instrument_deploy_main(self): self._system_tasks.apply_changes_noted_in_release_notes() self._system_tasks.update_release_notes() self._system_tasks.reapply_hotfixes() - self._python_tasks.update_script_definitions() def run_instrument_deploy_pre_stop(self): """ diff --git a/installation_and_upgrade/ibex_install_utils/tasks/python_tasks.py b/installation_and_upgrade/ibex_install_utils/tasks/python_tasks.py index 06121952..c5e8121a 100644 --- a/installation_and_upgrade/ibex_install_utils/tasks/python_tasks.py +++ b/installation_and_upgrade/ibex_install_utils/tasks/python_tasks.py @@ -18,16 +18,6 @@ def install_genie_python3(self): self._file_utils.mkdir_recursive(APPS_BASE_DIR) RunProcess(self._genie_python_3_source_dir, "genie_python_install.bat").run() - @task("Update script generator script definitions") - def update_script_definitions(self): - """ - Update (or at least ask the user to update) the script definitions used by the script generator. - """ - if os.path.exists("C:\\ScriptGeneratorConfigs") or os.path.exists("C:\\ScriptDefinitions"): - self.prompt.prompt("Update the script definitions for the script generator (likely in C:\\ScriptDefinitions or C:\\ScriptGeneratorConfigs)." + \ - "Check with the scientists that it is ok to do this." + \ - "You can do it by git pull, you may need to merge changes made on the instrument.") - @task("Change genie_python shortcuts to python 3") def change_shortcuts_to_python_3(self): """