Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Play should have no cylc rose options #6068

Merged
merged 4 commits into from
Apr 17, 2024
Merged

Play should have no cylc rose options #6068

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6aa283f
remove clearing of rose-template-vars from scheduler on reload.
wxtim Apr 15, 2024
6d40396
remove the rose options from Cylc play
wxtim Apr 15, 2024
873c14a
Remove uneccessary logic from Cylc Option Parser
wxtim Apr 16, 2024
c5451a6
changes
wxtim Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions cylc/flow/scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 2 additions & 6 deletions cylc/flow/scheduler_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are no longer any options stored as Dicts rather than OptionSettings objects :. this is redundant.

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
Expand Down
Loading