Merge pull request #5221 from grondo/pre-commit-t

ci: fix pre-commit config to lint python files in testsuite

Author: mergify[bot]

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
-files: '^(src/bindings/python/flux|src/cmd|t/.*\\.py)'
-exclude: "^(src/bindings/python/_flux/|src/bindings/python/flux/utils/)"
+files: '^(src/bindings/python/flux|src/cmd|t/python/.*\.py|t/scripts/.*\.py)'
+exclude: "^(src/bindings/python/_flux/|src/bindings/python/flux/utils/|t/python/tap)"
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.0.1

t/python/sideflux.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 ###############################################################
 # Copyright 2014 Lawrence Livermore National Security, LLC
 # (c.f. AUTHORS, NOTICE.LLNS, COPYING)
@@ -10,10 +8,10 @@
 # SPDX-License-Identifier: LGPL-3.0
 ###############################################################
 
+import argparse
 import os
-import sys
 import subprocess
-import argparse
+import sys
 
 script_dir = os.path.dirname(os.path.abspath(__file__))
 

t/python/subflux.py

@@ -10,11 +10,11 @@
 # SPDX-License-Identifier: LGPL-3.0
 ###############################################################
 
-import unittest
 import syslog
+import unittest
 
 import flux
-from subflux import rerun_under_flux, script_dir
+from subflux import rerun_under_flux
 
 
 def __flux_size():

t/python/t0001-handle.py

@@ -13,8 +13,8 @@
 import unittest
 
 import flux
-from flux.core.inner import ffi, raw
 import flux.wrapper
+from flux.core.inner import ffi, raw
 from subflux import rerun_under_flux
 
 
@@ -42,12 +42,12 @@ def test_null_handle_exception(self):
         f = flux.Flux()
         payload = {"seq": 1, "pad": "stuff"}
         future = f.rpc("broker.ping", payload)
-        resp = future.get()
+        future.get()
         future.pimpl.handle = None
         with self.assertRaisesRegex(
             ValueError, r"Attempting to call a cached, bound method.*NULL handle"
         ):
-            resp = future.get()
+            future.get()
 
     def test_automatic_unwrapping(self):
         flux.core.inner.raw.flux_log(flux.Flux("loop://"), 0, "stuff")

t/python/t0002-wrapper.py

@@ -10,8 +10,8 @@
 # SPDX-License-Identifier: LGPL-3.0
 ###############################################################
 
-import unittest
 import multiprocessing as mp
+import unittest
 
 import flux
 from subflux import rerun_under_flux

t/python/t0003-barrier.py

@@ -14,7 +14,6 @@
 
 import flux
 import flux.kvs
-
 from subflux import rerun_under_flux
 
 
@@ -39,7 +38,7 @@ def set_and_check_context(self, key, value, type):
         kd2 = flux.kvs.KVSDir(self.f)
         nv = kd2[key]
         if isinstance(value, bytes) and type is str:
-            self.assertEqual(value.decode('utf-8'), nv)
+            self.assertEqual(value.decode("utf-8"), nv)
         else:
             self.assertEqual(value, nv)
         if type is not None:

t/python/t0005-kvs.py

@@ -10,9 +10,9 @@
 # SPDX-License-Identifier: LGPL-3.0
 ###############################################################
 
+import errno
 import unittest
 
-import errno
 import flux
 from subflux import rerun_under_flux
 

t/python/t0006-request.py

@@ -10,10 +10,11 @@
 # SPDX-License-Identifier: LGPL-3.0
 ###############################################################
 
-import unittest
-import os
 import gc
+import os
 import signal
+import unittest
+
 import flux
 from subflux import rerun_under_flux
 
@@ -67,8 +68,8 @@ def test_timer_callback_exception(self):
         def cb(x, y, z, w):
             raise RuntimeError("this is a test")
 
-        with self.f.timer_watcher_create(0.01, cb) as timer:
-            with self.assertRaises(RuntimeError) as cm:
+        with self.f.timer_watcher_create(0.01, cb):
+            with self.assertRaises(RuntimeError):
                 self.f.reactor_run()
 
     def test_msg_watcher_unicode(self):
@@ -155,7 +156,7 @@ def raise_signal(handle, watcher, revents, args):
         #  Create new Flux handle to avoid potential stale state in
         #  self.f handle. (makes test unreliable)
         h = flux.Flux()
-        with h.signal_watcher_create(signal.SIGUSR2, signal_cb) as watcher:
+        with h.signal_watcher_create(signal.SIGUSR2, signal_cb):
             h.timer_watcher_create(0.05, raise_signal).start()
             with self.assertRaises(RuntimeError):
                 rc = h.reactor_run()
@@ -231,7 +232,7 @@ def cb_abort(handle, watcher, revents, _args):
         self.f.timer_watcher_create(0.0, cb, repeat=0.05).start()
 
         #  Timeout/abort after 5s
-        tw = self.f.timer_watcher_create(5.0, cb_abort).start()
+        self.f.timer_watcher_create(5.0, cb_abort).start()
         self.f.reactor_run()
 
         #  callback should have been called 5 times, not less

t/python/t0007-watchers.py

@@ -17,7 +17,7 @@
 
 try:
     from flux.security import SecurityContext
-except:
+except ModuleNotFoundError:
     print("1..0 # skip flux.security module not available")
     sys.exit(0)