From e69774b1b9040d083a24800cf6c0233632f271d0 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 21 Oct 2023 13:59:11 -0700 Subject: [PATCH 1/2] .github/workflows/lint.yml: Do not install what tox will install --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index afd0406341c..7626f1327dc 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -33,7 +33,7 @@ jobs: python-version: 3.9 - name: Install dependencies - run: pip install tox pycodestyle relint + run: pip install tox - name: Code style check with pycodestyle run: tox -e pycodestyle-minimal From d60aa74c197e6f907bcd718b637d7e68f3512109 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 21 Oct 2023 14:02:16 -0700 Subject: [PATCH 2/2] lint.yml: Always run all 3 linters --- .github/workflows/lint.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 7626f1327dc..41560674b49 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -33,13 +33,17 @@ jobs: python-version: 3.9 - name: Install dependencies + id: deps run: pip install tox - name: Code style check with pycodestyle + if: always() && steps.deps.outcome == 'success' run: tox -e pycodestyle-minimal - name: Code style check with relint + if: always() && steps.deps.outcome == 'success' run: tox -e relint -- src/sage/ - name: Validate docstring markup as RST + if: always() && steps.deps.outcome == 'success' run: tox -e rst