From ff20316ec972fff47c63c7c1eba18d83a9655e55 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 8 Jan 2025 13:43:21 +0100 Subject: [PATCH] GitHub Action to lint Python code --- .github/workflows/lint_python.yml | 11 +++++++++++ googletest/test/googletest-filter-unittest.py | 2 +- googletest/test/googletest-shuffle-test.py | 2 +- googletest/test/gtest_test_utils.py | 10 ++++------ googletest/test/gtest_xml_outfiles_test.py | 2 +- googletest/test/gtest_xml_test_utils.py | 2 +- 6 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 .github/workflows/lint_python.yml diff --git a/.github/workflows/lint_python.yml b/.github/workflows/lint_python.yml new file mode 100644 index 0000000000..ec1d49c1fa --- /dev/null +++ b/.github/workflows/lint_python.yml @@ -0,0 +1,11 @@ +# https://docs.github.com/en/actions +# https://docs.github.com/en/actions/use-cases-and-examples/building-and-testing/building-and-testing-python +# https://docs.astral.sh/ruff +name: lint_python +on: [pull_request, push] +jobs: + lint_python: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: astral-sh/ruff-action@v3 diff --git a/googletest/test/googletest-filter-unittest.py b/googletest/test/googletest-filter-unittest.py index f1f3c7a513..d09b395335 100755 --- a/googletest/test/googletest-filter-unittest.py +++ b/googletest/test/googletest-filter-unittest.py @@ -695,7 +695,7 @@ def testShardStatusFileIsCreatedWithListTests(self): def testDisabledBanner(self): """Tests that the disabled banner prints only tests that match filter.""" - make_filter = lambda s: ['--%s=%s' % (FILTER_FLAG, s)] + make_filter = lambda s: ['--%s=%s' % (FILTER_FLAG, s)] # noqa: E731 banners = RunAndExtractDisabledBannerList(make_filter('*')) self.AssertSetEqual( diff --git a/googletest/test/googletest-shuffle-test.py b/googletest/test/googletest-shuffle-test.py index 61e3a15ec3..d2e7d646aa 100755 --- a/googletest/test/googletest-shuffle-test.py +++ b/googletest/test/googletest-shuffle-test.py @@ -119,7 +119,7 @@ def GetTestCases(tests): test_cases = [] for test in tests: test_case = test.split('.')[0] - if not test_case in test_cases: + if test_case not in test_cases: test_cases.append(test_case) return test_cases diff --git a/googletest/test/gtest_test_utils.py b/googletest/test/gtest_test_utils.py index 964fa9fa50..7b32e21747 100755 --- a/googletest/test/gtest_test_utils.py +++ b/googletest/test/gtest_test_utils.py @@ -31,20 +31,18 @@ # Suppresses the 'Import not at the top of the file' lint complaint. # pylint: disable=g-import-not-at-top +import atexit import os +import shutil import subprocess import sys +import tempfile +import unittest as _test_module IS_WINDOWS = os.name == 'nt' IS_CYGWIN = os.name == 'posix' and 'CYGWIN' in os.uname()[0] IS_OS2 = os.name == 'os2' -import atexit -import shutil -import tempfile -import unittest as _test_module -# pylint: enable=g-import-not-at-top - GTEST_OUTPUT_VAR_NAME = 'GTEST_OUTPUT' # The environment variable for specifying the path to the premature-exit file. diff --git a/googletest/test/gtest_xml_outfiles_test.py b/googletest/test/gtest_xml_outfiles_test.py index d17cc0c9ae..74167f85c3 100755 --- a/googletest/test/gtest_xml_outfiles_test.py +++ b/googletest/test/gtest_xml_outfiles_test.py @@ -32,7 +32,7 @@ """Unit test for the gtest_xml_output module.""" import os -from xml.dom import minidom, Node +from xml.dom import minidom from googletest.test import gtest_test_utils from googletest.test import gtest_xml_test_utils diff --git a/googletest/test/gtest_xml_test_utils.py b/googletest/test/gtest_xml_test_utils.py index 74e0f4a082..ef46c0bc13 100755 --- a/googletest/test/gtest_xml_test_utils.py +++ b/googletest/test/gtest_xml_test_utils.py @@ -30,7 +30,7 @@ """Unit test utilities for gtest_xml_output""" import re -from xml.dom import minidom, Node +from xml.dom import Node from googletest.test import gtest_test_utils GTEST_DEFAULT_OUTPUT_FILE = 'test_detail.xml'