Skip to content

Commit 40139b1

Browse files
authored
Play should have no cylc rose options (cylc#6068)
* remove clearing of rose-template-vars from scheduler on reload. * remove the rose options from `cylc play`
1 parent ca24aa0 commit 40139b1

File tree

3 files changed

+3
-11
lines changed

3 files changed

+3
-11
lines changed

changes.d/6068.break.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Removed the Rose Options (`-S`, `-O`, `-D`) from `cylc play`. If you need these use them with `cylc install`.

cylc/flow/scheduler.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1262,11 +1262,6 @@ def _configure_contact(self) -> None:
12621262

12631263
def load_flow_file(self, is_reload=False):
12641264
"""Load, and log the workflow definition."""
1265-
# Local workflow environment set therein.
1266-
# Allow -S and -D to take effect in Cylc VR.
1267-
# https://github.com/cylc/cylc-flow/issues/5968
1268-
self.options.rose_template_vars = []
1269-
self.options.defines = []
12701265
return WorkflowConfig(
12711266
self.workflow,
12721267
self.flow_file,

cylc/flow/scheduler_cli.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -309,12 +309,8 @@ def get_option_parser(add_std_opts: bool = False) -> COP:
309309
argdoc=[WORKFLOW_ID_ARG_DOC]
310310
)
311311

312-
options = parser.get_cylc_rose_options() + PLAY_OPTIONS
313-
for option in options:
314-
if isinstance(option, OptionSettings):
315-
parser.add_option(*option.args, **option.kwargs)
316-
else:
317-
parser.add_option(*option['args'], **option['kwargs'])
312+
for option in PLAY_OPTIONS:
313+
parser.add_option(*option.args, **option.kwargs)
318314

319315
if add_std_opts:
320316
# This is for the API wrapper for integration tests. Otherwise (CLI

0 commit comments

Comments
 (0)