Merge pull request #633 from cylc/1.5.x-sync

🤖 Merge 1.5.x-sync into master
cylc · Oct 15, 2024 · def8d01 · def8d01
2 parents dfcdf6c + 0b9f11d
commit def8d01
Show file tree

Hide file tree

Showing 139 changed files with 1,005 additions and 1,000 deletions.
diff --git a/changes.d/+dfccb67d.ui-version.md b/changes.d/+dfccb67d.ui-version.md
@@ -0,0 +1 @@
+Updated cylc-ui to 2.6.0
diff --git a/cylc/uiserver/resolvers.py b/cylc/uiserver/resolvers.py
@@ -314,7 +314,7 @@ async def play(
                     stderr=PIPE,
                     text=True
                 )
-                ret_code = proc.wait(timeout=20)
+                ret_code = proc.wait(timeout=120)
 
                 if ret_code:
                     # command failed

diff --git a/cylc/uiserver/tests/test_resolvers.py b/cylc/uiserver/tests/test_resolvers.py
@@ -224,7 +224,7 @@ def wait(timeout):
         log=Mock(),
     )
     assert ret == [
-        False, "Command 'cylc play wflow1' timed out after 20 seconds"
+        False, "Command 'cylc play wflow1' timed out after 120 seconds"
     ]
 
 

diff --git a/cylc/uiserver/ui/2.5.0/assets/Analysis-CRVASxga.js b/cylc/uiserver/ui/2.5.0/assets/Analysis-CRVASxga.js
diff --git a/cylc/uiserver/ui/2.5.0/assets/Gantt-DWnNYZ5X.js b/cylc/uiserver/ui/2.5.0/assets/Gantt-DWnNYZ5X.js
diff --git a/cylc/uiserver/ui/2.5.0/assets/Graph-DFLGn-c0.js b/cylc/uiserver/ui/2.5.0/assets/Graph-DFLGn-c0.js
diff --git a/cylc/uiserver/ui/2.5.0/assets/GraphiQL-B9aJM6eK.js b/cylc/uiserver/ui/2.5.0/assets/GraphiQL-B9aJM6eK.js
diff --git a/cylc/uiserver/ui/2.5.0/assets/NoAuth-BTtFJL6w.js b/cylc/uiserver/ui/2.5.0/assets/NoAuth-BTtFJL6w.js
diff --git a/cylc/uiserver/ui/2.5.0/assets/NoAuth-CgJ9g5Of.css b/cylc/uiserver/ui/2.5.0/assets/NoAuth-CgJ9g5Of.css
diff --git a/cylc/uiserver/ui/2.5.0/assets/NotFound-nJz0IR95.js b/cylc/uiserver/ui/2.5.0/assets/NotFound-nJz0IR95.js
diff --git a/cylc/uiserver/ui/2.5.0/assets/SchemaReference.es-Je_w_EN8.js b/cylc/uiserver/ui/2.5.0/assets/SchemaReference.es-Je_w_EN8.js