"Update ruff pre-commit hook

"

Author: FoamyGuy

.pre-commit-config.yaml

@@ -10,7 +10,7 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.3.4
+    rev: v0.15.8
     hooks:
       - id: ruff-format
       - id: ruff

adafruit_esp32spi/PWMOut.py

@@ -30,7 +30,7 @@ def __init__(self, esp, pwm_pin, *, frequency=500, duty_cycle=0, variable_freque
         if pwm_pin in self.ESP32_PWM_PINS:
             self._pwm_pin = pwm_pin
         else:
-            raise AttributeError("Pin %d is not a valid ESP32 GPIO Pin." % pwm_pin)
+            raise AttributeError(f"Pin {pwm_pin} is not a valid ESP32 GPIO Pin.")
         self._esp = esp
         self._duty_cycle = duty_cycle
         self._freq = frequency

adafruit_esp32spi/adafruit_esp32spi.py

@@ -319,7 +319,7 @@ def _send_command(self, cmd, params=None, *, param_len_16=False):
         ptr = 3
         for i, param in enumerate(params):
             if self._debug >= 2:
-                print("\tSending param #%d is %d bytes long" % (i, len(param)))
+                print(f"\tSending param #{i} is {len(param)} bytes long")
             if param_len_16:
                 self._sendbuf[ptr] = (len(param) >> 8) & 0xFF
                 ptr += 1
@@ -399,14 +399,14 @@ def _wait_response_cmd(self, cmd, num_responses=None, *, param_len_16=False):
                     param_len <<= 8
                     param_len |= self._read_byte(spi)
                 if self._debug >= 2:
-                    print("\tParameter #%d length is %d" % (num, param_len))
+                    print(f"\tParameter #{num} length is {param_len}")
                 response = bytearray(param_len)
                 self._read_bytes(spi, response)
                 responses.append(response)
             self._check_data(spi, _END_CMD)
 
         if self._debug >= 2:
-            print("Read %d: " % len(responses[0]), responses)
+            print(f"Read {len(responses[0])}: ", responses)
         return responses
 
     def _send_command_get_response(
@@ -776,7 +776,7 @@ def get_socket(self):
         if resp == 255:
             raise OSError(23)  # ENFILE - File table overflow
         if self._debug:
-            print("Allocated socket #%d" % resp)
+            print(f"Allocated socket #{resp}")
         return resp
 
     def socket_open(self, socket_num, dest, port, conn_mode=TCP_MODE):
@@ -850,7 +850,7 @@ def socket_write(self, socket_num, buffer, conn_mode=TCP_MODE):
         if conn_mode == self.UDP_MODE:
             # UDP verifies chunks on write, not bytes
             if sent != total_chunks:
-                raise ConnectionError("Failed to write %d chunks (sent %d)" % (total_chunks, sent))
+                raise ConnectionError(f"Failed to write {total_chunks} chunks (sent {sent})")
             # UDP needs to finalize with this command, does the actual sending
             resp = self._send_command_get_response(_SEND_UDP_DATA_CMD, self._socknum_ll)
             if resp[0][0] != 1:
@@ -859,7 +859,7 @@ def socket_write(self, socket_num, buffer, conn_mode=TCP_MODE):
 
         if sent != len(buffer):
             self.socket_close(socket_num)
-            raise ConnectionError("Failed to send %d bytes (sent %d)" % (len(buffer), sent))
+            raise ConnectionError(f"Failed to send {len(buffer)} bytes (sent {sent})")
 
         resp = self._send_command_get_response(_DATA_SENT_TCP_CMD, self._socknum_ll)
         if resp[0][0] != 1:
@@ -873,15 +873,14 @@ def socket_available(self, socket_num):
         resp = self._send_command_get_response(_AVAIL_DATA_TCP_CMD, self._socknum_ll)
         reply = struct.unpack("<H", resp[0])[0]
         if self._debug:
-            print("ESPSocket: %d bytes available" % reply)
+            print(f"ESPSocket: {reply} bytes available")
         return reply
 
     def socket_read(self, socket_num, size):
         """Read up to 'size' bytes from the socket number. Returns a bytes"""
         if self._debug:
             print(
-                "Reading %d bytes from ESP socket with status %d"
-                % (size, self.socket_status(socket_num))
+                f"Reading {size} bytes from ESP socket with status {self.socket_status(socket_num)}"
             )
         self._socknum_ll[0][0] = socket_num
         resp = self._send_command_get_response(
@@ -917,7 +916,7 @@ def socket_connect(self, socket_num, dest, port, conn_mode=TCP_MODE):
     def socket_close(self, socket_num):
         """Close a socket using the ESP32's internal reference number"""
         if self._debug:
-            print("*** Closing socket #%d" % socket_num)
+            print(f"*** Closing socket #{socket_num}")
         self._socknum_ll[0][0] = socket_num
         try:
             self._send_command_get_response(_STOP_CLIENT_TCP_CMD, self._socknum_ll)

adafruit_esp32spi/adafruit_esp32spi_wifimanager.py

@@ -101,7 +101,7 @@ def connect(self):
             print("Firmware vers.", self.esp.firmware_version)
             print("MAC addr:", [hex(i) for i in self.esp.MAC_address])
             for access_pt in self.esp.scan_networks():
-                print("\t%s\t\tRSSI: %d" % (access_pt.ssid, access_pt.rssi))
+                print(f"\t{access_pt.ssid}\t\tRSSI: {access_pt.rssi}")
         if self._connection_type == WiFiManager.NORMAL:
             self.connect_normal()
         elif self._connection_type == WiFiManager.ENTERPRISE:

adafruit_esp32spi/digitalio.py

@@ -45,7 +45,7 @@ def __init__(self, esp_pin, esp):
         if esp_pin in self.ESP32_GPIO_PINS:
             self.pin_id = esp_pin
         else:
-            raise AttributeError("Pin %d is not a valid ESP32 GPIO Pin." % esp_pin)
+            raise AttributeError(f"Pin {esp_pin} is not a valid ESP32 GPIO Pin.")
         self._esp = esp
 
     def init(self, mode=IN):
@@ -201,6 +201,6 @@ def drive_mode(self, mode):
                                Either PUSH_PULL or OPEN_DRAIN
         """
         if mode is DriveMode.OPEN_DRAIN:
-            raise NotImplementedError("Drive mode %s not implemented in ESP32SPI." % mode)
+            raise NotImplementedError(f"Drive mode {mode} not implemented in ESP32SPI.")
         if mode is DriveMode.PUSH_PULL:
             self._pin.init(mode=Pin.OUT)

examples/esp32spi_aio_post.py

@@ -72,7 +72,7 @@
         )
         print(response.json())
         response.close()
-        counter = counter + 1
+        counter += 1
         print("OK")
     except OSError as e:
         print("Failed to get data, retrying\n", e)

examples/esp32spi_simpletest.py

@@ -60,10 +60,10 @@
 if esp.status == adafruit_esp32spi.WL_IDLE_STATUS:
     print("ESP32 found and in idle mode")
 print("Firmware vers.", esp.firmware_version)
-print("MAC addr:", ":".join("%02X" % byte for byte in esp.MAC_address))
+print("MAC addr:", ":".join(f"{byte:02X}" for byte in esp.MAC_address))
 
 for ap in esp.scan_networks():
-    print("\t%-23s RSSI: %d" % (ap.ssid, ap.rssi))
+    print(f"\t{ap.ssid:<23} RSSI: {ap.rssi}")
 
 print("Connecting to AP...")
 while not esp.is_connected:
@@ -74,8 +74,8 @@
         continue
 print("Connected to", esp.ap_info.ssid, "\tRSSI:", esp.ap_info.rssi)
 print("My IP address is", esp.ipv4_address)
-print("IP lookup adafruit.com: %s" % esp.pretty_ip(esp.get_host_by_name("adafruit.com")))
-print("Ping google.com: %d ms" % esp.ping("google.com"))
+print(f"IP lookup adafruit.com: {esp.pretty_ip(esp.get_host_by_name('adafruit.com'))}")
+print(f"Ping google.com: {esp.ping('google.com')} ms")
 
 # esp._debug = True
 print("Fetching text from", TEXT_URL)

examples/esp32spi_simpletest_rp2040.py

@@ -42,7 +42,7 @@
 print("MAC addr:", [hex(i) for i in esp.MAC_address])
 
 for ap in esp.scan_networks():
-    print("\t%s\t\tRSSI: %d" % (ap.ssid, ap.rssi))
+    print(f"\t{ap.ssid}\t\tRSSI: {ap.rssi}")
 
 print("Connecting to AP...")
 while not esp.is_connected:
@@ -53,8 +53,8 @@
         continue
 print("Connected to", esp.ap_info.ssid, "\tRSSI:", esp.ap_info.rssi)
 print("My IP address is", esp.ipv4_address)
-print("IP lookup adafruit.com: %s" % esp.pretty_ip(esp.get_host_by_name("adafruit.com")))
-print("Ping google.com: %d ms" % esp.ping("google.com"))
+print(f"IP lookup adafruit.com: {esp.pretty_ip(esp.get_host_by_name('adafruit.com'))}")
+print(f"Ping google.com: {esp.ping('google.com')} ms")
 
 # esp._debug = True
 print("Fetching text from", TEXT_URL)

examples/esp32spi_wpa2ent_aio_post.py

@@ -86,7 +86,7 @@
         )
         print(response.json())
         response.close()
-        counter = counter + 1
+        counter += 1
         print("OK")
     except OSError as e:
         print("Failed to get data, retrying\n", e)

examples/esp32spi_wpa2ent_simpletest.py

@@ -69,9 +69,9 @@ def normalize(v):
 
 # WPA2 Enterprise support was added in fw ver 1.3.0. Check that the ESP32
 # is running at least that version, otherwise, bail out
-assert (
-    version_compare(esp.firmware_version, "1.3.0") >= 0
-), "Incorrect ESP32 firmware version; >= 1.3.0 required."
+assert version_compare(esp.firmware_version, "1.3.0") >= 0, (
+    "Incorrect ESP32 firmware version; >= 1.3.0 required."
+)
 
 # Set up the SSID you would like to connect to
 # Note that we need to call wifi_set_network prior
@@ -101,7 +101,7 @@ def normalize(v):
 print("")
 print("Connected to", esp.ap_info.ssid, "\tRSSI:", esp.ap_info.rssi)
 print("My IP address is", esp.ipv4_address)
-print("IP lookup adafruit.com: %s" % esp.pretty_ip(esp.get_host_by_name("adafruit.com")))
-print("Ping google.com: %d ms" % esp.ping("google.com"))
+print(f"IP lookup adafruit.com: {esp.pretty_ip(esp.get_host_by_name('adafruit.com'))}")
+print(f"Ping google.com: {esp.ping('google.com')} ms")
 
 print("Done!")