Update pre-commit hooks

Author: rfinnie

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ fail_fast: false
 
 repos:
   - repo: "https://github.com/pre-commit/pre-commit-hooks"
-    rev: "v4.4.0"
+    rev: "v6.0.0"
     hooks:
       - id: "check-added-large-files"
       - id: "check-case-conflict"
@@ -25,30 +25,30 @@ repos:
       - id: "requirements-txt-fixer"
       - id: "trailing-whitespace"
 
-  - repo: "https://github.com/adrienverge/yamllint.git"
-    rev: "v1.32.0"
+  - repo: "https://github.com/adrienverge/yamllint"
+    rev: "v1.38.0"
     hooks:
       - id: "yamllint"
         args:
           - "-c"
           - ".yamllint.yml"
 
   - repo: "https://github.com/psf/black"
-    rev: "25.1.0"
+    rev: "26.1.0"
     hooks:
       - id: "black"
 
   - repo: "https://github.com/pycqa/flake8"
-    rev: "7.2.0"
+    rev: "7.3.0"
     hooks:
       - id: "flake8"
 
   - repo: "https://github.com/rhysd/actionlint"
-    rev: "v1.7.7"
+    rev: "v1.7.11"
     hooks:
       - id: "actionlint"
 
-  - repo: "https://github.com/fsfe/reuse-tool"
-    rev: "v5.0.2"
+  - repo: "https://codeberg.org/fsfe/reuse-tool"
+    rev: "v6.2.0"
     hooks:
       - id: "reuse"

2ping

@@ -10,6 +10,5 @@ from pathlib import Path
 from runpy import run_module
 import sys
 
-
 sys.path.insert(0, str(Path(__file__).resolve().parent))
 run_module("twoping.cli", run_name="__main__")

twoping/__init__.py

@@ -6,6 +6,5 @@
 
 import sys
 
-
 __version__ = "4.5.1"
 assert sys.version_info > (3, 6)

twoping/args.py

@@ -15,7 +15,7 @@
 
 
 def _type_nagios(string):
-    (warn_rta, warn_loss, crit_rta, crit_loss) = string.split(",", 3)
+    warn_rta, warn_loss, crit_rta, crit_loss = string.split(",", 3)
     if (warn_loss[-1:] != "%") or (crit_loss[-1:] != "%"):
         raise argparse.ArgumentTypeError(_("Invalid limits"))
     return types.SimpleNamespace(
@@ -28,7 +28,7 @@ def _type_nagios(string):
 
 def _type_packet_loss(string):
     if ":" in string:
-        (v_out, v_in) = string.split(":", 1)
+        v_out, v_in = string.split(":", 1)
     else:
         v_out = v_in = string
     return types.SimpleNamespace(out_pct=float(v_out), in_pct=float(v_in))

twoping/cli.py

@@ -41,7 +41,6 @@
     stats_time,
 )
 
-
 version_string = "2ping {} - {}".format(__version__, platform_info())
 clock = time.perf_counter
 
@@ -223,7 +222,7 @@ def handle_socket_error(self, e, sock_class, peer_address=None):
         error_string = str(e)
         try:
             MSG_ERRQUEUE = 8192
-            (error_data, error_address) = sock.recvfrom(16384, MSG_ERRQUEUE)
+            error_data, error_address = sock.recvfrom(16384, MSG_ERRQUEUE)
             print_address = error_address[0]
         except socket.error:
             if peer_address:
@@ -331,7 +330,7 @@ def process_incoming_packet(self, sock_class):
                     )
                 )
                 return
-            (test_begin, test_length) = packet_in.opcode_data_positions[packets.OpcodeHMAC.id]
+            test_begin, test_length = packet_in.opcode_data_positions[packets.OpcodeHMAC.id]
             test_begin += 2
             test_length -= 2
             packet_in.opcodes[packets.OpcodeHMAC.id].key = self.args.auth.encode("UTF-8")
@@ -355,7 +354,7 @@ def process_incoming_packet(self, sock_class):
         if packets.OpcodeInReplyTo.id in packet_in.opcodes:
             replied_message_id = packet_in.opcodes[packets.OpcodeInReplyTo.id].message_id
             if replied_message_id in peer_state.sent_messages:
-                (sent_time, _unused, ping_position) = peer_state.sent_messages[replied_message_id]
+                sent_time, _unused, ping_position = peer_state.sent_messages[replied_message_id]
                 del peer_state.sent_messages[replied_message_id]
 
                 calculated_rtt = (time_begin - sent_time) * 1000
@@ -536,7 +535,7 @@ def sock_sendto(self, sock_class, data, address=None):
     def sock_recvfrom(self, sock_class):
         sock = sock_class.sock
         try:
-            (data, peer_address) = sock.recvfrom(16384)
+            data, peer_address = sock.recvfrom(16384)
         except socket.error as e:
             self.handle_socket_error(e, sock_class)
             return
@@ -563,7 +562,7 @@ def start_investigations(self, peer_state, packet_check):
             iobj = None
         now = clock()
         for message_id_str in peer_state.sent_messages:
-            (sent_time, message_id, _unused) = peer_state.sent_messages[message_id_str]
+            sent_time, message_id, _unused = peer_state.sent_messages[message_id_str]
             if now >= (sent_time + self.args.inquire_wait):
                 if iobj is None:
                     iobj = packets.OpcodeInvestigate()
@@ -584,7 +583,7 @@ def check_investigations(self, peer_state, packet_check):
                 for message_id in packet_check.opcodes[opcode_id].message_ids:
                     if message_id not in peer_state.sent_messages:
                         continue
-                    (_unused, _unused, ping_seq) = peer_state.sent_messages[message_id]
+                    _unused, _unused, ping_seq = peer_state.sent_messages[message_id]
                     if peer_state.peer_tuple[1]:
                         address = peer_state.peer_tuple[1][0]
                     else:
@@ -601,7 +600,7 @@ def check_investigations(self, peer_state, packet_check):
             return
         # Print results
         for ping_seq in sorted(found):
-            (loss_type, address) = found[ping_seq]
+            loss_type, address = found[ping_seq]
             if loss_type == "inbound":
                 loss_message = "Lost inbound packet from {address}: ping_seq={seq}"
             else:

twoping/packets.py

@@ -330,7 +330,7 @@ def load(self, data):
 
     def dump(self, max_length=None):
         if self.digest_index is not None:
-            (hasher, size, hasher_name) = self.digest_map[self.digest_index]
+            hasher, size, hasher_name = self.digest_map[self.digest_index]
             return npack(self.digest_index, 2) + bytes(size)
         return None
 
@@ -623,5 +623,5 @@ def dump(self):
         return bytes(out)
 
     def calculate_hash(self, opcode, payload):
-        (hasher, size, hasher_name) = opcode.digest_map[opcode.digest_index]
+        hasher, size, hasher_name = opcode.digest_map[opcode.digest_index]
         return hmac.new(opcode.key, payload, hasher).digest()