From 1a002f2377f6817caa64b5270e15e06352e39892 Mon Sep 17 00:00:00 2001 From: Blank Spruce <32396809+BlankSpruce@users.noreply.github.com> Date: Fri, 22 Dec 2023 18:11:39 +0100 Subject: [PATCH] Re-enable pylint in Github Actions --- .github/workflows/test.yml | 2 +- tests/test_executable.py | 4 ++-- tox.ini | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b83c945..2f4a621 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,5 +38,5 @@ jobs: run: tox -e tests - name: Run quality tests - run: tox -e format && tox -e mypy + run: tox -e lint && tox -e format && tox -e mypy if: matrix.name == 'Quality tests' diff --git a/tests/test_executable.py b/tests/test_executable.py index dc5ea5c..d2f0854 100644 --- a/tests/test_executable.py +++ b/tests/test_executable.py @@ -814,7 +814,7 @@ def test_check_project_with_conflicting_command_definitions(): assert completed_process.returncode == 0 assert completed_process.stdout == "" assert re.search( - f"""Warning: conflicting definitions for 'foo': + """Warning: conflicting definitions for 'foo': \\(used\\) .*foo1\\.cmake:1:10 \\(ignored\\) .*foo2\\.cmake:1:10 \\(ignored\\) .*foo2\\.cmake:5:10 @@ -845,7 +845,7 @@ def test_format_file_with_conflicting_command_definitions(): """ ) assert re.search( - f"""Warning: conflicting definitions for 'foo': + """Warning: conflicting definitions for 'foo': \\(used\\) .*foo1\\.cmake:1:10 \\(ignored\\) .*foo2\\.cmake:1:10 \\(ignored\\) .*foo2\\.cmake:5:10 diff --git a/tox.ini b/tox.ini index f130ad4..f45100d 100644 --- a/tox.ini +++ b/tox.ini @@ -23,7 +23,7 @@ deps = flake8-bugbear pydantic commands = - pylint gersemi stubs tests setup.py + pylint --recursive=y gersemi stubs tests setup.py flake8 gersemi stubs tests setup.py [testenv:format]