Merge pull request #2708 from MetRonnie/2.0.x-sync

2.0.x -> master

CHANGES.md

@@ -11,6 +11,21 @@ ones in. -->
 
 --------------------------------------------------------------------------------
 
+## 2.1.0 (<span actions:bind='release-date'>Awaiting Release</span>)
+
+### Fixes
+
+[#2699](https://github.com/metomi/rose/pull/2699) -
+Fix an issue where the incremental mode in Rose Bunch was ignored when rerun
+as a task in a Cylc workflow. This change also ensure that incremental mode
+ignores the previous output in the event that the task is re-run as part of a
+later flow
+
+[#2700](https://github.com/metomi/rose/pull/2700) -
+Fix rosie password caching.
+
+--------------------------------------------------------------------------------
+
 ## 2.0.4 (<span actions:bind='release-date'>Released 2023-04-27</span>)
 
 ### Fixes

metomi/rose/apps/rose_bunch.py

@@ -291,6 +291,10 @@ def run(self, app_runner, conf_tree, opts, args, uuid, work_files):
         # Set max number of processes to run at once
         max_procs = conf_tree.node.get_value([self.BUNCH_SECTION, "pool-size"])
 
+        # Add CYLC_TASK_FLOW_NUMBERS to configuration:
+        cylc_task_flow_numbers = os.environ.get('CYLC_TASK_FLOW_NUMBERS', "0")
+        conf_tree.node.set(['CYLC_TASK_FLOW_NUMBERS'], cylc_task_flow_numbers)
+
         if max_procs:
             max_procs = int(metomi.rose.env.env_var_process(max_procs))
         else:
@@ -475,7 +479,7 @@ def connect(self):
     def create_tables(self):
         """Create tables as appropriate"""
         existing = []
-        first_run = os.environ.get("CYLC_TASK_TRY_NUMBER") == "1"
+        first_run = os.environ.get("CYLC_TASK_SUBMIT_NUMBER") == "1"
 
         for row in self.conn.execute(
             "SELECT name FROM sqlite_master " + "WHERE type=='table'"
@@ -566,7 +570,6 @@ def flatten_config(config):
 
     def record_config(self, config, clear_db=False):
         """Take in a conf_tree object and record the entries"""
-
         if clear_db:
             d_stmt = "DELETE FROM " + self.TABLE_CONFIG
             self.conn.execute(d_stmt)