Skip to content

Commit def8d01

Browse files
authored
Merge pull request #633 from cylc/1.5.x-sync
🤖 Merge 1.5.x-sync into master
2 parents dfcdf6c + 0b9f11d commit def8d01

File tree

139 files changed

+1005
-1000
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+1005
-1000
lines changed

changes.d/+dfccb67d.ui-version.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Updated cylc-ui to 2.6.0

cylc/uiserver/resolvers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ async def play(
314314
stderr=PIPE,
315315
text=True
316316
)
317-
ret_code = proc.wait(timeout=20)
317+
ret_code = proc.wait(timeout=120)
318318

319319
if ret_code:
320320
# command failed

cylc/uiserver/tests/test_resolvers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ def wait(timeout):
224224
log=Mock(),
225225
)
226226
assert ret == [
227-
False, "Command 'cylc play wflow1' timed out after 20 seconds"
227+
False, "Command 'cylc play wflow1' timed out after 120 seconds"
228228
]
229229

230230

cylc/uiserver/ui/2.5.0/assets/Analysis-CRVASxga.js

Lines changed: 0 additions & 29 deletions
This file was deleted.

cylc/uiserver/ui/2.5.0/assets/Gantt-DWnNYZ5X.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

cylc/uiserver/ui/2.5.0/assets/Graph-DFLGn-c0.js

Lines changed: 0 additions & 129 deletions
This file was deleted.

cylc/uiserver/ui/2.5.0/assets/GraphiQL-B9aJM6eK.js

Lines changed: 0 additions & 164 deletions
This file was deleted.

cylc/uiserver/ui/2.5.0/assets/NoAuth-BTtFJL6w.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

cylc/uiserver/ui/2.5.0/assets/NoAuth-CgJ9g5Of.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

cylc/uiserver/ui/2.5.0/assets/NotFound-nJz0IR95.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)