Merge branch 'fix_localhost_platform_matching' of github.com:wxtim/cylc into fix_localhost_platform_matching

* 'fix_localhost_platform_matching' of github.com:wxtim/cylc:
  Fix a bug preventing `cylc vip --workflow-name=foo` from working. (cylc#5349)
  fix no rose vars in cylc view (cylc#5367)
  Cylc lint fixes (cylc#5363)
  data store: support unsatisfied ext_trigger
  fix mypy fail caused by python/mypy#13969

Author: wxtim

CHANGES.md

@@ -13,9 +13,20 @@ ones in. -->
 -------------------------------------------------------------------------------
 ## __cylc-8.1.2 (<span actions:bind='release-date'>Coming Soon</span>)__
 
+### Fixes
+
 [#5343](https://github.com/cylc/cylc-flow/pull/5343) - Fix a bug causing
 platform names to be checked as if they were hosts.
 
+[#5349](https://github.com/cylc/cylc-flow/pull/5349) - Bugfix: `cylc vip --workflow-name`
+only worked when used with a space, not an `=`.
+
+[#5367](https://github.com/cylc/cylc-flow/pull/5367) - Enable using
+Rose options (`-O`, `-S` & `-D`) with `cylc view`.
+
+[#5363](https://github.com/cylc/cylc-flow/pull/5363) Improvements and bugfixes
+for `cylc lint`.
+
 -------------------------------------------------------------------------------
 ## __cylc-8.1.1 (<span actions:bind='release-date'>Released 2023-01-31</span>)__
 

cylc/flow/data_store_mgr.py

@@ -2094,7 +2094,7 @@ def delta_task_ext_trigger(self, itask, trig, message, satisfied):
         tp_delta.stamp = f'{tp_id}@{update_time}'
         ext_trigger = tp_delta.external_triggers[trig]
         ext_trigger.message = message
-        ext_trigger.satisfied = True
+        ext_trigger.satisfied = satisfied
         ext_trigger.time = update_time
         self.updates_pending = True
 

cylc/flow/network/client_factory.py

@@ -51,7 +51,7 @@ def get_runtime_client(
     if comms_method == CommsMeth.SSH:
         from cylc.flow.network.ssh_client import WorkflowRuntimeClient
     else:
-        from cylc.flow.network.client import (  # type: ignore[no-redef]
+        from cylc.flow.network.client import (  # type: ignore[assignment]
             WorkflowRuntimeClient
         )
     return WorkflowRuntimeClient(workflow, timeout=timeout)

cylc/flow/option_parsers.py

@@ -821,6 +821,7 @@ def cleanup_sysargv(
         for x in compound_script_opts
     }
     # Filter out non-cylc-play options.
+    args = [i.split('=')[0] for i in sys.argv]
     for unwanted_opt in (set(options.__dict__)) - set(script_opts_by_dest):
         for arg in compound_opts_by_dest[unwanted_opt].args:
             if arg in sys.argv:
@@ -831,6 +832,9 @@ def cleanup_sysargv(
                     not in ['store_true', 'store_false']
                 ):
                     sys.argv.pop(index)
+            elif arg in args:
+                index = args.index(arg)
+                sys.argv.pop(index)
 
     # replace compound script name:
     sys.argv[1] = script_name

cylc/flow/scripts/lint.py

@@ -125,11 +125,35 @@
         'url': STYLE_GUIDE + 'trailing-whitespace',
         'index': 6
     },
-    re.compile(r'inherit\s*=\s*[a-z].*$'): {
+    # Look for families both from inherit=FAMILY and FAMILY:trigger-all/any
+    re.compile(r'(inherit\s*=\s*.*[a-z].*)|(\w[a-z]\w:\w+?-a(ll|ny))'): {
         'short': 'Family name contains lowercase characters.',
         'url': STYLE_GUIDE + 'task-naming-conventions',
         'index': 7
     },
+    re.compile(r'{[{%]'): {
+        'short': JINJA2_FOUND_WITHOUT_SHEBANG,
+        'url': '',
+        'index': 8
+    },
+    re.compile(r'platform\s*=\s*\$\(.*?\)'): {
+        'short': 'Host Selection Script may be redundant with platform',
+        'url': (
+            'https://cylc.github.io/cylc-doc/stable/html/7-to-8/'
+            'major-changes/platforms.html'
+        ),
+        'index': 9
+    },
+    re.compile(r'platform\s*=\s*(`.*?`)'): {
+        'short': 'Using backticks to invoke subshell is deprecated',
+        'url': 'https://github.com/cylc/cylc-flow/issues/3825',
+        'index': 10
+    },
+    re.compile(r'#.*?{[{%]'): {
+        'short': 'Cylc will process commented Jinja2!',
+        'url': '',
+        'index': 11
+    }
     # re.compile(r'^.{{maxlen},}'): {
     #     'short': 'line > {maxlen} characters.',
     #     'url': STYLE_GUIDE + 'line-length-and-continuation',
@@ -170,6 +194,10 @@
             '``global.cylc[platforms][<platform name>]job runner``'
         )
     },
+    re.compile(r'host\s*=\s*(`.*?`)'): {
+        'short': 'Using backticks to invoke subshell will fail at Cylc 8.',
+        'url': 'https://github.com/cylc/cylc-flow/issues/3825'
+    }
 }
 RULESETS = ['728', 'style', 'all']
 EXTRA_TOML_VALIDATION = {
@@ -464,7 +492,16 @@ def check_cylc_file(
             ):
                 continue
 
-            if check.findall(line) and not line.strip().startswith('#'):
+            if (
+                check.findall(line)
+                and (
+                    not line.strip().startswith('#')
+                    or (
+                        'commented Jinja2!' in message['short']
+                        and check.findall(line)
+                    )
+                )
+            ):
                 count += 1
                 if modify:
                     if message['url'].startswith('http'):

cylc/flow/scripts/view.py

@@ -98,6 +98,8 @@ def get_option_parser():
     parser.add_option(
         *AGAINST_SOURCE_OPTION.args, **AGAINST_SOURCE_OPTION.kwargs)
 
+    parser.add_cylc_rose_options()
+
     return parser
 
 

tests/unit/scripts/test_lint.py

@@ -92,10 +92,10 @@
     hold after point = 20220101T0000Z
     [[dependencies]]
         [[[R1]]]
-            graph = foo
+            graph = MyFaM:finish-all => remote
 
 [runtime]
-    [[MYFAM]]
+    [[MyFaM]]
         extra log files = True
         {% from 'cylc.flow' import LOG %}
         script = {{HELLOWORLD}}
@@ -127,10 +127,14 @@
 
 # Shouldn't object to a comment, unlike the terrible indents below:
    [[bad indent]]
+        inherit = MyFaM
 
      [[remote]]
 
  [meta]
+    [[and_another_thing]]
+        [[[remote]]]
+            host = `rose host-select thingy`
 """
 
 
@@ -141,11 +145,19 @@
 
 [[dependencies]]
 
+{% foo %}
+{{foo}}
+# {{quix}}
+
 [runtime]
           [[foo]]
         inherit = hello
      [[[job]]]
 something\t
+    [[bar]]
+        platform = $(some-script foo)
+    [[baz]]
+        platform = `no backticks`
 """
 
 LINT_TEST_FILE += (

tests/unit/test_option_parsers.py

@@ -397,6 +397,19 @@ def test_combine_options(inputs, expect):
             'play --foo something myworkflow'.split(),
             id='no path given'
         ),
+        param(
+            'vip --bar=something'.split(),
+            {
+                'script_name': 'play',
+                'workflow_id': 'myworkflow',
+                'compound_script_opts': [
+                    OptionSettings(['--bar', '-b'])],
+                'script_opts': [],
+                'source': './myworkflow',
+            },
+            'play myworkflow'.split(),
+            id='removes --key=value'
+        ),
     ]
 )
 def test_cleanup_sysargv(monkeypatch, argv_before, kwargs, expect):