[pre-commit.ci] pre-commit autoupdate

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
       - id: check-yaml
       - id: debug-statements
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 25.12.0
+    rev: 26.1.0
     hooks:
       - id: black
   - repo: https://github.com/asottile/pyupgrade

doc/examples/ex_qubitekkcc_simple.py

@@ -6,7 +6,6 @@
 import instruments as ik
 import instruments.units as u
 
-
 if __name__ == "__main__":
     # open connection to coincidence counter. If you are using Windows, this will be a com port. On linux, it will show
     # up in /dev/ttyusb

doc/examples/qubitekk/ex_qubitekk_mc1.py

@@ -5,7 +5,6 @@
 from instruments.qubitekk import MC1
 import instruments.units as u
 
-
 if __name__ == "__main__":
     mc1 = MC1.open_serial(vid=1027, pid=24577, baud=9600, timeout=1)
     mc1.step_size = 25 * u.ms

src/instruments/abstract_instruments/__init__.py

@@ -3,7 +3,6 @@
 Module containing instrument abstract base classes and communication layers
 """
 
-
 from .instrument import Instrument
 from .electrometer import Electrometer
 from .function_generator import FunctionGenerator

src/instruments/abstract_instruments/comm/__init__.py

@@ -3,7 +3,6 @@
 Module containing communication layers
 """
 
-
 from .abstract_comm import AbstractCommunicator
 
 from .file_communicator import FileCommunicator

src/instruments/abstract_instruments/comm/serial_manager.py

@@ -15,7 +15,6 @@
 
 from instruments.abstract_instruments.comm import SerialCommunicator
 
-
 # GLOBALS #####################################################################
 
 # We want to only *weakly* hold references to serial ports, to allow for them

src/instruments/abstract_instruments/signal_generator/__init__.py

@@ -3,7 +3,6 @@
 Module containing signal generator abstract base classes
 """
 
-
 from .signal_generator import SignalGenerator
 from .single_channel_sg import SingleChannelSG
 from .channel import SGChannel

src/instruments/agilent/__init__.py

@@ -3,6 +3,5 @@
 Module containing Agilent instruments
 """
 
-
 from instruments.agilent.agilent33220a import Agilent33220a
 from instruments.agilent.agilent34410a import Agilent34410a

src/instruments/agilent/agilent33220a.py

@@ -17,7 +17,6 @@
     assume_units,
 )
 
-
 # CLASSES #####################################################################
 
 

src/instruments/aimtti/__init__.py

@@ -3,5 +3,4 @@
 Module containing Aim-TTi power supplies
 """
 
-
 from .aimttiel302p import AimTTiEL302P

src/instruments/fluke/__init__.py

@@ -3,5 +3,4 @@
 Module containing Fluke instruments
 """
 
-
 from .fluke3000 import Fluke3000

src/instruments/generic_scpi/__init__.py

@@ -3,7 +3,6 @@
 Module containing generic SCPI instruments
 """
 
-
 from .scpi_instrument import SCPIInstrument
 from .scpi_multimeter import SCPIMultimeter
 from .scpi_function_generator import SCPIFunctionGenerator

src/instruments/glassman/__init__.py

@@ -3,5 +3,4 @@
 Module containing Glassman power supplies
 """
 
-
 from .glassmanfr import GlassmanFR

src/instruments/glassman/glassmanfr.py

@@ -29,6 +29,7 @@
 An unrestricted license has been provided to the maintainers of the Instrument
 Kit project.
 """
+
 # IMPORTS #####################################################################
 
 from struct import unpack
@@ -385,7 +386,7 @@ def _parse_response(self, response):
 
         :rtype: `dict`
         """
-        (voltage, current, monitors) = unpack("@3s3s3x1c2x", bytes(response, "utf-8"))
+        voltage, current, monitors = unpack("@3s3s3x1c2x", bytes(response, "utf-8"))
 
         try:
             voltage = self._parse_voltage(voltage)

src/instruments/hcp/__init__.py

@@ -3,6 +3,5 @@
 Module containing HC Photonics instruments
 """
 
-
 from .tc038 import TC038
 from .tc038d import TC038D

src/instruments/hcp/tc038.py

@@ -3,7 +3,6 @@
 Provides support for the TC038 AC crystal oven by HC Photonics.
 """
 
-
 # IMPORTS #####################################################################
 
 

src/instruments/hcp/tc038d.py

@@ -3,7 +3,6 @@
 Provides support for the TC038 AC crystal oven by HC Photonics.
 """
 
-
 # IMPORTS #####################################################################
 
 
@@ -12,7 +11,6 @@
 from instruments.abstract_instruments.instrument import Instrument
 from instruments.util_fns import assume_units
 
-
 # CLASSES #####################################################################
 
 

src/instruments/holzworth/__init__.py

@@ -3,5 +3,4 @@
 Module containing Holzworth instruments
 """
 
-
 from .holzworth_hs9000 import HS9000

src/instruments/hp/__init__.py

@@ -3,7 +3,6 @@
 Module containing HP instruments
 """
 
-
 from .hp3325a import HP3325a
 from .hp3456a import HP3456a
 from .hp6624a import HP6624a

src/instruments/hp/hp3325a.py

@@ -38,7 +38,6 @@
 from instruments.units import ureg as u
 from instruments.util_fns import enum_property, unitful_property, bool_property
 
-
 # CLASSES #####################################################################
 
 

src/instruments/hp/hp6652a.py

@@ -13,7 +13,6 @@
 from instruments.abstract_instruments import PowerSupply
 from instruments.util_fns import unitful_property, bool_property
 
-
 # CLASSES #####################################################################
 
 

src/instruments/keithley/__init__.py

@@ -3,7 +3,6 @@
 Module containing Keithley instruments
 """
 
-
 from .keithley195 import Keithley195
 from .keithley485 import Keithley485
 from .keithley580 import Keithley580

src/instruments/keithley/keithley485.py

@@ -427,7 +427,7 @@ def _parse_measurement(self, measurement):
 
         :rtype: `~pint.Quantity`
         """
-        (status, function, base, current) = unpack(
+        status, function, base, current = unpack(
             "@1c2s1c10s", bytes(measurement, "utf-8")
         )
 

src/instruments/keithley/keithley580.py

@@ -457,7 +457,7 @@ def parse_measurement(measurement):
 
         :rtype: `dict`
         """
-        (status, polarity, drycircuit, drive, resistance) = struct.unpack(
+        status, polarity, drycircuit, drive, resistance = struct.unpack(
             "@4c11s", measurement
         )
 

src/instruments/lakeshore/__init__.py

@@ -3,7 +3,6 @@
 Module containing Lakeshore instruments
 """
 
-
 from instruments.lakeshore.lakeshore336 import Lakeshore336
 from instruments.lakeshore.lakeshore340 import Lakeshore340
 from instruments.lakeshore.lakeshore370 import Lakeshore370

src/instruments/minghe/__init__.py

@@ -2,4 +2,5 @@
 """
 Module containing MingHe instruments
 """
+
 from .mhs5200a import MHS5200

src/instruments/newport/newportesp301.py

@@ -19,7 +19,6 @@
 from instruments.units import ureg as u
 from instruments.util_fns import assume_units, ProxyList
 
-
 # CLASSES #####################################################################
 
 

src/instruments/ondax/__init__.py

@@ -2,4 +2,5 @@
 """
 Module containing Ondax Instruments
 """
+
 from .lm import LM

src/instruments/oxford/__init__.py

@@ -3,5 +3,4 @@
 Module containing Oxford instruments
 """
 
-
 from .oxforditc503 import OxfordITC503

src/instruments/pfeiffer/__init__.py

@@ -3,5 +3,4 @@
 Module containing Pfeiffer instruments
 """
 
-
 from .tpg36x import TPG36x

src/instruments/phasematrix/__init__.py

@@ -3,5 +3,4 @@
 Module containing Phase Matrix instruments
 """
 
-
 from .phasematrix_fsw0020 import PhaseMatrixFSW0020

src/instruments/picowatt/__init__.py

@@ -3,5 +3,4 @@
 Module containing Picowatt instruments
 """
 
-
 from .picowattavs47 import PicowattAVS47

src/instruments/qubitekk/__init__.py

@@ -3,6 +3,5 @@
 Module containing Qubitekk instruments
 """
 
-
 from .cc1 import CC1
 from .mc1 import MC1

src/instruments/rigol/__init__.py

@@ -3,5 +3,4 @@
 Module containing Rigol instruments
 """
 
-
 from .rigolds1000 import RigolDS1000Series

src/instruments/srs/__init__.py

@@ -3,7 +3,6 @@
 Module containing Lakeshore instruments
 """
 
-
 from .srs345 import SRS345
 from .srs830 import SRS830
 from .srsdg645 import SRSDG645

src/instruments/sunpower/__init__.py

@@ -3,5 +3,4 @@
 Module containing Sunpower instruments
 """
 
-
 from .cryotel_gt import CryoTelGT

src/instruments/tektronix/__init__.py

@@ -3,7 +3,6 @@
 Module containing Tektronix instruments
 """
 
-
 from .tekdpo4104 import TekDPO4104
 from .tekdpo70000 import TekDPO70000
 from .tekawg2000 import TekAWG2000

src/instruments/tektronix/tektds224.py

@@ -15,7 +15,6 @@
 from instruments.util_fns import ProxyList
 from instruments.units import ureg as u
 
-
 # CLASSES #####################################################################
 
 

src/instruments/teledyne/__init__.py

@@ -3,5 +3,4 @@
 Module containing Teledyne instruments
 """
 
-
 from .maui import MAUI

src/instruments/thorlabs/__init__.py

@@ -3,7 +3,6 @@
 Module containing Thorlabs instruments
 """
 
-
 from .thorlabsapt import (
     ThorLabsAPT,
     APTPiezoInertiaActuator,

src/instruments/toptica/__init__.py

@@ -3,5 +3,4 @@
 Module containing Toptica instruments
 """
 
-
 from .topmode import TopMode

src/instruments/yokogawa/__init__.py

@@ -3,6 +3,5 @@
 Module containing Yokogawa instruments
 """
 
-
 from .yokogawa6370 import Yokogawa6370
 from .yokogawa7651 import Yokogawa7651

src/instruments/yokogawa/yokogawa6370.py

@@ -21,7 +21,6 @@
     string_property,
 )
 
-
 # CLASSES #####################################################################
 
 

tests/__init__.py

@@ -85,17 +85,13 @@ def expected_protocol(ins_class, host_to_ins, ins_to_host, sep="\n", repeat=1):
 
     yield ins_class.open_test(stdin, stdout)
 
-    assert (
-        stdout.getvalue() == host_to_ins
-    ), """Expected:
+    assert stdout.getvalue() == host_to_ins, """Expected:
 
 {}
 
 Got:
 
-{}""".format(
-        repr(host_to_ins), repr(stdout.getvalue())
-    )
+{}""".format(repr(host_to_ins), repr(stdout.getvalue()))
 
     # current = stdin.tell()
     # stdin.seek(0, 2)

tests/test_abstract_inst/test_electrometer.py

@@ -11,7 +11,6 @@
 import instruments as ik
 from tests import expected_protocol
 
-
 # TESTS ######################################################################
 
 

tests/test_abstract_inst/test_function_generator.py

@@ -12,7 +12,6 @@
 import instruments as ik
 from tests import expected_protocol, unit_eq
 
-
 # TESTS ######################################################################
 
 # pylint: disable=missing-function-docstring,redefined-outer-name,protected-access

tests/test_abstract_inst/test_multimeter.py

@@ -11,7 +11,6 @@
 import instruments as ik
 from tests import expected_protocol
 
-
 # TESTS ######################################################################
 
 

tests/test_abstract_inst/test_optical_spectrum_analyzer.py

@@ -11,7 +11,6 @@
 import instruments as ik
 from tests import expected_protocol
 
-
 # TESTS ######################################################################
 
 

tests/test_abstract_inst/test_oscilloscope.py

@@ -11,7 +11,6 @@
 import instruments as ik
 from tests import expected_protocol
 
-
 # TESTS ######################################################################
 
 

tests/test_abstract_inst/test_power_supply.py

@@ -11,7 +11,6 @@
 import instruments as ik
 from tests import expected_protocol
 
-
 # TESTS ######################################################################