diff mbox series

pre-commit: run flake8 on more Python files

Message ID 20241205174127.3964750-1-simark@simark.ca
State New
Headers
Series pre-commit: run flake8 on more Python files |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 success Build passed
linaro-tcwg-bot/tcwg_gdb_build--master-arm success Build passed
linaro-tcwg-bot/tcwg_gdb_check--master-arm success Test passed
linaro-tcwg-bot/tcwg_gdb_check--master-aarch64 success Test passed

Commit Message

Simon Marchi Dec. 5, 2024, 5:41 p.m. UTC 
  From: Simon Marchi <simon.marchi@polymtl.ca>

pre-commit currently runs flake8 only on `gdb/python/**/*.py`.  There
are more files we can run it on, without running it on all the testsuite
files.  Add:

 - gdb/gdb-gdb.py.in
 - gdb/*.py
 - gdb/testsuite/*.py

Fix the new errors that popped up:

    gdb/copyright.py:29:21: W605 invalid escape sequence '\*'
    gdb/copyright.py:29:29: W605 invalid escape sequence '\*'
    gdb/copyright.py:29:38: W605 invalid escape sequence '\*'
    gdb/copyright.py:29:46: W605 invalid escape sequence '\*'
    gdb/copyright.py:34:1: F401 'datetime' imported but unused
    gdb/testsuite/analyze-racy-logs.py:150:9: E722 do not use bare 'except'

Change-Id: Ia864c22d4f170d4e18ce3beb06a86c49966654b2
---
 .pre-commit-config.yaml            | 11 ++++++++---
 gdb/copyright.py                   | 25 ++++++++++++-------------
 gdb/testsuite/analyze-racy-logs.py |  2 +-
 3 files changed, 21 insertions(+), 17 deletions(-)


base-commit: 07868dca1186ab0406840d3f52a4d7fa05aa0e61

Comments

Tom Tromey Dec. 9, 2024, 7:39 p.m. UTC | #1 
>>>>> simark  <simark@simark.ca> writes:

> From: Simon Marchi <simon.marchi@polymtl.ca>
> pre-commit currently runs flake8 only on `gdb/python/**/*.py`.  There
> are more files we can run it on, without running it on all the testsuite
> files.  Add:

Looks good.
Approved-By: Tom Tromey <tom@tromey.com>

Tom
diff mbox series

Patch

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 070631c0f168..8f9016567b02 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -49,9 +49,14 @@  repos:
     hooks:
     - id: flake8
       types_or: [file]
-      # Note this one is only run on gdb/python, not (for now) the
-      # test suite.
-      files: 'gdb/python/.*\.py(\.in)?$'
+      # Run this for (in glob notation):
+      #
+      #  - gdb/gdb-gdb.py.in
+      #  - gdb/*.py
+      #  - gdb/python/**/*.py
+      #  - gdb/testsuite/*.py
+      #
+      files: '^gdb/(gdb-gdb\.py\.in|[^/]+\.py|python/.+\.py|testsuite/[^/]+\.py)$'
       args: [--config, gdb/setup.cfg]
   - repo: https://github.com/pycqa/isort
     rev: 5.13.2
diff --git a/gdb/copyright.py b/gdb/copyright.py
index 2c9ea3c1d591..1a155b9cc831 100755
--- a/gdb/copyright.py
+++ b/gdb/copyright.py
@@ -17,21 +17,20 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""copyright.py
-
-This script updates the list of years in the copyright notices in
-most files maintained by the GDB project.
-
-Usage: cd src/gdb && ./copyright.py
-
-Always review the output of this script before committing it!
-A useful command to review the output is:
-    % filterdiff -x \*.c -x \*.cc -x \*.h -x \*.exp updates.diff
-This removes the bulk of the changes which are most likely to be correct.
-"""
+# This script updates the list of years in the copyright notices in
+# most files maintained by the GDB project.
+#
+# Usage: cd src/gdb && ./copyright.py
+#
+# Always review the output of this script before committing it!
+#
+# A useful command to review the output is:
+#
+#     $ filterdiff -x \*.c -x \*.cc -x \*.h -x \*.exp updates.diff
+#
+# This removes the bulk of the changes which are most likely to be correct.
 
 import argparse
-import datetime
 import locale
 import os
 import os.path
diff --git a/gdb/testsuite/analyze-racy-logs.py b/gdb/testsuite/analyze-racy-logs.py
index 5a3f90ed62d0..3863bd07b286 100755
--- a/gdb/testsuite/analyze-racy-logs.py
+++ b/gdb/testsuite/analyze-racy-logs.py
@@ -147,7 +147,7 @@  def identify_racy_tests():
     for s1, s2 in ignore_relations.items():
         try:
             ignored_tests |= all_tests[s1] & all_tests[s2]
-        except:
+        except Exception:
             continue
 
     racy_tests: set[str] = set()