Merge branch '8.3.x' into fix_job_runner_newline

cylc · Oct 23, 2024 · 28cfe66 · 28cfe66
2 parents 6bd2b69 + df89a77
commit 28cfe66
Show file tree

Hide file tree

Showing 362 changed files with 11,902 additions and 4,140 deletions.
diff --git a/.github/workflows/2_auto_publish_release.yml b/.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.8.14
+      uses: pypa/gh-action-pypi-publish@v1.10.1
       with:
         user: __token__ # uses the API token feature of PyPI - least permissions possible
         password: ${{ secrets.PYPI_TOKEN }}

diff --git a/.github/workflows/bash.yml b/.github/workflows/bash.yml
@@ -89,3 +89,4 @@ jobs:
         with:
           name: 'cylc-run (bash-${{ matrix.bash-version }})'
           path: cylc-run
+          include-hidden-files: true
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,10 +18,12 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-latest']
-        python: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python: ['3.8', '3.9', '3.10', '3.11']
         include:
-          - os: 'macos-latest'
+          - os: 'ubuntu-22.04'
             python: '3.7'
+          - os: 'macos-latest'
+            python: '3.8'
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/test_fast.yml b/.github/workflows/test_fast.yml
@@ -20,12 +20,12 @@ jobs:
       fail-fast: false # don't stop on first failure
       matrix:
         os: ['ubuntu-latest']
-        python-version: ['3.7', '3.8', '3.10', '3.11', '3']
+        python-version: ['3.8', '3.10', '3.11', '3']
         include:
-          # mac os test
-          - os: 'macos-11'
-            python-version: '3.7'  # oldest supported version
-
+          - os: 'ubuntu-22.04'
+            python-version: '3.7'
+          - os: 'macos-latest'
+            python-version: '3.9'  # oldest supported version
           # non-utc timezone test
           - os: 'ubuntu-latest'
             python-version: '3.9'  # not the oldest, not the most recent version
@@ -50,6 +50,9 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y sqlite3
 
+      - name: Patch DNS
+        uses: cylc/release-actions/patch-dns@v1
+
       - name: Install
         run: |
           pip install -e ."[all]"
@@ -73,6 +76,7 @@ jobs:
         with:
           name: cylc-run (${{ matrix.os }} py-${{ matrix.python-version }})
           path: ~/cylc-run/
+          include-hidden-files: true
 
       - name: Coverage report
         run: |
@@ -122,8 +126,8 @@ jobs:
       - name: MyPy
         run: mypy
 
-      - name: Towncrier
-        run: towncrier build --draft
+      - name: Towncrier - draft changelog
+        uses: cylc/release-actions/towncrier-draft@v1
 
       - name: Linkcheck
         run: pytest -m linkcheck --dist=load --color=yes -n 10 tests/unit/test_links.py

diff --git a/.github/workflows/test_functional.yml b/.github/workflows/test_functional.yml
@@ -8,6 +8,7 @@ on:
       - '!.github/workflows/test_functional.yml'
       - 'cylc/flow/etc/syntax/**'
       - 'etc/syntax/**'
+      - 'tests/conftest.py'
       - 'tests/unit/**'
       - 'tests/integration/**'
       - '**.md'
@@ -21,6 +22,7 @@ on:
       - '!.github/workflows/test_functional.yml'
       - 'cylc/flow/etc/syntax/**'
       - 'etc/syntax/**'
+      - 'tests/conftest.py'
       - 'tests/unit/**'
       - 'tests/integration/**'
       - '**.md'
@@ -38,7 +40,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['ubuntu-latest']
+        os: ['ubuntu-22.04']
         python-version: ['3.7']
         test-base: ['tests/f']
         chunk: ['1/4', '2/4', '3/4', '4/4']
@@ -54,34 +56,34 @@ jobs:
             platform: '_local_background*'
           # tests/k
           - name: 'flaky'
-            os: 'ubuntu-latest'
+            os: 'ubuntu-22.04'
             python-version: '3.7'
             test-base: 'tests/k'
             chunk: '1/1'
             platform: '_local_background* _local_at*'
           # remote platforms
           - name: '_remote_background_indep_poll'
-            os: 'ubuntu-latest'
+            os: 'ubuntu-22.04'
             python-version: '3.7'
             test-base: 'tests/f tests/k'
             chunk: '1/1'
             platform: '_remote_background_indep_poll _remote_at_indep_poll'
           - name: '_remote_background_indep_tcp'
-            os: 'ubuntu-latest'
+            os: 'ubuntu-22.04'
             test-base: 'tests/f tests/k'
             python-version: '3.7'
             chunk: '1/1'
             platform: '_remote_background_indep_tcp _remote_at_indep_tcp'
           # macos
           - name: 'macos 1/5'
-            os: 'macos-11'
-            python-version: '3.7'
+            os: 'macos-latest'
+            python-version: '3.9'
             test-base: 'tests/f'
             chunk: '1/5'
             platform: '_local_background*'
           - name: 'macos 2/5'
-            os: 'macos-11'
-            python-version: '3.7'
+            os: 'macos-latest'
+            python-version: '3.9'
             test-base: 'tests/f'
             chunk: '2/5'
             platform: '_local_background*'
@@ -103,6 +105,29 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Create global config
+        run: |
+          CONF_PATH="$HOME/.cylc/flow/8"
+          mkdir -p "$CONF_PATH"
+          touch "$CONF_PATH/global.cylc"
+          ln -s "$CONF_PATH/global.cylc" "$CONF_PATH/global-tests.cylc"
+          echo "GLOBAL_CFG_PATH=${CONF_PATH}/global.cylc" >> "$GITHUB_ENV"
+
+      - name: Patch DNS
+        uses: cylc/release-actions/patch-dns@v1
+
+      - name: Add localhost entries to global config
+        if: startsWith(runner.os, 'macos')
+        run: |
+          cat >> "$GLOBAL_CFG_PATH" <<__HERE__
+          [platforms]
+            [[localhost, $(hostname -f), $(hostname -s)]]
+              hosts = localhost
+              install target = localhost
+              ssh command = ssh -oBatchMode=yes -oConnectTimeout=8 -oStrictHostKeyChecking=no
+          __HERE__
+          cat "$GLOBAL_CFG_PATH"
+
       - name: Brew Install
         if: startsWith(matrix.os, 'macos')
         run: |
@@ -112,19 +137,15 @@ jobs:
 
           # add GNU coreutils and sed to the user PATH
           # (see instructions in brew install output)
-          echo \
-            "$(brew --prefix)/opt/coreutils/libexec/gnubin" \
-            >> "${GITHUB_PATH}"
-          echo \
-            "/usr/local/opt/gnu-sed/libexec/gnubin" \
-            >> "${GITHUB_PATH}"
-          echo \
-            "/usr/local/opt/grep/libexec/gnubin" \
-            >> "${GITHUB_PATH}"
+          echo "$(brew --prefix)/opt/coreutils/libexec/gnubin" >> "${GITHUB_PATH}"
+          echo "$(brew --prefix)/opt/grep/libexec/gnubin" >> "${GITHUB_PATH}"
+          echo "$(brew --prefix)/opt/gnu-sed/libexec/gnubin" >> "${GITHUB_PATH}"
 
           # add coreutils to the bashrc too (for jobs)
           cat >> "${HOME}/.bashrc" <<__HERE__
-          PATH="$(brew --prefix)/opt/coreutils/libexec/gnubin:/usr/local/opt/gnu-sed/libexec/gnubin:$PATH"
+          PATH="$(brew --prefix)/opt/coreutils/libexec/gnubin:$PATH"
+          PATH="$(brew --prefix)/opt/grep/libexec/gnubin:$PATH"
+          PATH="$(brew --prefix)/opt/gnu-sed/libexec/gnubin:$PATH"
           export PATH
           __HERE__
 
@@ -146,16 +167,13 @@ jobs:
       - name: Configure Atrun
         if: contains(matrix.platform, '_local_at')
         run: |
-          PTH="$HOME/.cylc/flow/"
-          mkdir -p "${PTH}"
-          cat > "${PTH}/global.cylc" << __HERE__
+          cat >> "$GLOBAL_CFG_PATH" << __HERE__
             [platforms]
                 [[_local_at_indep_tcp]]
                     hosts = localhost
                     install target = localhost
                     job runner = at
           __HERE__
-          cp "${PTH}/global.cylc" "${PTH}/global-tests.cylc"
 
       - name: Swarm Configure
         run: |
@@ -244,11 +262,11 @@ jobs:
         timeout-minutes: 1
         run: |
           find "$HOME/cylc-run" -name '*.err' -type f \
-              -exec echo '====== {} ======' \; -exec cat '{}' \;
+            -exec echo \; -exec echo '====== {} ======' \; -exec cat '{}' \;
           find "$HOME/cylc-run" -name '*.log' -type f \
-              -exec echo '====== {} ======' \; -exec cat '{}' \;
+            -exec echo \; -exec echo '====== {} ======' \; -exec cat '{}' \;
           find "${TMPDIR:-/tmp}/${USER}/cylctb-"* -type f \
-              -exec echo '====== {} ======' \; -exec cat '{}' \;
+            -exec echo \; -exec echo '====== {} ======' \; -exec cat '{}' \;
 
       - name: Set artifact upload name
         if: always()
@@ -264,6 +282,7 @@ jobs:
         with:
           name: cylc-run (${{ steps.uploadname.outputs.uploadname }})
           path: ~/cylc-run/
+          include-hidden-files: true
 
       - name: Fetch Remote Coverage
         if: env.REMOTE_PLATFORM == 'true'

diff --git a/.github/workflows/test_tutorial_workflow.yml b/.github/workflows/test_tutorial_workflow.yml
@@ -21,8 +21,12 @@ jobs:
   test:
     strategy:
       matrix:
-        python-version: ['3.7', '3']
-    runs-on: ubuntu-latest
+        include:
+          - os: 'ubuntu-latest'
+            python-version: '3'
+          - os: 'ubuntu-22.04'
+            python-version: '3.7'
+    runs-on: ${{ matrix.os }}
     timeout-minutes: 10
     steps:
       - name: configure python

diff --git a/.mailmap b/.mailmap
@@ -1,4 +1,4 @@
-# FORMAT: <proper-name>  <proper-email>  <commit-name>  <commit-email>   
+# FORMAT: <proper-name>  <proper-email>  <commit-name>  <commit-email>
 # Omit commit-name or commit-email if same as proper
 
 Alex Reinecke              <alex.reinecke@nrlmry.navy.mil>      P. A. Reinecke
@@ -52,6 +52,8 @@ Tim Whitcomb               <tim.whitcomb@nrlmry.navy.mil>
 Tim Whitcomb               <tim.whitcomb@nrlmry.navy.mil>       trwhitcomb          <twhitcomb@gmail.com>
 Tomek Trzeciak             <tomasz.trzeciak@metoffice.gov.uk>                       <TomekTrzeciak@users.noreply.github.com>
 Tomek Trzeciak             <tomasz.trzeciak@metoffice.gov.uk>   TomekTrzeciak       <tomasz.trzeciak@metoffice.gov.uk>
-github-actions[bot]        <github-actions@noreply.github.com>                      <41898282+github-actions[bot]@users.noreply.github.com> 
+Utheri Wagura              <utheriwagura@gmail.com>
+Utheri Wagura              <36386988+uwagura@users.noreply.github.com>
+github-actions[bot]        <github-actions@noreply.github.com>                      <41898282+github-actions[bot]@users.noreply.github.com>
 github-actions[bot]        <github-actions@noreply.github.com>  GitHub Action
 Diquan Jabbour             <165976689+Diquan-BOM@users.noreply.github.com>