Reformat by ruff to pass tests

Author: vanous

README.md

@@ -66,7 +66,7 @@ mypy pypsn/*py  --pretty  --no-strict-optional
 ```
 ### Format
 
-- to format, use [black](https://pypi.org/project/black/)
+- To format, use [ruff](https://docs.astral.sh/ruff/)
 
 ### Testing
 

conftest.py

@@ -1,8 +1,8 @@
 #!/bin/env python3
 """
-    This file sets up a pytest fixtures for the tests.
-    It is important that this file stays in this location
-    as this makes pytest to load pypsn from the pypsn directory.
+This file sets up a pytest fixtures for the tests.
+It is important that this file stays in this location
+as this makes pytest to load pypsn from the pypsn directory.
 """
 
 import pytest

examples/psn_to_sacn.py

@@ -1,8 +1,9 @@
 #! /bin/env python
 """
-    Simple forwarder of PSN to DMX. Turns all coordinates to positive ints.
-    Requires sacn module: pip install sacn
+Simple forwarder of PSN to DMX. Turns all coordinates to positive ints.
+Requires sacn module: pip install sacn
 """
+
 import sacn
 import pypsn
 
@@ -12,7 +13,7 @@
 
 def start_dmx():
     """
-        Start DMX sender thread.
+    Start DMX sender thread.
     """
     sender.start()  # start the sending thread
     sender.activate_output(1)  # start sending out data in the 1st universe
@@ -21,14 +22,14 @@ def start_dmx():
 
 def stop_dmx():
     """
-        Stop DMX sender thread.
+    Stop DMX sender thread.
     """
     sender.stop()  # do not forget to stop the sender
 
 
 def start_psn():
     """
-        Start PSN receiver thread.
+    Start PSN receiver thread.
     """
     pypsn.Receiver(fill_dmx, "192.168.20.177").start()
 

examples/simple_send_and_receive/receive_psn.py

@@ -1,6 +1,6 @@
 #! /bin/env python3
 """
-    Usage: python receive_psn.py 192.168.1.11 <--- change IP address
+Usage: python receive_psn.py 192.168.1.11 <--- change IP address
 """
 
 import sys
@@ -43,13 +43,20 @@ def callback(psn_data):
                 + str(tracker.tracker_id)
                 + " tracker info: "
                 + str(tracker.info)
-                + " / " + str(tracker.pos)
-                + " / " + str(tracker.speed)
-                + " / " + str(tracker.ori)
-                + " / " + str(tracker.accel)
-                + " / " + str(tracker.trgtpos)
-                + " / " + str(tracker.status)
-                + " / " + str(tracker.timestamp)
+                + " / "
+                + str(tracker.pos)
+                + " / "
+                + str(tracker.speed)
+                + " / "
+                + str(tracker.ori)
+                + " / "
+                + str(tracker.accel)
+                + " / "
+                + str(tracker.trgtpos)
+                + " / "
+                + str(tracker.status)
+                + " / "
+                + str(tracker.timestamp)
             )
 
 

examples/simple_send_and_receive/send_psn.py

@@ -1,8 +1,9 @@
 #! /bin/env python3
 """
-    Usage: python send_psn.py 192.168.1.4 <--- change IP address
+Usage: python send_psn.py 192.168.1.4 <--- change IP address
 
 """
+
 import sys
 import pypsn
 
@@ -15,15 +16,16 @@
         frame_id=56,
         packet_count=1,
     ),
-    name='system_name_001',
+    name="system_name_001",
     trackers=(
         [
             pypsn.PsnTrackerInfo(
                 tracker_id=i,
                 tracker_name="tracker_" + str(i),
-            ) for i in range(0, 7)
+            )
+            for i in range(0, 7)
         ]
-    )
+    ),
 )
 
 psn_data = pypsn.PsnDataPacket(
@@ -60,9 +62,10 @@
                 ),
                 status=0,
                 timestamp=psn_info.info.timestamp,
-            ) for tracker in psn_info.trackers
+            )
+            for tracker in psn_info.trackers
         ]
-    )
+    ),
 )
 
 print("\n--- PSN infos to be sent ---")
@@ -89,29 +92,35 @@
         + str(tracker.tracker_id)
         + " tracker info: "
         + str(tracker.info)
-        + " / " + str(tracker.pos)
-        + " / " + str(tracker.speed)
-        + " / " + str(tracker.ori)
-        + " / " + str(tracker.accel)
-        + " / " + str(tracker.trgtpos)
-        + " / " + str(tracker.status)
-        + " / " + str(tracker.timestamp)
+        + " / "
+        + str(tracker.pos)
+        + " / "
+        + str(tracker.speed)
+        + " / "
+        + str(tracker.ori)
+        + " / "
+        + str(tracker.accel)
+        + " / "
+        + str(tracker.trgtpos)
+        + " / "
+        + str(tracker.status)
+        + " / "
+        + str(tracker.timestamp)
     )
 
 psn_info_packet_bytes = pypsn.prepare_psn_info_packet_bytes(psn_info)
 psn_data_packet_bytes = pypsn.prepare_psn_data_packet_bytes(psn_data)
 
 pypsn.send_psn_packet(
     psn_packet=psn_info_packet_bytes,
-    mcast_ip='236.10.10.10',
+    mcast_ip="236.10.10.10",
     ip_addr=sys.argv[1],
     mcast_port=56565,
 )
 
 pypsn.send_psn_packet(
     psn_packet=psn_data_packet_bytes,
-    mcast_ip='236.10.10.10',
+    mcast_ip="236.10.10.10",
     ip_addr=sys.argv[1],
     mcast_port=56565,
 )
-

examples/trigger/save_zones.py

@@ -1,8 +1,9 @@
 #! /bin/env python
 """
-    Complete x,y sACN trigger.
-    Callibration script.
+Complete x,y sACN trigger.
+Callibration script.
 """
+
 import pypsn
 
 X = 0
@@ -12,7 +13,7 @@
 
 def set_settings_from_file(old_settings):
     """
-        Update global settings from file.
+    Update global settings from file.
 
     """
     try:
@@ -23,19 +24,13 @@ def set_settings_from_file(old_settings):
                 if len(uni_line) < 1 or uni_line[1] == "#":
                     continue
                 if "universe" in uni_line:
-                    new_settings["universe"] = int(
-                        uni_line.split(":")[1].strip()
-                    )
+                    new_settings["universe"] = int(uni_line.split(":")[1].strip())
                 elif "ip_addr" in uni_line:
                     new_settings["ip_addr"] = uni_line.split(":")[1].strip()
                 elif "min_distance" in uni_line:
-                    new_settings["min_distance"] = float(
-                        uni_line.split(":")[1].strip()
-                    )
+                    new_settings["min_distance"] = float(uni_line.split(":")[1].strip())
                 elif "radius" in uni_line:
-                    new_settings["radius"] = float(
-                        uni_line.split(":")[1].strip()
-                    )
+                    new_settings["radius"] = float(uni_line.split(":")[1].strip())
         print("got these settings", new_settings)
         return new_settings
     except Exception as e:
@@ -88,8 +83,7 @@ def set_zones_from_file(old_zones):
         return new_zones
     except Exception as e:
         print(
-            "Zones not imported from zones.txt, "
-            + "using default ones. Error was:", e
+            "Zones not imported from zones.txt, " + "using default ones. Error was:", e
         )
         return old_zones
 
@@ -123,9 +117,7 @@ def set_zones_to_file(zones):
     glob_receiver = start_psn(glob_settings.get("ip_addr"))
 
     while True:
-        val = input(
-            "Press enter to store current position as a zone, press q to Quit"
-        )
+        val = input("Press enter to store current position as a zone, press q to Quit")
         if val.lower() == "q":
             glob_receiver.stop()
             break

examples/trigger/trigger_on_zones.py

@@ -1,7 +1,7 @@
 #! /bin/env python
 """
-    Complete x,y sACN trigger.
-    Trigger script.
+Complete x,y sACN trigger.
+Trigger script.
 """
 
 import math
@@ -19,7 +19,7 @@
 
 def start_dmx():
     """
-        Start DMX sender thread.
+    Start DMX sender thread.
     """
     universe = settings["universe"]
     sender.start()  # start the sending thread
@@ -29,14 +29,14 @@ def start_dmx():
 
 def stop_dmx():
     """
-        Stop DMX sender thread.
+    Stop DMX sender thread.
     """
     sender.stop()  # do not forget to stop the sender
 
 
 def set_settings_from_file(settings):
     """
-        Update global settings from file.
+    Update global settings from file.
 
     """
     try:
@@ -50,9 +50,7 @@ def set_settings_from_file(settings):
                 elif "ip_addr" in uni_line:
                     settings["ip_addr"] = uni_line.split(":")[1].strip()
                 elif "min_distance" in uni_line:
-                    settings["min_distance"] = float(
-                        uni_line.split(":")[1].strip()
-                    )
+                    settings["min_distance"] = float(uni_line.split(":")[1].strip())
                 elif "radius" in uni_line:
                     settings["radius"] = float(uni_line.split(":")[1].strip())
         print("got these settings", settings)