From e06d53938c050690bbd0d3c570508a335d56aacf Mon Sep 17 00:00:00 2001 From: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com> Date: Thu, 1 Aug 2024 12:38:39 +0100 Subject: [PATCH 1/3] GH Actions: pin eslint to v8 --- .github/workflows/test.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1d05850..65266a1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: uses: actions/checkout@v3 - name: eslint - run: npx eslint . + run: npx eslint@8 . - name: configure python uses: actions/setup-python@v4 @@ -34,9 +34,7 @@ jobs: pip install -e .[all] - name: pycodestyle - run: | - pycodestyle . - npx eslint cylc/ + run: pycodestyle . - name: unittest run: | From 8c41d7b31b2ccd16361b5ebd0338de27378fb99a Mon Sep 17 00:00:00 2001 From: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com> Date: Thu, 1 Aug 2024 12:40:17 +0100 Subject: [PATCH 2/3] GH Actions: bump versions and configure concurrency --- .github/workflows/test.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 65266a1..46221e3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,29 +6,39 @@ on: push: branches: [master] +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +env: + FORCE_COLOR: 2 + PS4: '[command]' + jobs: test: runs-on: ubuntu-latest timeout-minutes: 5 strategy: matrix: - python-version: ['3.7', '3.9'] + python-version: ['3.7', '3'] + fail-fast: false env: PYTEST_ADDOPTS: --color=yes steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: eslint run: npx eslint@8 . - name: configure python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: install run: | + set -x sudo apt-get install -y graphviz pip install git+https://github.com/cylc/cylc-flow/ # install latest cylc-flow pip install -e .[all] From 0b507ac901fd8a503af4eee0652dcf53e6807781 Mon Sep 17 00:00:00 2001 From: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com> Date: Thu, 1 Aug 2024 13:20:25 +0100 Subject: [PATCH 3/3] Fix tests --- .github/workflows/test.yml | 3 +-- cylc/sphinx_ext/cylc_lang/autodocumenters.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 46221e3..1c119a3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,8 +40,7 @@ jobs: run: | set -x sudo apt-get install -y graphviz - pip install git+https://github.com/cylc/cylc-flow/ # install latest cylc-flow - pip install -e .[all] + pip install git+https://github.com/cylc/cylc-flow/ -e .[all] - name: pycodestyle run: pycodestyle . diff --git a/cylc/sphinx_ext/cylc_lang/autodocumenters.py b/cylc/sphinx_ext/cylc_lang/autodocumenters.py index 84efb9a..5e030ca 100644 --- a/cylc/sphinx_ext/cylc_lang/autodocumenters.py +++ b/cylc/sphinx_ext/cylc_lang/autodocumenters.py @@ -26,7 +26,7 @@ def get_obj_from_module(namespace): Examples: >>> get_obj_from_module('os') # doctest: +ELLIPSIS - + >>> get_obj_from_module('os.walk') # doctest: +ELLIPSIS >>> get_obj_from_module('os.path.join') # doctest: +ELLIPSIS