From 40139b13ca15b1f1e21a2da6c81d9074dc8c5124 Mon Sep 17 00:00:00 2001
From: Tim Pillinger <26465611+wxtim@users.noreply.github.com>
Date: Wed, 17 Apr 2024 11:34:20 +0100
Subject: [PATCH] Play should have no cylc rose options (#6068)

* remove clearing of rose-template-vars from scheduler on reload.
* remove the rose options from `cylc play`
---
 changes.d/6068.break.md    | 1 +
 cylc/flow/scheduler.py     | 5 -----
 cylc/flow/scheduler_cli.py | 8 ++------
 3 files changed, 3 insertions(+), 11 deletions(-)
 create mode 100644 changes.d/6068.break.md

diff --git a/changes.d/6068.break.md b/changes.d/6068.break.md
new file mode 100644
index 00000000000..1d6814776f0
--- /dev/null
+++ b/changes.d/6068.break.md
@@ -0,0 +1 @@
+Removed the Rose Options (`-S`, `-O`, `-D`) from `cylc play`. If you need these use them with `cylc install`.
diff --git a/cylc/flow/scheduler.py b/cylc/flow/scheduler.py
index aff1a99e8e6..172d60dd678 100644
--- a/cylc/flow/scheduler.py
+++ b/cylc/flow/scheduler.py
@@ -1262,11 +1262,6 @@ def _configure_contact(self) -> None:
 
     def load_flow_file(self, is_reload=False):
         """Load, and log the workflow definition."""
-        # Local workflow environment set therein.
-        # Allow -S and -D to take effect in Cylc VR.
-        # https://github.com/cylc/cylc-flow/issues/5968
-        self.options.rose_template_vars = []
-        self.options.defines = []
         return WorkflowConfig(
             self.workflow,
             self.flow_file,
diff --git a/cylc/flow/scheduler_cli.py b/cylc/flow/scheduler_cli.py
index 7096feac665..e7515a3c505 100644
--- a/cylc/flow/scheduler_cli.py
+++ b/cylc/flow/scheduler_cli.py
@@ -309,12 +309,8 @@ def get_option_parser(add_std_opts: bool = False) -> COP:
         argdoc=[WORKFLOW_ID_ARG_DOC]
     )
 
-    options = parser.get_cylc_rose_options() + PLAY_OPTIONS
-    for option in options:
-        if isinstance(option, OptionSettings):
-            parser.add_option(*option.args, **option.kwargs)
-        else:
-            parser.add_option(*option['args'], **option['kwargs'])
+    for option in PLAY_OPTIONS:
+        parser.add_option(*option.args, **option.kwargs)
 
     if add_std_opts:
         # This is for the API wrapper for integration tests. Otherwise (CLI