Merge 'upstream/master' into 8.4.x-sync

Author: MetRonnie

.github/workflows/2_auto_publish_release.yml

@@ -38,7 +38,7 @@ jobs:
       uses: cylc/release-actions/build-python-package@v1
 
     - name: Publish distribution to PyPI
-      uses: pypa/gh-action-pypi-publish@v1.12.2
+      uses: pypa/gh-action-pypi-publish@release/v1
       with:
         user: __token__ # uses the API token feature of PyPI - least permissions possible
         password: ${{ secrets.PYPI_TOKEN }}

.github/workflows/branch_sync.yml

@@ -14,6 +14,7 @@ on:
 
 jobs:
   sync:
+    if: github.repository_owner == 'cylc' || github.event_name != 'schedule'
     uses: cylc/release-actions/.github/workflows/branch-sync.yml@v1
     with:
       head_branch: ${{ inputs.head_branch }}

.github/workflows/test_conda-build.yml

@@ -15,6 +15,7 @@ concurrency:
 
 jobs:
   test_conda_install:
+    if: github.repository_owner == 'cylc' || github.event_name != 'schedule'
     runs-on: ubuntu-latest
     timeout-minutes: 10
     strategy:

changes.d/6117.feat.md

@@ -0,0 +1 @@
+Create `workflow/share/cycle/<cycle>` and make it available to jobs as `$CYLC_TASK_SHARE_CYCLE_DIR`.

changes.d/6549.fix.md

@@ -0,0 +1 @@
+Removed cylc.vim - you should use https://github.com/cylc/cylc.vim instead.

changes.d/6561.feat.md

@@ -0,0 +1 @@
+Tui now displays task states and flow numbers in context menus. Tasks in flow=None will be displayed in gray.

conda-environment.yml

@@ -3,7 +3,7 @@ channels:
   - conda-forge
 dependencies:
   - ansimarkup >=1.0.0
-  - async-timeout>=3.0.0
+  - async-timeout>=3.0.0 # [py<3.11]
   - colorama >=0.4,<1.0
   - graphene >=2.1,<3
   - graphviz  # for static graphing

cylc/flow/__init__.py

@@ -52,7 +52,7 @@ def environ_init():
 
 environ_init()
 
-__version__ = '8.4.1.dev'
+__version__ = '8.5.0.dev'
 
 
 def iter_entry_points(entry_point_name):

cylc/flow/commands.py

@@ -254,7 +254,7 @@ async def poll_tasks(schd: 'Scheduler', tasks: Iterable[str]):
     if schd.get_run_mode() == RunMode.SIMULATION:
         yield 0
     itasks, _, bad_items = schd.pool.filter_task_proxies(tasks)
-    schd.task_job_mgr.poll_task_jobs(schd.workflow, itasks)
+    schd.task_job_mgr.poll_task_jobs(itasks)
     yield len(bad_items)
 
 

cylc/flow/etc/job.sh

@@ -95,6 +95,7 @@ cylc__job__main() {
         CYLC_TASK_WORK_DIR_BASE="${CYLC_TASK_CYCLE_POINT}/${CYLC_TASK_NAME}"
     fi
     export CYLC_TASK_WORK_DIR="${CYLC_WORKFLOW_WORK_DIR}/${CYLC_TASK_WORK_DIR_BASE}"
+    export CYLC_TASK_SHARE_CYCLE_DIR="${CYLC_WORKFLOW_SHARE_DIR}/cycle/${CYLC_TASK_CYCLE_POINT}"
     typeset contact="${CYLC_WORKFLOW_RUN_DIR}/.service/contact"
     if [[ -f "${contact}" ]]; then
         # (contact file not present for polled platforms)
@@ -134,7 +135,7 @@ cylc__job__main() {
     export PATH="${CYLC_WORKFLOW_RUN_DIR}/share/bin:${CYLC_WORKFLOW_RUN_DIR}/bin:${PATH}"
     export PYTHONPATH="${CYLC_WORKFLOW_RUN_DIR}/share/lib/python:${CYLC_WORKFLOW_RUN_DIR}/lib/python:${PYTHONPATH:-}"
     # Create share and work directories
-    mkdir -p "${CYLC_WORKFLOW_SHARE_DIR}" || true
+    mkdir -p "${CYLC_TASK_SHARE_CYCLE_DIR}" || true
     mkdir -p "$(dirname "${CYLC_TASK_WORK_DIR}")" || true
     mkdir -p "${CYLC_TASK_WORK_DIR}"
     cd "${CYLC_TASK_WORK_DIR}"