Merge branch '1.2.x' into fix.root-dir_warning_applies_irrespective_o…

…f_compat_mode

CHANGES.md

@@ -6,6 +6,14 @@ creating a new release entry be sure to copy & paste the span tag with the
 updated. Only the first match gets replaced, so it's fine to leave the old
 ones in. -->
 
+## __cylc-rose-1.3.0 (<span actions:bind='release-date'>Awaiting Release</span>)__
+
+### Fixes
+
+[#229](https://github.com/cylc/cylc-rose/pull/229) -
+Fix bug which stops rose-stem suites using the new `[template variables]` section
+in their `rose-suite.conf` files.
+
 ## __cylc-rose-1.2.1 (<span actions:bind='release-date'>Upcoming</span>)__
 
 ### Fixes

tests/conftest.py

@@ -100,12 +100,7 @@ def pytest_runtest_makereport(item, call):
 def _cylc_validate_cli(capsys, caplog):
     """Access the validate CLI"""
     def _inner(srcpath, args=None):
-        parser = Options(validate_gop())
-        options = parser()
-
-        if args is not None:
-            options.__dict__.update(args)
-
+        options = Options(validate_gop(), args)()
         output = SimpleNamespace()
 
         try:
@@ -132,10 +127,7 @@ def _inner(srcpath, args=None):
             srcpath:
             args: Dictionary of arguments.
         """
-        options = Options(install_gop())()
-        if args is not None:
-            options.__dict__.update(args)
-
+        options = Options(install_gop(), args)()
         output = SimpleNamespace()
 
         try:
@@ -160,10 +152,7 @@ def _inner(workflow_id, opts=None):
             srcpath:
             args: Dictionary of arguments.
         """
-        options = Options(reinstall_gop())()
-        if opts is not None:
-            options.__dict__.update(opts)
-
+        options = Options(reinstall_gop(), opts)()
         output = SimpleNamespace()
 
         try: