Skip to content

Commit

Permalink
Merge 8.1.x into master (cylc#5469)
Browse files Browse the repository at this point in the history
  • Loading branch information
MetRonnie authored Apr 14, 2023
2 parents c9b877d + a68ee50 commit 1e1738b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion cylc/flow/option_parsers.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def __sub__(self, other):
def _in_list(self, others):
"""CLI arguments for this option found in any of a list of
other options."""
return any([self & other for other in others])
return any(self & other for other in others)

def _update_sources(self, other):
"""Update the sources from this and 1 other OptionSettings object"""
Expand Down
4 changes: 2 additions & 2 deletions cylc/flow/platforms.py
Original file line number Diff line number Diff line change
Expand Up @@ -487,10 +487,10 @@ def generic_items_match(
# Get a set of items actually set in both platform and task_section.
shared_items = set(task_section).intersection(set(platform_spec))
# If any set items do not match, we can't use this platform.
if not all([
if not all(
platform_spec[item] == task_section[item]
for item in shared_items
]):
):
return False
return True

Expand Down
2 changes: 1 addition & 1 deletion cylc/flow/scripts/lint.py
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ def get_pyproject_toml(dir_):
raise CylcError(f'pyproject.toml did not load: {exc}')

if any(
[i in loadeddata for i in ['cylc-lint', 'cylclint', 'cylc_lint']]
i in loadeddata for i in ['cylc-lint', 'cylclint', 'cylc_lint']
):
for key in keys:
tomldata[key] = loadeddata.get('cylc-lint').get(key, [])
Expand Down

0 comments on commit 1e1738b

Please sign in to comment.