From 05e27b8939e3c5513d2fb41c7315aef34db65cbe Mon Sep 17 00:00:00 2001
From: Jacob Williamson <jacob.williamson@diamond.ac.uk>
Date: Thu, 18 Dec 2025 14:47:36 +0000
Subject: [PATCH 1/3] Remove unnessary SSH in release script

---
 utility_scripts/deploy/deploy_mx_bluesky.py | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/utility_scripts/deploy/deploy_mx_bluesky.py b/utility_scripts/deploy/deploy_mx_bluesky.py
index 51a8d5457..2ab3560b9 100644
--- a/utility_scripts/deploy/deploy_mx_bluesky.py
+++ b/utility_scripts/deploy/deploy_mx_bluesky.py
@@ -109,24 +109,18 @@ def _get_permission_groups(beamline: str, dev_mode: bool = False) -> list:
     return beamline_groups
 
 
-def _create_environment_from_control_machine(
+def _create_environment(
     mx_repo: Deployment,
     path_to_create_venv: str,
     path_to_dls_dev_env: str,
-    beamline: str = "i03",
 ):
-    try:
-        user = os.environ["USER"]
-    except KeyError:
-        user = input(
-            """Couldn't find username from the environment. Enter FedID in order \
-                to SSH to control machine:"""
-        )
-    cmd = f"ssh {user}@{beamline}-control python3 {path_to_create_venv} {path_to_dls_dev_env} {mx_repo.deploy_location}"
+    cmd = (
+        f"python3 {path_to_create_venv} {path_to_dls_dev_env} {mx_repo.deploy_location}"
+    )
 
     process = None
     try:
-        # Call python script on i03-control to create the environment
+        # Call python script to create the environment
         process = subprocess.Popen(cmd, shell=True, text=True, bufsize=1)
         process.communicate()
         if process.returncode != 0:
@@ -227,11 +221,8 @@ def main(beamline: str, options: Options):
                 "utility_scripts/deploy/create_venv.py",
             )
 
-            # SSH into control machine if not in dev mode
             if options.use_control_machine and release_area != DEV_DEPLOY_LOCATION:
-                _create_environment_from_control_machine(
-                    mx_repo, path_to_create_venv, path_to_dls_dev_env, beamline
-                )
+                _create_environment(mx_repo, path_to_create_venv, path_to_dls_dev_env)
             else:
                 setup_venv(path_to_dls_dev_env, mx_repo.deploy_location)
 

From f037aff0c8e1d205674bb6f306d84ec9781e2a14 Mon Sep 17 00:00:00 2001
From: Jacob Williamson <jacob.williamson@diamond.ac.uk>
Date: Fri, 19 Dec 2025 11:29:26 +0000
Subject: [PATCH 2/3] Remove use_control_machine

---
 utility_scripts/deploy/deploy_mx_bluesky.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/utility_scripts/deploy/deploy_mx_bluesky.py b/utility_scripts/deploy/deploy_mx_bluesky.py
index 2ab3560b9..aa4b214b4 100644
--- a/utility_scripts/deploy/deploy_mx_bluesky.py
+++ b/utility_scripts/deploy/deploy_mx_bluesky.py
@@ -46,7 +46,6 @@ class Options(NamedTuple):
     prune_deployments: bool = True
 
     # NOTE For i24 for now will need to set it to false from the command line
-    use_control_machine: bool = True
 
 
 class Deployment:
@@ -221,7 +220,7 @@ def main(beamline: str, options: Options):
                 "utility_scripts/deploy/create_venv.py",
             )
 
-            if options.use_control_machine and release_area != DEV_DEPLOY_LOCATION:
+            if release_area != DEV_DEPLOY_LOCATION:
                 _create_environment(mx_repo, path_to_create_venv, path_to_dls_dev_env)
             else:
                 setup_venv(path_to_dls_dev_env, mx_repo.deploy_location)
@@ -341,7 +340,6 @@ def _parse_options() -> tuple[str, Options]:
         quiet=args.print_release_dir,
         dev_mode=args.dev,
         prune_deployments=args.prune_deployments,
-        use_control_machine=args.no_control,
     )
 
 

From 2386698197f2b31d1664c8e428c782609b84637c Mon Sep 17 00:00:00 2001
From: Jacob Williamson <jacob.williamson@diamond.ac.uk>
Date: Fri, 19 Dec 2025 13:58:23 +0000
Subject: [PATCH 3/3] Remove comment

---
 utility_scripts/deploy/deploy_mx_bluesky.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/utility_scripts/deploy/deploy_mx_bluesky.py b/utility_scripts/deploy/deploy_mx_bluesky.py
index aa4b214b4..ccadda04f 100644
--- a/utility_scripts/deploy/deploy_mx_bluesky.py
+++ b/utility_scripts/deploy/deploy_mx_bluesky.py
@@ -45,8 +45,6 @@ class Options(NamedTuple):
     dev_mode: bool = False
     prune_deployments: bool = True
 
-    # NOTE For i24 for now will need to set it to false from the command line
-
 
 class Deployment:
     # Set name, setup remote origin, get the latest version"""