Move tests to root, instruments to under src (#344)

* Move tests to root, instruments to under src * Update coverage files * Update .gitignore
instrumentkit · Mar 30, 2022 · 3e12bda · 3e12bda
1 parent 722781a
commit 3e12bda
Show file tree

Hide file tree

Showing 231 changed files with 83 additions and 74 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -1,3 +1,8 @@
+[paths]
+source =
+    src
+    */site-packages
+
 [report]
 omit =
     */python?.?/*
@@ -11,4 +16,8 @@ exclude_lines =
     raise AssertionError
 
 [run]
+branch = false
+parallel = true
+source =
+    instruments
 relative_files = True
diff --git a/.gitignore b/.gitignore
@@ -68,4 +68,4 @@ coverage.xml
 .hypothesis/
 
 # version file generated by setuptools_scm
-instruments/_version.py
+src/instruments/_version.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -3,4 +3,4 @@ requires = ["setuptools>=45", "wheel", "setuptools_scm>=6.2"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools_scm]
-write_to = "instruments/_version.py"
+write_to = "src/instruments/_version.py"
diff --git a/setup.cfg b/setup.cfg
@@ -27,6 +27,8 @@ classifiers =
 
 [options]
 include_package_data = True
+package_dir =
+    = src
 packages = find:
 install_requires =
     pint>=0.16.1
@@ -51,8 +53,7 @@ dev =
     six
 
 [options.packages.find]
-exclude =
-    instruments.tests
+where = src
 
 [bdist_wheel]
 universal = 1
diff --git a/instruments/__init__.py → src/instruments/__init__.py b/instruments/__init__.py → src/instruments/__init__.py
diff --git a/instruments/abstract_instruments/__init__.py → ...truments/abstract_instruments/__init__.py b/instruments/abstract_instruments/__init__.py → ...truments/abstract_instruments/__init__.py
diff --git a/...nts/abstract_instruments/comm/__init__.py → ...nts/abstract_instruments/comm/__init__.py b/...nts/abstract_instruments/comm/__init__.py → ...nts/abstract_instruments/comm/__init__.py
diff --git a/...bstract_instruments/comm/abstract_comm.py → ...bstract_instruments/comm/abstract_comm.py b/...bstract_instruments/comm/abstract_comm.py → ...bstract_instruments/comm/abstract_comm.py
diff --git a/...act_instruments/comm/file_communicator.py → ...act_instruments/comm/file_communicator.py b/...act_instruments/comm/file_communicator.py → ...act_instruments/comm/file_communicator.py
diff --git a/...act_instruments/comm/gpib_communicator.py → ...act_instruments/comm/gpib_communicator.py b/...act_instruments/comm/gpib_communicator.py → ...act_instruments/comm/gpib_communicator.py
diff --git a/...instruments/comm/loopback_communicator.py → ...instruments/comm/loopback_communicator.py b/...instruments/comm/loopback_communicator.py → ...instruments/comm/loopback_communicator.py
diff --git a/...t_instruments/comm/serial_communicator.py → ...t_instruments/comm/serial_communicator.py b/...t_instruments/comm/serial_communicator.py → ...t_instruments/comm/serial_communicator.py
diff --git a/...stract_instruments/comm/serial_manager.py → ...stract_instruments/comm/serial_manager.py b/...stract_instruments/comm/serial_manager.py → ...stract_instruments/comm/serial_manager.py
diff --git a/...t_instruments/comm/socket_communicator.py → ...t_instruments/comm/socket_communicator.py b/...t_instruments/comm/socket_communicator.py → ...t_instruments/comm/socket_communicator.py
diff --git a/...ract_instruments/comm/usb_communicator.py → ...ract_instruments/comm/usb_communicator.py b/...ract_instruments/comm/usb_communicator.py → ...ract_instruments/comm/usb_communicator.py
diff --git a/...t_instruments/comm/usbtmc_communicator.py → ...t_instruments/comm/usbtmc_communicator.py b/...t_instruments/comm/usbtmc_communicator.py → ...t_instruments/comm/usbtmc_communicator.py
diff --git a/...act_instruments/comm/visa_communicator.py → ...act_instruments/comm/visa_communicator.py b/...act_instruments/comm/visa_communicator.py → ...act_instruments/comm/visa_communicator.py
diff --git a/...ct_instruments/comm/vxi11_communicator.py → ...ct_instruments/comm/vxi11_communicator.py b/...ct_instruments/comm/vxi11_communicator.py → ...ct_instruments/comm/vxi11_communicator.py
diff --git a/...ents/abstract_instruments/electrometer.py → ...ents/abstract_instruments/electrometer.py b/...ents/abstract_instruments/electrometer.py → ...ents/abstract_instruments/electrometer.py
diff --git a/...bstract_instruments/function_generator.py → ...bstract_instruments/function_generator.py b/...bstract_instruments/function_generator.py → ...bstract_instruments/function_generator.py
diff --git a/...uments/abstract_instruments/instrument.py → ...uments/abstract_instruments/instrument.py b/...uments/abstract_instruments/instrument.py → ...uments/abstract_instruments/instrument.py
diff --git a/...uments/abstract_instruments/multimeter.py → ...uments/abstract_instruments/multimeter.py b/...uments/abstract_instruments/multimeter.py → ...uments/abstract_instruments/multimeter.py
diff --git a/..._instruments/optical_spectrum_analyzer.py → ..._instruments/optical_spectrum_analyzer.py b/..._instruments/optical_spectrum_analyzer.py → ..._instruments/optical_spectrum_analyzer.py
diff --git a/...ents/abstract_instruments/oscilloscope.py → ...ents/abstract_instruments/oscilloscope.py b/...ents/abstract_instruments/oscilloscope.py → ...ents/abstract_instruments/oscilloscope.py
diff --git a/...ents/abstract_instruments/power_supply.py → ...ents/abstract_instruments/power_supply.py b/...ents/abstract_instruments/power_supply.py → ...ents/abstract_instruments/power_supply.py
diff --git a/..._instruments/signal_generator/__init__.py → ..._instruments/signal_generator/__init__.py b/..._instruments/signal_generator/__init__.py → ..._instruments/signal_generator/__init__.py
diff --git a/...t_instruments/signal_generator/channel.py → ...t_instruments/signal_generator/channel.py b/...t_instruments/signal_generator/channel.py → ...t_instruments/signal_generator/channel.py
diff --git a/...ents/signal_generator/signal_generator.py → ...ents/signal_generator/signal_generator.py b/...ents/signal_generator/signal_generator.py → ...ents/signal_generator/signal_generator.py
diff --git a/...nts/signal_generator/single_channel_sg.py → ...nts/signal_generator/single_channel_sg.py b/...nts/signal_generator/single_channel_sg.py → ...nts/signal_generator/single_channel_sg.py
diff --git a/instruments/agilent/__init__.py → src/instruments/agilent/__init__.py b/instruments/agilent/__init__.py → src/instruments/agilent/__init__.py
diff --git a/instruments/agilent/agilent33220a.py → src/instruments/agilent/agilent33220a.py b/instruments/agilent/agilent33220a.py → src/instruments/agilent/agilent33220a.py
diff --git a/instruments/agilent/agilent34410a.py → src/instruments/agilent/agilent34410a.py b/instruments/agilent/agilent34410a.py → src/instruments/agilent/agilent34410a.py
diff --git a/instruments/config.py → src/instruments/config.py b/instruments/config.py → src/instruments/config.py
diff --git a/instruments/errors.py → src/instruments/errors.py b/instruments/errors.py → src/instruments/errors.py
diff --git a/instruments/fluke/__init__.py → src/instruments/fluke/__init__.py b/instruments/fluke/__init__.py → src/instruments/fluke/__init__.py
diff --git a/instruments/fluke/fluke3000.py → src/instruments/fluke/fluke3000.py b/instruments/fluke/fluke3000.py → src/instruments/fluke/fluke3000.py
diff --git a/instruments/generic_scpi/__init__.py → src/instruments/generic_scpi/__init__.py b/instruments/generic_scpi/__init__.py → src/instruments/generic_scpi/__init__.py
diff --git a/...s/generic_scpi/scpi_function_generator.py → ...s/generic_scpi/scpi_function_generator.py b/...s/generic_scpi/scpi_function_generator.py → ...s/generic_scpi/scpi_function_generator.py
diff --git a/instruments/generic_scpi/scpi_instrument.py → ...struments/generic_scpi/scpi_instrument.py b/instruments/generic_scpi/scpi_instrument.py → ...struments/generic_scpi/scpi_instrument.py
diff --git a/instruments/generic_scpi/scpi_multimeter.py → ...struments/generic_scpi/scpi_multimeter.py b/instruments/generic_scpi/scpi_multimeter.py → ...struments/generic_scpi/scpi_multimeter.py
diff --git a/instruments/gentec_eo/__init__.py → src/instruments/gentec_eo/__init__.py b/instruments/gentec_eo/__init__.py → src/instruments/gentec_eo/__init__.py
diff --git a/instruments/gentec_eo/blu.py → src/instruments/gentec_eo/blu.py b/instruments/gentec_eo/blu.py → src/instruments/gentec_eo/blu.py
diff --git a/instruments/glassman/__init__.py → src/instruments/glassman/__init__.py b/instruments/glassman/__init__.py → src/instruments/glassman/__init__.py
diff --git a/instruments/glassman/glassmanfr.py → src/instruments/glassman/glassmanfr.py b/instruments/glassman/glassmanfr.py → src/instruments/glassman/glassmanfr.py
diff --git a/instruments/holzworth/__init__.py → src/instruments/holzworth/__init__.py b/instruments/holzworth/__init__.py → src/instruments/holzworth/__init__.py
diff --git a/instruments/holzworth/holzworth_hs9000.py → ...instruments/holzworth/holzworth_hs9000.py b/instruments/holzworth/holzworth_hs9000.py → ...instruments/holzworth/holzworth_hs9000.py
diff --git a/instruments/hp/__init__.py → src/instruments/hp/__init__.py b/instruments/hp/__init__.py → src/instruments/hp/__init__.py
diff --git a/instruments/hp/hp3456a.py → src/instruments/hp/hp3456a.py b/instruments/hp/hp3456a.py → src/instruments/hp/hp3456a.py
diff --git a/instruments/hp/hp6624a.py → src/instruments/hp/hp6624a.py b/instruments/hp/hp6624a.py → src/instruments/hp/hp6624a.py
diff --git a/instruments/hp/hp6632b.py → src/instruments/hp/hp6632b.py b/instruments/hp/hp6632b.py → src/instruments/hp/hp6632b.py
diff --git a/instruments/hp/hp6652a.py → src/instruments/hp/hp6652a.py b/instruments/hp/hp6652a.py → src/instruments/hp/hp6652a.py
diff --git a/instruments/hp/hpe3631a.py → src/instruments/hp/hpe3631a.py b/instruments/hp/hpe3631a.py → src/instruments/hp/hpe3631a.py
diff --git a/instruments/keithley/__init__.py → src/instruments/keithley/__init__.py b/instruments/keithley/__init__.py → src/instruments/keithley/__init__.py
diff --git a/instruments/keithley/keithley195.py → src/instruments/keithley/keithley195.py b/instruments/keithley/keithley195.py → src/instruments/keithley/keithley195.py
diff --git a/instruments/keithley/keithley2182.py → src/instruments/keithley/keithley2182.py b/instruments/keithley/keithley2182.py → src/instruments/keithley/keithley2182.py
diff --git a/instruments/keithley/keithley485.py → src/instruments/keithley/keithley485.py b/instruments/keithley/keithley485.py → src/instruments/keithley/keithley485.py
diff --git a/instruments/keithley/keithley580.py → src/instruments/keithley/keithley580.py b/instruments/keithley/keithley580.py → src/instruments/keithley/keithley580.py
diff --git a/instruments/keithley/keithley6220.py → src/instruments/keithley/keithley6220.py b/instruments/keithley/keithley6220.py → src/instruments/keithley/keithley6220.py
diff --git a/instruments/keithley/keithley6514.py → src/instruments/keithley/keithley6514.py b/instruments/keithley/keithley6514.py → src/instruments/keithley/keithley6514.py
diff --git a/instruments/lakeshore/__init__.py → src/instruments/lakeshore/__init__.py b/instruments/lakeshore/__init__.py → src/instruments/lakeshore/__init__.py
diff --git a/instruments/lakeshore/lakeshore340.py → src/instruments/lakeshore/lakeshore340.py b/instruments/lakeshore/lakeshore340.py → src/instruments/lakeshore/lakeshore340.py
diff --git a/instruments/lakeshore/lakeshore370.py → src/instruments/lakeshore/lakeshore370.py b/instruments/lakeshore/lakeshore370.py → src/instruments/lakeshore/lakeshore370.py
diff --git a/instruments/lakeshore/lakeshore475.py → src/instruments/lakeshore/lakeshore475.py b/instruments/lakeshore/lakeshore475.py → src/instruments/lakeshore/lakeshore475.py
diff --git a/instruments/minghe/__init__.py → src/instruments/minghe/__init__.py b/instruments/minghe/__init__.py → src/instruments/minghe/__init__.py
diff --git a/instruments/minghe/mhs5200a.py → src/instruments/minghe/mhs5200a.py b/instruments/minghe/mhs5200a.py → src/instruments/minghe/mhs5200a.py
diff --git a/instruments/named_struct.py → src/instruments/named_struct.py b/instruments/named_struct.py → src/instruments/named_struct.py
diff --git a/instruments/newport/__init__.py → src/instruments/newport/__init__.py b/instruments/newport/__init__.py → src/instruments/newport/__init__.py
diff --git a/instruments/newport/agilis.py → src/instruments/newport/agilis.py b/instruments/newport/agilis.py → src/instruments/newport/agilis.py
diff --git a/instruments/newport/errors.py → src/instruments/newport/errors.py b/instruments/newport/errors.py → src/instruments/newport/errors.py
diff --git a/instruments/newport/newport_pmc8742.py → src/instruments/newport/newport_pmc8742.py b/instruments/newport/newport_pmc8742.py → src/instruments/newport/newport_pmc8742.py
diff --git a/instruments/newport/newportesp301.py → src/instruments/newport/newportesp301.py b/instruments/newport/newportesp301.py → src/instruments/newport/newportesp301.py
diff --git a/instruments/ondax/__init__.py → src/instruments/ondax/__init__.py b/instruments/ondax/__init__.py → src/instruments/ondax/__init__.py
diff --git a/instruments/ondax/lm.py → src/instruments/ondax/lm.py b/instruments/ondax/lm.py → src/instruments/ondax/lm.py
diff --git a/instruments/optional_dep_finder.py → src/instruments/optional_dep_finder.py b/instruments/optional_dep_finder.py → src/instruments/optional_dep_finder.py
diff --git a/instruments/oxford/__init__.py → src/instruments/oxford/__init__.py b/instruments/oxford/__init__.py → src/instruments/oxford/__init__.py
diff --git a/instruments/oxford/oxforditc503.py → src/instruments/oxford/oxforditc503.py b/instruments/oxford/oxforditc503.py → src/instruments/oxford/oxforditc503.py
diff --git a/instruments/phasematrix/__init__.py → src/instruments/phasematrix/__init__.py b/instruments/phasematrix/__init__.py → src/instruments/phasematrix/__init__.py
diff --git a/...uments/phasematrix/phasematrix_fsw0020.py → ...uments/phasematrix/phasematrix_fsw0020.py b/...uments/phasematrix/phasematrix_fsw0020.py → ...uments/phasematrix/phasematrix_fsw0020.py
diff --git a/instruments/picowatt/__init__.py → src/instruments/picowatt/__init__.py b/instruments/picowatt/__init__.py → src/instruments/picowatt/__init__.py
diff --git a/instruments/picowatt/picowattavs47.py → src/instruments/picowatt/picowattavs47.py b/instruments/picowatt/picowattavs47.py → src/instruments/picowatt/picowattavs47.py
diff --git a/instruments/qubitekk/__init__.py → src/instruments/qubitekk/__init__.py b/instruments/qubitekk/__init__.py → src/instruments/qubitekk/__init__.py
diff --git a/instruments/qubitekk/cc1.py → src/instruments/qubitekk/cc1.py b/instruments/qubitekk/cc1.py → src/instruments/qubitekk/cc1.py
diff --git a/instruments/qubitekk/mc1.py → src/instruments/qubitekk/mc1.py b/instruments/qubitekk/mc1.py → src/instruments/qubitekk/mc1.py
diff --git a/instruments/rigol/__init__.py → src/instruments/rigol/__init__.py b/instruments/rigol/__init__.py → src/instruments/rigol/__init__.py
diff --git a/instruments/rigol/rigolds1000.py → src/instruments/rigol/rigolds1000.py b/instruments/rigol/rigolds1000.py → src/instruments/rigol/rigolds1000.py
diff --git a/instruments/srs/__init__.py → src/instruments/srs/__init__.py b/instruments/srs/__init__.py → src/instruments/srs/__init__.py
diff --git a/instruments/srs/srs345.py → src/instruments/srs/srs345.py b/instruments/srs/srs345.py → src/instruments/srs/srs345.py
diff --git a/instruments/srs/srs830.py → src/instruments/srs/srs830.py b/instruments/srs/srs830.py → src/instruments/srs/srs830.py
diff --git a/instruments/srs/srsctc100.py → src/instruments/srs/srsctc100.py b/instruments/srs/srsctc100.py → src/instruments/srs/srsctc100.py
diff --git a/instruments/srs/srsdg645.py → src/instruments/srs/srsdg645.py b/instruments/srs/srsdg645.py → src/instruments/srs/srsdg645.py
diff --git a/instruments/tektronix/__init__.py → src/instruments/tektronix/__init__.py b/instruments/tektronix/__init__.py → src/instruments/tektronix/__init__.py
diff --git a/instruments/tektronix/tekawg2000.py → src/instruments/tektronix/tekawg2000.py b/instruments/tektronix/tekawg2000.py → src/instruments/tektronix/tekawg2000.py
diff --git a/instruments/tektronix/tekdpo4104.py → src/instruments/tektronix/tekdpo4104.py b/instruments/tektronix/tekdpo4104.py → src/instruments/tektronix/tekdpo4104.py
diff --git a/instruments/tektronix/tekdpo70000.py → src/instruments/tektronix/tekdpo70000.py b/instruments/tektronix/tekdpo70000.py → src/instruments/tektronix/tekdpo70000.py
diff --git a/instruments/tektronix/tektds224.py → src/instruments/tektronix/tektds224.py b/instruments/tektronix/tektds224.py → src/instruments/tektronix/tektds224.py
diff --git a/instruments/tektronix/tektds5xx.py → src/instruments/tektronix/tektds5xx.py b/instruments/tektronix/tektds5xx.py → src/instruments/tektronix/tektds5xx.py
diff --git a/instruments/teledyne/__init__.py → src/instruments/teledyne/__init__.py b/instruments/teledyne/__init__.py → src/instruments/teledyne/__init__.py
diff --git a/instruments/teledyne/maui.py → src/instruments/teledyne/maui.py b/instruments/teledyne/maui.py → src/instruments/teledyne/maui.py
diff --git a/...abs/APT_Communications_Protocol_Rev_9.pdf → ...abs/APT_Communications_Protocol_Rev_9.pdf b/...abs/APT_Communications_Protocol_Rev_9.pdf → ...abs/APT_Communications_Protocol_Rev_9.pdf
diff --git a/instruments/thorlabs/__init__.py → src/instruments/thorlabs/__init__.py b/instruments/thorlabs/__init__.py → src/instruments/thorlabs/__init__.py
diff --git a/instruments/thorlabs/_abstract.py → src/instruments/thorlabs/_abstract.py b/instruments/thorlabs/_abstract.py → src/instruments/thorlabs/_abstract.py
diff --git a/instruments/thorlabs/_cmds.py → src/instruments/thorlabs/_cmds.py b/instruments/thorlabs/_cmds.py → src/instruments/thorlabs/_cmds.py
diff --git a/instruments/thorlabs/_packets.py → src/instruments/thorlabs/_packets.py b/instruments/thorlabs/_packets.py → src/instruments/thorlabs/_packets.py
diff --git a/instruments/thorlabs/lcc25.py → src/instruments/thorlabs/lcc25.py b/instruments/thorlabs/lcc25.py → src/instruments/thorlabs/lcc25.py
diff --git a/instruments/thorlabs/pm100usb.py → src/instruments/thorlabs/pm100usb.py b/instruments/thorlabs/pm100usb.py → src/instruments/thorlabs/pm100usb.py
diff --git a/instruments/thorlabs/sc10.py → src/instruments/thorlabs/sc10.py b/instruments/thorlabs/sc10.py → src/instruments/thorlabs/sc10.py
diff --git a/instruments/thorlabs/tc200.py → src/instruments/thorlabs/tc200.py b/instruments/thorlabs/tc200.py → src/instruments/thorlabs/tc200.py
diff --git a/instruments/thorlabs/thorlabs_utils.py → src/instruments/thorlabs/thorlabs_utils.py b/instruments/thorlabs/thorlabs_utils.py → src/instruments/thorlabs/thorlabs_utils.py
diff --git a/instruments/thorlabs/thorlabsapt.py → src/instruments/thorlabs/thorlabsapt.py b/instruments/thorlabs/thorlabsapt.py → src/instruments/thorlabs/thorlabsapt.py
diff --git a/instruments/toptica/__init__.py → src/instruments/toptica/__init__.py b/instruments/toptica/__init__.py → src/instruments/toptica/__init__.py
diff --git a/instruments/toptica/topmode.py → src/instruments/toptica/topmode.py b/instruments/toptica/topmode.py → src/instruments/toptica/topmode.py
diff --git a/instruments/toptica/toptica_utils.py → src/instruments/toptica/toptica_utils.py b/instruments/toptica/toptica_utils.py → src/instruments/toptica/toptica_utils.py
diff --git a/instruments/units.py → src/instruments/units.py b/instruments/units.py → src/instruments/units.py
diff --git a/instruments/util_fns.py → src/instruments/util_fns.py b/instruments/util_fns.py → src/instruments/util_fns.py
diff --git a/instruments/yokogawa/__init__.py → src/instruments/yokogawa/__init__.py b/instruments/yokogawa/__init__.py → src/instruments/yokogawa/__init__.py
diff --git a/instruments/yokogawa/yokogawa6370.py → src/instruments/yokogawa/yokogawa6370.py b/instruments/yokogawa/yokogawa6370.py → src/instruments/yokogawa/yokogawa6370.py
diff --git a/instruments/yokogawa/yokogawa7651.py → src/instruments/yokogawa/yokogawa7651.py b/instruments/yokogawa/yokogawa7651.py → src/instruments/yokogawa/yokogawa7651.py
diff --git a/instruments/tests/__init__.py → tests/__init__.py b/instruments/tests/__init__.py → tests/__init__.py
diff --git a/...s/test_abstract_inst/test_electrometer.py → ...s/test_abstract_inst/test_electrometer.py b/...s/test_abstract_inst/test_electrometer.py → ...s/test_abstract_inst/test_electrometer.py
@@ -9,7 +9,7 @@
 import pytest
 
 import instruments as ik
-from instruments.tests import expected_protocol
+from tests import expected_protocol
 
 
 # TESTS ######################################################################

diff --git a/..._abstract_inst/test_function_generator.py → ..._abstract_inst/test_function_generator.py b/..._abstract_inst/test_function_generator.py → ..._abstract_inst/test_function_generator.py
@@ -10,7 +10,7 @@
 from instruments.units import ureg as u
 
 import instruments as ik
-from instruments.tests import expected_protocol, unit_eq
+from tests import expected_protocol, unit_eq
 
 
 # TESTS ######################################################################

diff --git a/...sts/test_abstract_inst/test_multimeter.py → tests/test_abstract_inst/test_multimeter.py b/...sts/test_abstract_inst/test_multimeter.py → tests/test_abstract_inst/test_multimeter.py
@@ -9,7 +9,7 @@
 import pytest
 
 import instruments as ik
-from instruments.tests import expected_protocol
+from tests import expected_protocol
 
 
 # TESTS ######################################################################

diff --git a/...ct_inst/test_optical_spectrum_analyzer.py → ...ct_inst/test_optical_spectrum_analyzer.py b/...ct_inst/test_optical_spectrum_analyzer.py → ...ct_inst/test_optical_spectrum_analyzer.py
@@ -9,7 +9,7 @@
 import pytest
 
 import instruments as ik
-from instruments.tests import expected_protocol
+from tests import expected_protocol
 
 
 # TESTS ######################################################################

diff --git a/...s/test_abstract_inst/test_oscilloscope.py → ...s/test_abstract_inst/test_oscilloscope.py b/...s/test_abstract_inst/test_oscilloscope.py → ...s/test_abstract_inst/test_oscilloscope.py
@@ -9,7 +9,7 @@
 import pytest
 
 import instruments as ik
-from instruments.tests import expected_protocol
+from tests import expected_protocol
 
 
 # TESTS ######################################################################

diff --git a/...s/test_abstract_inst/test_power_supply.py → ...s/test_abstract_inst/test_power_supply.py b/...s/test_abstract_inst/test_power_supply.py → ...s/test_abstract_inst/test_power_supply.py
@@ -9,7 +9,7 @@
 import pytest
 
 import instruments as ik
-from instruments.tests import expected_protocol
+from tests import expected_protocol
 
 
 # TESTS ######################################################################

diff --git a/...nst/test_signal_generator/test_channel.py → ...nst/test_signal_generator/test_channel.py b/...nst/test_signal_generator/test_channel.py → ...nst/test_signal_generator/test_channel.py
diff --git a/...signal_generator/test_signal_generator.py → ...signal_generator/test_signal_generator.py b/...signal_generator/test_signal_generator.py → ...signal_generator/test_signal_generator.py
@@ -9,7 +9,7 @@
 import pytest
 
 import instruments as ik
-from instruments.tests import expected_protocol
+from tests import expected_protocol
 
 
 # TESTS ######################################################################

diff --git a/...ignal_generator/test_single_channel_sg.py → ...ignal_generator/test_single_channel_sg.py b/...ignal_generator/test_single_channel_sg.py → ...ignal_generator/test_single_channel_sg.py
@@ -9,7 +9,7 @@
 import pytest
 
 import instruments as ik
-from instruments.tests import expected_protocol
+from tests import expected_protocol
 
 
 # TESTS ######################################################################

diff --git a/instruments/tests/test_agilent/__init__.py → tests/test_agilent/__init__.py b/instruments/tests/test_agilent/__init__.py → tests/test_agilent/__init__.py
diff --git a/...tests/test_agilent/test_agilent_33220a.py → tests/test_agilent/test_agilent_33220a.py b/...tests/test_agilent/test_agilent_33220a.py → tests/test_agilent/test_agilent_33220a.py
@@ -11,7 +11,7 @@
 from instruments.units import ureg as u
 
 import instruments as ik
-from instruments.tests import expected_protocol, make_name_test
+from tests import expected_protocol, make_name_test
 
 # TESTS ######################################################################
 

diff --git a/...tests/test_agilent/test_agilent_34410a.py → tests/test_agilent/test_agilent_34410a.py b/...tests/test_agilent/test_agilent_34410a.py → tests/test_agilent/test_agilent_34410a.py
@@ -9,7 +9,7 @@
 
 import instruments as ik
 from instruments.optional_dep_finder import numpy
-from instruments.tests import expected_protocol, iterable_eq, make_name_test, unit_eq
+from tests import expected_protocol, iterable_eq, make_name_test, unit_eq
 from instruments.units import ureg as u
 
 # TESTS ######################################################################

diff --git a/instruments/tests/test_base_instrument.py → tests/test_base_instrument.py b/instruments/tests/test_base_instrument.py → tests/test_base_instrument.py
@@ -16,7 +16,7 @@
 
 import instruments as ik
 from instruments.optional_dep_finder import numpy
-from instruments.tests import expected_protocol
+from tests import expected_protocol
 
 # pylint: disable=unused-import
 from instruments.abstract_instruments.comm import (
@@ -29,11 +29,10 @@
     AbstractCommunicator,
     USBTMCCommunicator,
     VXI11Communicator,
-    serial_manager,
     SerialCommunicator,
 )
 from instruments.errors import AcknowledgementError, PromptError
-from instruments.tests import iterable_eq
+from tests import iterable_eq
 
 from . import mock
 

diff --git a/instruments/tests/test_comm/__init__.py → tests/test_comm/__init__.py b/instruments/tests/test_comm/__init__.py → tests/test_comm/__init__.py
diff --git a/instruments/tests/test_comm/test_file.py → tests/test_comm/test_file.py b/instruments/tests/test_comm/test_file.py → tests/test_comm/test_file.py
diff --git a/instruments/tests/test_comm/test_gpibusb.py → tests/test_comm/test_gpibusb.py b/instruments/tests/test_comm/test_gpibusb.py → tests/test_comm/test_gpibusb.py
@@ -11,7 +11,7 @@
 from instruments.units import ureg as u
 
 from instruments.abstract_instruments.comm import GPIBCommunicator, SerialCommunicator
-from instruments.tests import unit_eq
+from tests import unit_eq
 from .. import mock
 
 # TEST CASES #################################################################

diff --git a/instruments/tests/test_comm/test_loopback.py → tests/test_comm/test_loopback.py b/instruments/tests/test_comm/test_loopback.py → tests/test_comm/test_loopback.py
diff --git a/instruments/tests/test_comm/test_serial.py → tests/test_comm/test_serial.py b/instruments/tests/test_comm/test_serial.py → tests/test_comm/test_serial.py
@@ -11,7 +11,7 @@
 from instruments.units import ureg as u
 
 from instruments.abstract_instruments.comm import SerialCommunicator
-from instruments.tests import unit_eq
+from tests import unit_eq
 from .. import mock
 
 # TEST CASES #################################################################

diff --git a/instruments/tests/test_comm/test_socket.py → tests/test_comm/test_socket.py b/instruments/tests/test_comm/test_socket.py → tests/test_comm/test_socket.py
@@ -12,7 +12,7 @@
 from instruments.units import ureg as u
 
 from instruments.abstract_instruments.comm import SocketCommunicator
-from instruments.tests import unit_eq
+from tests import unit_eq
 from .. import mock
 
 # TEST CASES #################################################################

diff --git a/.../tests/test_comm/test_usb_communicator.py → tests/test_comm/test_usb_communicator.py b/.../tests/test_comm/test_usb_communicator.py → tests/test_comm/test_usb_communicator.py
diff --git a/instruments/tests/test_comm/test_usbtmc.py → tests/test_comm/test_usbtmc.py b/instruments/tests/test_comm/test_usbtmc.py → tests/test_comm/test_usbtmc.py
@@ -9,7 +9,7 @@
 import pytest
 
 from instruments.abstract_instruments.comm import USBTMCCommunicator
-from instruments.tests import unit_eq
+from tests import unit_eq
 from instruments.units import ureg as u
 from .. import mock
 

diff --git a/...tests/test_comm/test_visa_communicator.py → tests/test_comm/test_visa_communicator.py b/...tests/test_comm/test_visa_communicator.py → tests/test_comm/test_visa_communicator.py
diff --git a/instruments/tests/test_comm/test_vxi11.py → tests/test_comm/test_vxi11.py b/instruments/tests/test_comm/test_vxi11.py → tests/test_comm/test_vxi11.py
diff --git a/instruments/tests/test_config.py → tests/test_config.py b/instruments/tests/test_config.py → tests/test_config.py
diff --git a/instruments/tests/test_fluke/__init__.py → tests/test_fluke/__init__.py b/instruments/tests/test_fluke/__init__.py → tests/test_fluke/__init__.py
diff --git a/...uments/tests/test_fluke/test_fluke3000.py → tests/test_fluke/test_fluke3000.py b/...uments/tests/test_fluke/test_fluke3000.py → tests/test_fluke/test_fluke3000.py
@@ -10,7 +10,7 @@
 from instruments.units import ureg as u
 
 import instruments as ik
-from instruments.tests import expected_protocol
+from tests import expected_protocol
 
 # TESTS ######################################################################
 

diff --git a/...ments/tests/test_generic_scpi/__init__.py → tests/test_generic_scpi/__init__.py b/...ments/tests/test_generic_scpi/__init__.py → tests/test_generic_scpi/__init__.py
diff --git a/...eric_scpi/test_scpi_function_generator.py → ...eric_scpi/test_scpi_function_generator.py b/...eric_scpi/test_scpi_function_generator.py → ...eric_scpi/test_scpi_function_generator.py
@@ -10,7 +10,7 @@
 from instruments.units import ureg as u
 
 import instruments as ik
-from instruments.tests import expected_protocol, make_name_test
+from tests import expected_protocol, make_name_test
 
 # TESTS ######################################################################
 

diff --git a/...test_generic_scpi/test_scpi_instrument.py → ...test_generic_scpi/test_scpi_instrument.py b/...test_generic_scpi/test_scpi_instrument.py → ...test_generic_scpi/test_scpi_instrument.py
@@ -11,7 +11,7 @@
 from instruments.units import ureg as u
 
 import instruments as ik
-from instruments.tests import expected_protocol, make_name_test, unit_eq
+from tests import expected_protocol, make_name_test, unit_eq
 
 # TESTS ######################################################################
 

diff --git a/...test_generic_scpi/test_scpi_multimeter.py → ...test_generic_scpi/test_scpi_multimeter.py b/...test_generic_scpi/test_scpi_multimeter.py → ...test_generic_scpi/test_scpi_multimeter.py
@@ -10,7 +10,7 @@
 from instruments.units import ureg as u
 
 import instruments as ik
-from instruments.tests import expected_protocol, make_name_test, unit_eq
+from tests import expected_protocol, make_name_test, unit_eq
 
 # TESTS ######################################################################
 

diff --git a/instruments/tests/test_gentec_eo/__init__.py → tests/test_gentec_eo/__init__.py b/instruments/tests/test_gentec_eo/__init__.py → tests/test_gentec_eo/__init__.py
diff --git a/instruments/tests/test_gentec_eo/test_blu.py → tests/test_gentec_eo/test_blu.py b/instruments/tests/test_gentec_eo/test_blu.py → tests/test_gentec_eo/test_blu.py
@@ -9,7 +9,7 @@
 import pytest
 
 import instruments as ik
-from instruments.tests import expected_protocol
+from tests import expected_protocol
 from instruments.units import ureg as u
 
 # TESTS ######################################################################

diff --git a/instruments/tests/test_glassman/__init__.py → tests/test_glassman/__init__.py b/instruments/tests/test_glassman/__init__.py → tests/test_glassman/__init__.py
diff --git a/...ts/tests/test_glassman/test_glassmanfr.py → tests/test_glassman/test_glassmanfr.py b/...ts/tests/test_glassman/test_glassmanfr.py → tests/test_glassman/test_glassmanfr.py
@@ -8,7 +8,7 @@
 import pytest
 
 import instruments as ik
-from instruments.tests import expected_protocol
+from tests import expected_protocol
 from instruments.units import ureg as u
 
 

diff --git a/instruments/tests/test_holzworth/__init__.py → tests/test_holzworth/__init__.py b/instruments/tests/test_holzworth/__init__.py → tests/test_holzworth/__init__.py
diff --git a/...s/test_holzworth/test_holzworth_hs9000.py → ...s/test_holzworth/test_holzworth_hs9000.py b/...s/test_holzworth/test_holzworth_hs9000.py → ...s/test_holzworth/test_holzworth_hs9000.py
@@ -9,7 +9,7 @@
 from instruments.units import ureg as u
 
 import instruments as ik
-from instruments.tests import expected_protocol
+from tests import expected_protocol
 from .. import mock
 
 # TEST CLASSES ################################################################

diff --git a/instruments/tests/test_hp/__init__.py → tests/test_hp/__init__.py b/instruments/tests/test_hp/__init__.py → tests/test_hp/__init__.py
diff --git a/instruments/tests/test_hp/test_hp3456a.py → tests/test_hp/test_hp3456a.py b/instruments/tests/test_hp/test_hp3456a.py → tests/test_hp/test_hp3456a.py
@@ -10,7 +10,7 @@
 import pytest
 
 import instruments as ik
-from instruments.tests import expected_protocol
+from tests import expected_protocol
 from instruments.units import ureg as u
 
 # TESTS #######################################################################

diff --git a/instruments/tests/test_hp/test_hp6624a.py → tests/test_hp/test_hp6624a.py b/instruments/tests/test_hp/test_hp6624a.py → tests/test_hp/test_hp6624a.py
@@ -8,7 +8,7 @@
 import pytest
 
 import instruments as ik
-from instruments.tests import (
+from tests import (
     expected_protocol,
     iterable_eq,
 )

diff --git a/instruments/tests/test_hp/test_hp6632b.py → tests/test_hp/test_hp6632b.py b/instruments/tests/test_hp/test_hp6632b.py → tests/test_hp/test_hp6632b.py
@@ -10,7 +10,7 @@
 from instruments.units import ureg as u
 
 import instruments as ik
-from instruments.tests import expected_protocol, make_name_test, unit_eq
+from tests import expected_protocol, make_name_test, unit_eq
 
 # TESTS #######################################################################
 

diff --git a/instruments/tests/test_hp/test_hp6652a.py → tests/test_hp/test_hp6652a.py b/instruments/tests/test_hp/test_hp6652a.py → tests/test_hp/test_hp6652a.py
@@ -8,7 +8,7 @@
 import pytest
 
 import instruments as ik
-from instruments.tests import expected_protocol
+from tests import expected_protocol
 
 # TESTS #######################################################################
 

diff --git a/instruments/tests/test_hp/test_hpe3631a.py → tests/test_hp/test_hpe3631a.py b/instruments/tests/test_hp/test_hpe3631a.py → tests/test_hp/test_hpe3631a.py
@@ -12,7 +12,7 @@
 from instruments.units import ureg as u
 
 import instruments as ik
-from instruments.tests import expected_protocol
+from tests import expected_protocol
 
 
 # TESTS #######################################################################

diff --git a/instruments/tests/test_keithley/__init__.py → tests/test_keithley/__init__.py b/instruments/tests/test_keithley/__init__.py → tests/test_keithley/__init__.py
diff --git a/...s/tests/test_keithley/test_keithley195.py → tests/test_keithley/test_keithley195.py b/...s/tests/test_keithley/test_keithley195.py → tests/test_keithley/test_keithley195.py
@@ -15,7 +15,7 @@
 import pytest
 
 import instruments as ik
-from instruments.tests import expected_protocol
+from tests import expected_protocol
 from instruments.units import ureg as u
 
 # TESTS ######################################################################

diff --git a/.../tests/test_keithley/test_keithley2182.py → tests/test_keithley/test_keithley2182.py b/.../tests/test_keithley/test_keithley2182.py → tests/test_keithley/test_keithley2182.py
@@ -10,7 +10,7 @@
 
 import instruments as ik
 from instruments.optional_dep_finder import numpy
-from instruments.tests import (
+from tests import (
     expected_protocol,
     iterable_eq,
 )

diff --git a/...s/tests/test_keithley/test_keithley485.py → tests/test_keithley/test_keithley485.py b/...s/tests/test_keithley/test_keithley485.py → tests/test_keithley/test_keithley485.py
@@ -10,7 +10,7 @@
 from instruments.units import ureg as u
 
 import instruments as ik
-from instruments.tests import expected_protocol
+from tests import expected_protocol
 
 
 # TESTS ######################################################################

diff --git a/...s/tests/test_keithley/test_keithley580.py → tests/test_keithley/test_keithley580.py b/...s/tests/test_keithley/test_keithley580.py → tests/test_keithley/test_keithley580.py
@@ -16,7 +16,7 @@
 import pytest
 
 import instruments as ik
-from instruments.tests import expected_protocol
+from tests import expected_protocol
 from instruments.units import ureg as u
 
 

diff --git a/.../tests/test_keithley/test_keithley6220.py → tests/test_keithley/test_keithley6220.py b/.../tests/test_keithley/test_keithley6220.py → tests/test_keithley/test_keithley6220.py
@@ -11,7 +11,7 @@
 from instruments.units import ureg as u
 
 import instruments as ik
-from instruments.tests import expected_protocol
+from tests import expected_protocol
 
 # TESTS #######################################################################
 

diff --git a/.../tests/test_keithley/test_keithley6514.py → tests/test_keithley/test_keithley6514.py b/.../tests/test_keithley/test_keithley6514.py → tests/test_keithley/test_keithley6514.py
@@ -9,7 +9,7 @@
 import pytest
 
 import instruments as ik
-from instruments.tests import expected_protocol
+from tests import expected_protocol
 from instruments.units import ureg as u
 
 # TESTS #######################################################################

diff --git a/instruments/tests/test_lakeshore/__init__.py → tests/test_lakeshore/__init__.py b/instruments/tests/test_lakeshore/__init__.py → tests/test_lakeshore/__init__.py
diff --git a/...tests/test_lakeshore/test_lakeshore340.py → tests/test_lakeshore/test_lakeshore340.py b/...tests/test_lakeshore/test_lakeshore340.py → tests/test_lakeshore/test_lakeshore340.py
@@ -7,7 +7,7 @@
 
 import instruments as ik
 from instruments.units import ureg as u
-from instruments.tests import expected_protocol
+from tests import expected_protocol
 
 # TESTS ######################################################################
 

diff --git a/...tests/test_lakeshore/test_lakeshore370.py → tests/test_lakeshore/test_lakeshore370.py b/...tests/test_lakeshore/test_lakeshore370.py → tests/test_lakeshore/test_lakeshore370.py
@@ -9,7 +9,7 @@
 
 import instruments as ik
 from instruments.units import ureg as u
-from instruments.tests import expected_protocol
+from tests import expected_protocol
 
 # TESTS ######################################################################
 

diff --git a/...tests/test_lakeshore/test_lakeshore475.py → tests/test_lakeshore/test_lakeshore475.py b/...tests/test_lakeshore/test_lakeshore475.py → tests/test_lakeshore/test_lakeshore475.py
@@ -9,7 +9,7 @@
 
 import instruments as ik
 from instruments.units import ureg as u
-from instruments.tests import expected_protocol
+from tests import expected_protocol
 
 # TESTS ######################################################################
 

diff --git a/...tests/test_minghe/test_minghe_mhs5200a.py → tests/test_minghe/test_minghe_mhs5200a.py b/...tests/test_minghe/test_minghe_mhs5200a.py → tests/test_minghe/test_minghe_mhs5200a.py
@@ -10,7 +10,7 @@
 from instruments.units import ureg as u
 
 import instruments as ik
-from instruments.tests import expected_protocol
+from tests import expected_protocol
 
 
 # TESTS ######################################################################

diff --git a/instruments/tests/test_named_struct.py → tests/test_named_struct.py b/instruments/tests/test_named_struct.py → tests/test_named_struct.py
diff --git a/instruments/tests/test_newport/__init__.py → tests/test_newport/__init__.py b/instruments/tests/test_newport/__init__.py → tests/test_newport/__init__.py