Undo dev changes

Author: Tom-Willemsen

installation_and_upgrade/developer_update.bat

@@ -1,19 +1,19 @@
 setlocal EnableDelayedExpansion
 set "SOURCE=\\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\Releases"
-REM call "%~dp0define_latest_genie_python.bat"
+call "%~dp0define_latest_genie_python.bat"
 IF %errorlevel% neq 0 EXIT /b %errorlevel%
 
 set "STOP_IBEX=C:\Instrument\Apps\EPICS\stop_ibex_server"
 set "START_IBEX=C:\Instrument\Apps\EPICS\start_ibex_server"
 
-REM start /wait cmd /c "%STOP_IBEX%"
+start /wait cmd /c "%STOP_IBEX%"
 
-call c:\instrument\apps\python3\python.exe "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --release_suffix "%SUFFIX%" --confirm_step developer_update
+call "%LATEST_PYTHON%" "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --release_suffix "%SUFFIX%" --confirm_step developer_update
 IF ERRORLEVEL 1 (
   set errcode = %ERRORLEVEL%
   call "%~dp0remove_genie_python.bat" %LATEST_PYTHON_DIR%
   EXIT /b !errcode!
 )
 
-REM start /wait cmd /c "%START_IBEX%"
-REM call "%~dp0remove_genie_python.bat" %LATEST_PYTHON_DIR%
+start /wait cmd /c "%START_IBEX%"
+call "%~dp0remove_genie_python.bat" %LATEST_PYTHON_DIR%

installation_and_upgrade/ibex_install_utils/install_tasks.py

@@ -316,7 +316,6 @@ def run_setup_log_rotation(self) -> None:
 
     def run_developer_update(self) -> None:
         """Update all the developer tools to latest version"""
-        self._backup_tasks.backup_old_directories()
         self._mysql_tasks.install_mysql(force=False)
         self._system_tasks.check_java_installation()
         self._system_tasks.install_or_upgrade_git()

installation_and_upgrade/ibex_install_utils/tasks/backup_tasks.py

@@ -78,7 +78,7 @@ def backup_old_directories(self) -> None:
                 os.mkdir(BACKUP_DIR)
 
             # move old backups to create space
-            # self._move_old_backups_to_share()
+            self._move_old_backups_to_share()
 
             # Move the folders
             for path in DIRECTORIES_TO_BACKUP:
@@ -181,11 +181,7 @@ def _backup_dir(
 
             print(f"Attempting to backup {src} to zipfile at {dst}")
             with zipfile.ZipFile(
-                dst,
-                "w",
-                compression=zipfile.ZIP_DEFLATED,
-                compresslevel=1,
-                strict_timestamps=False
+                dst, "w", compression=zipfile.ZIP_DEFLATED, compresslevel=1, strict_timestamps=False
             ) as zf:
                 for src_path, dirs, src_filenames in os.walk(src, topdown=True):
                     if ignore is not None:
@@ -205,7 +201,7 @@ def _backup_dir(
 
             if not copy:
                 print(f"Removing {src} after backup")
-                # shutil.rmtree(src)
+                shutil.rmtree(src)
 
         except FileNotFoundError:
             # Source file is not present