Upgrade formatters

.git-blame-ignore-revs

@@ -1 +1,2 @@
-1025e183b346ddbff343e608cb1b688098bb7c40
+1025e183b346ddbff343e608cb1b688098bb7c40
+dee1f81b51e64591cff3b0cffea4f56975b9c91d

.github/workflows/test.yml

@@ -32,9 +32,9 @@ jobs:
     - name: Run tests with tox
       run: |
         tox -e py
-    - name: Check formatting
+    - name: Check formatting with pre-commit
       run: |
-        tox -e black
+        tox -e pre-commit
     - name: Run mypy with tox
       run: |
         tox -e mypy

.pre-commit-config.yaml

@@ -4,6 +4,6 @@ repos:
     hooks:
       - id: check-yaml
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 26.5.1
     hooks:
       - id: black

examples/function_generator.py

@@ -1,6 +1,7 @@
 """
 Examples on how to use the function generator driver
 """
+
 import time
 
 from fixate.core.common import TestClass, TestList

examples/jig_driver.py

@@ -2,6 +2,7 @@
 This file is just a test playground that shows how the update jig classes will
 fit together.
 """
+
 from __future__ import annotations
 from dataclasses import dataclass, field
 from fixate import (

examples/programmable_power_supply.py

@@ -1,6 +1,7 @@
 """
 Examples on how to use the programmable power supply driver works
 """
+
 import time
 
 from fixate.core.common import TestClass, TestList

examples/test_script.py

@@ -1,6 +1,7 @@
 """
 This is a test script that shows basic use case for the fixate library
 """
+
 from fixate.core.common import TestClass, TestList
 from fixate.core.checks import *
 from fixate.core.ui import *

src/fixate/config/__init__.py

@@ -4,6 +4,7 @@
 Drivers are hard coded into the config to prevent issues arising from auto discovery
 Must ensure driver imports are infallible to prevent program crash on start
 """
+
 from fixate.config.helper import (
     load_dict_config,
     load_yaml_config,

src/fixate/core/checks.py

@@ -2,6 +2,7 @@
 This module is used to allow for tests to test values against criteria.
 It should implement necessary logging functions and report success or failure.
 """
+
 from dataclasses import dataclass, field
 from typing import Any, Callable, Iterable, Optional
 import logging

src/fixate/core/ui.py

@@ -1,6 +1,7 @@
 """
 This module details user input api
 """
+
 import time
 from queue import Queue, Empty
 from pubsub import pub

src/fixate/drivers/_ftdi.py

@@ -1,4 +1,4 @@
-""" Private wrapper for ftdi driver. DLL on Windows, .so shared library on *nix.
+"""Private wrapper for ftdi driver. DLL on Windows, .so shared library on *nix.
 This is wrapped privately so it can be ommitted from the documentation build.
 """
 

src/fixate/drivers/daq/daqmx.py

@@ -15,14 +15,14 @@
 C:\Program Files\National Instruments\NI-DAQ\DAQmx ANSI C Dev\include\NIDAQmx.h
 
 """
+
 from collections import namedtuple
 from fixate.core.common import ExcThread
 from queue import Queue, Empty
 
 from ctypes import byref, c_char_p
 import numpy
 
-
 # Basic Functions
 from PyDAQmx import (
     DAQmxResetDevice,

src/fixate/drivers/dcload/__init__.py

@@ -1,6 +1,6 @@
 """
 DC ELectronic Load driver
-========================= 
+=========================
 
 Use `DCLoad.open()` to connect to a DC electronic load.
 Functions are dictated by the abstract superclass ``DCLoad`` in helper.py

src/fixate/drivers/dcload/helper.py

@@ -21,8 +21,7 @@ class DCLoad(DriverProtocol, Protocol):
 
     REGEX_ID: str
 
-    def __init__(self, instrument) -> None:
-        ...
+    def __init__(self, instrument) -> None: ...
 
     def reset(self) -> None:
         """Reset the instrument to a known state."""

src/fixate/drivers/dmm/__init__.py

@@ -10,6 +10,7 @@
     dmm.measure(*mode, **mode_params)
     dmm.reset()
 """
+
 import pyvisa
 
 import fixate.drivers

src/fixate/drivers/dso/agilent_mso_x.py

@@ -3,7 +3,6 @@
 from fixate.drivers.dso.helper import DSO
 import time
 
-
 # Example IDN Strings
 # KEYSIGHT TECHNOLOGIES,DSOX1202G,CN60074190,02.10.2019111333
 # KEYSIGHT TECHNOLOGIES,DSO-X 1102G,CN57096441,01.20.2019061038

src/fixate/drivers/funcgen/__init__.py

@@ -22,6 +22,7 @@
 output_ch3
 output_ch4
 """
+
 import pyvisa
 
 import fixate.drivers

src/fixate/drivers/handlers.py

@@ -2,6 +2,7 @@
 This module implements concrete AddressHandler type, that
 can be used to implement IO for the fixate.core.switching module.
 """
+
 from __future__ import annotations
 
 from typing import Sequence, Optional

src/fixate/drivers/lcr/__init__.py

@@ -5,6 +5,7 @@
 Functions are dictated by the metaclass in helper.py
 
 """
+
 import pyvisa
 
 import fixate.drivers

src/fixate/drivers/pps/bk_178x.py

@@ -146,9 +146,9 @@ def _packet_encode(self, command, *data_tuples):
         packet[2] = command
         packet_index = 3
         for data, num_bytes in data_tuples:
-            packet[
-                packet_index : packet_index + num_bytes
-            ] = self._little_endian_encode(data)[0:num_bytes]
+            packet[packet_index : packet_index + num_bytes] = (
+                self._little_endian_encode(data)[0:num_bytes]
+            )
             packet_index += num_bytes
             if packet_index >= self.PACKET_LENGTH:
                 raise ValueError("Too many bytes to pack into packet")

src/fixate/main.py

@@ -15,7 +15,6 @@
 from fixate.ui_cmdline import register_cmd_line, unregister_cmd_line
 import fixate.sequencer
 
-
 logger = logging.getLogger(__name__)
 
 

src/fixate/reporting/csv.py

@@ -84,6 +84,7 @@
 Test End
 <Time Elapsed (s)>,Test <index>,end,<PASS FAIL ERROR>,checks-passed=<passed>,checks-failed<failed>,checks-error=<errors>
 """
+
 import csv
 import datetime
 import sys

src/fixate/ui_cmdline/kbhit.py

@@ -7,8 +7,8 @@
 with IDLE.
 
 This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as 
-published by the Free Software Foundation, either version 3 of the 
+it under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation, either version 3 of the
 License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,

test/core/test_config_util.py

@@ -2,7 +2,6 @@
 from fixate.core import config_util
 from fixate import config
 
-
 # Ideally these tests would be done with the cmd2 test plugin (https://pypi.org/project/cmd2-ext-test/)
 # by the people who made CMD2, however it have proved to be more work than it is worth.
 # So the tests will focus on the internal methods of the FxConfigCmd class.

test/drivers/test_ftdi.py

@@ -5,7 +5,6 @@
 from fixate.core.exceptions import *
 from fixate.config import load_config
 
-
 load_config()  # Load fixate config file
 
 

test/drivers/test_keysight_DSOX1102G.py

@@ -515,9 +515,7 @@ def test_measure_vrms_dc_cycle(dso, funcgen, rm):
     dso.stop()
     funcgen.channel1(False)
 
-    assert measured_vrms_cycle == pytest.approx(
-        (vrms**2 + offset**2) ** 0.5, abs=0.05
-    )
+    assert measured_vrms_cycle == pytest.approx((vrms**2 + offset**2) ** 0.5, abs=0.05)
 
 
 @pytest.mark.drivertest

test/drivers/test_rigol_dl3021.py

@@ -45,10 +45,12 @@ def test_enable_load(dcload: RigolDL3021):
 )
 def test_set_mode(
     dcload: RigolDL3021,
-    mode: Literal["constant_current"]
-    | Literal["constant_voltage"]
-    | Literal["constant_resistance"]
-    | Literal["constant_power"],
+    mode: (
+        Literal["constant_current"]
+        | Literal["constant_voltage"]
+        | Literal["constant_resistance"]
+        | Literal["constant_power"]
+    ),
     expected: Literal["CC"] | Literal["CV"] | Literal["CR"] | Literal["CP"],
 ):
     """Verify that set_mode correctly sets the instrument mode."""

test/manual/test_serial_numbers.py

@@ -3,6 +3,7 @@
 Make sure local_config.json has been configured to include the required instruments
 
 """
+
 from pubsub import pub
 from fixate.drivers import dmm, lcr, dso, funcgen, pps
 import time

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py312,py313,black,mypy
+envlist = py312,py313,pre-commit,mypy
 isolated_build = True
 
 [testenv]
@@ -13,12 +13,6 @@ deps = build
 commands =
     python -m build .
 
-[testenv:black]
-basepython = python3
-skip_install = true
-deps = black==22.3.0
-commands = black --check src test scripts {posargs}
-
 [pytest]
 # https://docs.pytest.org/en/stable/deprecations.html#junit-family-default-value-change-to-xunit2
 junit_family=xunit2
@@ -28,6 +22,11 @@ addopts = --ignore=test/manual
 markers = 
 	drivertest : Fixate driver test
 
+[testenv:pre-commit]
+basepython = python3
+deps = pre-commit==4.6.0
+commands = pre-commit run --all-files
+
 [testenv:mypy]
 basepython = python3
 deps = mypy==1.10.0