Merge pull request #20 from DavidLutton/packaging_python

Packaging python
DavidLutton · Dec 26, 2023 · 7ab1849 · 7ab1849
2 parents 6b5aca8 + 2d54b8c
commit 7ab1849
Show file tree

Hide file tree

Showing 102 changed files with 68 additions and 174 deletions.
diff --git a/Makefile b/Makefile
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,57 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "LabToolkit"
+dynamic = ["version"]
+authors = [
+  { name="David Lutton", email="david.lutton@gmail.com" },
+]
+description = "Python package for instrument control, data acquisition and automation"
+readme = "README.md"
+requires-python = ">= 3.10"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Developers",
+    "Natural Language :: English",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+]
+
+keywords = [
+    "VISA",
+    "GPIB",
+    "USB",
+    "Serial",
+    "RS232",
+    "Measurement",
+    "Acquisition",
+]
+
+dependencies = [
+  "pyvisa",
+  "pandas",
+  "numpy",
+]
+
+[project.optional-dependencies]
+VXI11 = [
+  "pyvisa_py",
+]
+screenshots = [
+  "Pillow",
+]
+[project.urls]
+Homepage = "https://github.com/DavidLutton/LabToolkit"
+Issues = "https://github.com/DavidLutton/LabToolkit/issues"
+
+[tool.hatch.version]
+path = "src/__about__.py"
+
+[tool.hatch.build.targets.wheel]
+packages = ["src"]
diff --git a/setup.cfg b/setup.cfg
diff --git a/setup.py b/setup.py
diff --git a/labtoolkit/Attenuator/MI2187.py → src/Attenuator/MI2187.py b/labtoolkit/Attenuator/MI2187.py → src/Attenuator/MI2187.py
diff --git a/labtoolkit/AudioAnalyser/HP8903B.py → src/AudioAnalyser/HP8903B.py b/labtoolkit/AudioAnalyser/HP8903B.py → src/AudioAnalyser/HP8903B.py
diff --git a/labtoolkit/AudioAnalyser/RaSCMU200Audio.py → src/AudioAnalyser/RaSCMU200Audio.py b/labtoolkit/AudioAnalyser/RaSCMU200Audio.py → src/AudioAnalyser/RaSCMU200Audio.py
diff --git a/labtoolkit/Controller/amplitude.py → src/Controller/amplitude.py b/labtoolkit/Controller/amplitude.py → src/Controller/amplitude.py
diff --git a/labtoolkit/Controller/frequency.py → src/Controller/frequency.py b/labtoolkit/Controller/frequency.py → src/Controller/frequency.py
diff --git a/labtoolkit/Controller/modulation.py → src/Controller/modulation.py b/labtoolkit/Controller/modulation.py → src/Controller/modulation.py
diff --git a/labtoolkit/DigitalMultimeter/HP34401A.py → src/DigitalMultimeter/HP34401A.py b/labtoolkit/DigitalMultimeter/HP34401A.py → src/DigitalMultimeter/HP34401A.py
diff --git a/labtoolkit/DigitalMultimeter/TP4000ZC.py → src/DigitalMultimeter/TP4000ZC.py b/labtoolkit/DigitalMultimeter/TP4000ZC.py → src/DigitalMultimeter/TP4000ZC.py
diff --git a/labtoolkit/DigitalMultimeter/hp34401A.md → src/DigitalMultimeter/hp34401A.md b/labtoolkit/DigitalMultimeter/hp34401A.md → src/DigitalMultimeter/hp34401A.md
diff --git a/...oolkit/Enviromental/HeraeusVotschVMT04.py → src/Enviromental/HeraeusVotschVMT04.py b/...oolkit/Enviromental/HeraeusVotschVMT04.py → src/Enviromental/HeraeusVotschVMT04.py
diff --git a/labtoolkit/Enviromental/hydrotherm.py → src/Enviromental/hydrotherm.py b/labtoolkit/Enviromental/hydrotherm.py → src/Enviromental/hydrotherm.py
diff --git a/labtoolkit/FieldStrength/EMC 20 Emulator.py → src/FieldStrength/EMC 20 Emulator.py b/labtoolkit/FieldStrength/EMC 20 Emulator.py → src/FieldStrength/EMC 20 Emulator.py
diff --git a/labtoolkit/FieldStrength/EMC 20 Reader.py → src/FieldStrength/EMC 20 Reader.py b/labtoolkit/FieldStrength/EMC 20 Reader.py → src/FieldStrength/EMC 20 Reader.py
diff --git a/labtoolkit/FieldStrength/EMC20.py → src/FieldStrength/EMC20.py b/labtoolkit/FieldStrength/EMC20.py → src/FieldStrength/EMC20.py
diff --git a/labtoolkit/FieldStrength/LumiloopLSProbe.py → src/FieldStrength/LumiloopLSProbe.py b/labtoolkit/FieldStrength/LumiloopLSProbe.py → src/FieldStrength/LumiloopLSProbe.py
diff --git a/labtoolkit/FieldStrength/Narda601.py → src/FieldStrength/Narda601.py b/labtoolkit/FieldStrength/Narda601.py → src/FieldStrength/Narda601.py
diff --git a/labtoolkit/File/snp.py → src/File/snp.py b/labtoolkit/File/snp.py → src/File/snp.py
diff --git a/labtoolkit/File/wv.py → src/File/wv.py b/labtoolkit/File/wv.py → src/File/wv.py
diff --git a/labtoolkit/FilterRF/AgilentN9039A.py → src/FilterRF/AgilentN9039A.py b/labtoolkit/FilterRF/AgilentN9039A.py → src/FilterRF/AgilentN9039A.py
diff --git a/labtoolkit/Formatter/plot.py → src/Formatter/plot.py b/labtoolkit/Formatter/plot.py → src/Formatter/plot.py
diff --git a/labtoolkit/Formula/Audio.py → src/Formula/Audio.py b/labtoolkit/Formula/Audio.py → src/Formula/Audio.py
diff --git a/labtoolkit/Formula/IQ.py → src/Formula/IQ.py b/labtoolkit/Formula/IQ.py → src/Formula/IQ.py
diff --git a/labtoolkit/Formula/RI.py → src/Formula/RI.py b/labtoolkit/Formula/RI.py → src/Formula/RI.py
diff --git a/labtoolkit/Formula/Units.py → src/Formula/Units.py b/labtoolkit/Formula/Units.py → src/Formula/Units.py
diff --git a/...lkit/FrequencyCounter/FrequencyCounter.py → src/FrequencyCounter/FrequencyCounter.py b/...lkit/FrequencyCounter/FrequencyCounter.py → src/FrequencyCounter/FrequencyCounter.py
diff --git a/labtoolkit/FrequencyCounter/HP53132A.py → src/FrequencyCounter/HP53132A.py b/labtoolkit/FrequencyCounter/HP53132A.py → src/FrequencyCounter/HP53132A.py
diff --git a/labtoolkit/FrequencyCounter/IFRCPM47.py → src/FrequencyCounter/IFRCPM47.py b/labtoolkit/FrequencyCounter/IFRCPM47.py → src/FrequencyCounter/IFRCPM47.py
diff --git a/labtoolkit/FrequencyCounter/Racal1992.py → src/FrequencyCounter/Racal1992.py b/labtoolkit/FrequencyCounter/Racal1992.py → src/FrequencyCounter/Racal1992.py
diff --git a/labtoolkit/IEEE488.py → src/IEEE488.py b/labtoolkit/IEEE488.py → src/IEEE488.py
diff --git a/labtoolkit/Instrument.py → src/Instrument.py b/labtoolkit/Instrument.py → src/Instrument.py
diff --git a/labtoolkit/ModulationMeter/HP8901B.py → src/ModulationMeter/HP8901B.py b/labtoolkit/ModulationMeter/HP8901B.py → src/ModulationMeter/HP8901B.py
diff --git a/labtoolkit/ModulationMeter/MI2305.py → src/ModulationMeter/MI2305.py b/labtoolkit/ModulationMeter/MI2305.py → src/ModulationMeter/MI2305.py
diff --git a/labtoolkit/NetworkAnalyser/AgilentE8357A.py → src/NetworkAnalyser/AgilentE8357A.py b/labtoolkit/NetworkAnalyser/AgilentE8357A.py → src/NetworkAnalyser/AgilentE8357A.py
diff --git a/...olkit/NetworkAnalyser/AnritsuShockline.py → src/NetworkAnalyser/AnritsuShockline.py b/...olkit/NetworkAnalyser/AnritsuShockline.py → src/NetworkAnalyser/AnritsuShockline.py
diff --git a/labtoolkit/NetworkAnalyser/HP4395A.py → src/NetworkAnalyser/HP4395A.py b/labtoolkit/NetworkAnalyser/HP4395A.py → src/NetworkAnalyser/HP4395A.py
diff --git a/...olkit/NetworkAnalyser/KeysightFieldFox.py → src/NetworkAnalyser/KeysightFieldFox.py b/...olkit/NetworkAnalyser/KeysightFieldFox.py → src/NetworkAnalyser/KeysightFieldFox.py
diff --git a/labtoolkit/NetworkAnalyser/Wiltron360.py → src/NetworkAnalyser/Wiltron360.py b/labtoolkit/NetworkAnalyser/Wiltron360.py → src/NetworkAnalyser/Wiltron360.py
diff --git a/...it/Oscilloscope/KeysightInfiniiVisionX.py → src/Oscilloscope/KeysightInfiniiVisionX.py b/...it/Oscilloscope/KeysightInfiniiVisionX.py → src/Oscilloscope/KeysightInfiniiVisionX.py
diff --git a/labtoolkit/Oscilloscope/TektronixTDS7104.py → src/Oscilloscope/TektronixTDS7104.py b/labtoolkit/Oscilloscope/TektronixTDS7104.py → src/Oscilloscope/TektronixTDS7104.py
diff --git a/labtoolkit/PATester/SeawardPAT.py → src/PATester/SeawardPAT.py b/labtoolkit/PATester/SeawardPAT.py → src/PATester/SeawardPAT.py
diff --git a/...lkit/Positioner/AnaheimAutomationSMC40.py → src/Positioner/AnaheimAutomationSMC40.py b/...lkit/Positioner/AnaheimAutomationSMC40.py → src/Positioner/AnaheimAutomationSMC40.py
diff --git a/labtoolkit/Positioner/ETS2090.py → src/Positioner/ETS2090.py b/labtoolkit/Positioner/ETS2090.py → src/Positioner/ETS2090.py
diff --git a/labtoolkit/PowerAnalyser/VoltechPM100.py → src/PowerAnalyser/VoltechPM100.py b/labtoolkit/PowerAnalyser/VoltechPM100.py → src/PowerAnalyser/VoltechPM100.py
diff --git a/labtoolkit/PowerAnalyser/VoltechPM1000P.py → src/PowerAnalyser/VoltechPM1000P.py b/labtoolkit/PowerAnalyser/VoltechPM1000P.py → src/PowerAnalyser/VoltechPM1000P.py
diff --git a/labtoolkit/PowerAnalyser/VoltechPM3000A.py → src/PowerAnalyser/VoltechPM3000A.py b/labtoolkit/PowerAnalyser/VoltechPM3000A.py → src/PowerAnalyser/VoltechPM3000A.py
diff --git a/labtoolkit/PowerMeter/AgilentE4418B.py → src/PowerMeter/AgilentE4418B.py b/labtoolkit/PowerMeter/AgilentE4418B.py → src/PowerMeter/AgilentE4418B.py
diff --git a/labtoolkit/PowerMeter/ELVA1DPM.py → src/PowerMeter/ELVA1DPM.py b/labtoolkit/PowerMeter/ELVA1DPM.py → src/PowerMeter/ELVA1DPM.py
diff --git a/labtoolkit/PowerMeter/HP437B.py → src/PowerMeter/HP437B.py b/labtoolkit/PowerMeter/HP437B.py → src/PowerMeter/HP437B.py
diff --git a/labtoolkit/PowerMeter/MI6960.py → src/PowerMeter/MI6960.py b/labtoolkit/PowerMeter/MI6960.py → src/PowerMeter/MI6960.py
diff --git a/labtoolkit/PowerMeter/RohdeSchwarzNRVS.py → src/PowerMeter/RohdeSchwarzNRVS.py b/labtoolkit/PowerMeter/RohdeSchwarzNRVS.py → src/PowerMeter/RohdeSchwarzNRVS.py
diff --git a/labtoolkit/PowerMeter/VDIPM5B.py → src/PowerMeter/VDIPM5B.py b/labtoolkit/PowerMeter/VDIPM5B.py → src/PowerMeter/VDIPM5B.py
diff --git a/labtoolkit/PowerSourceAC/SourceAC.py → src/PowerSourceAC/SourceAC.py b/labtoolkit/PowerSourceAC/SourceAC.py → src/PowerSourceAC/SourceAC.py
diff --git a/labtoolkit/PowerSourceDC/AgilentN7972A.py → src/PowerSourceDC/AgilentN7972A.py b/labtoolkit/PowerSourceDC/AgilentN7972A.py → src/PowerSourceDC/AgilentN7972A.py
diff --git a/labtoolkit/PowerSourceDC/HP59501B.py → src/PowerSourceDC/HP59501B.py b/labtoolkit/PowerSourceDC/HP59501B.py → src/PowerSourceDC/HP59501B.py
diff --git a/labtoolkit/PowerSourceDC/HP6632A.py → src/PowerSourceDC/HP6632A.py b/labtoolkit/PowerSourceDC/HP6632A.py → src/PowerSourceDC/HP6632A.py
diff --git a/labtoolkit/PowerSourceDC/HP6674A.py → src/PowerSourceDC/HP6674A.py b/labtoolkit/PowerSourceDC/HP6674A.py → src/PowerSourceDC/HP6674A.py
diff --git a/labtoolkit/PowerSourceDC/TTIPL303.py → src/PowerSourceDC/TTIPL303.py b/labtoolkit/PowerSourceDC/TTIPL303.py → src/PowerSourceDC/TTIPL303.py
diff --git a/labtoolkit/PowerSourceDC/TTIPL330P.py → src/PowerSourceDC/TTIPL330P.py b/labtoolkit/PowerSourceDC/TTIPL330P.py → src/PowerSourceDC/TTIPL330P.py
diff --git a/labtoolkit/RangeFinder/ArduinoLIDAR.py → src/RangeFinder/ArduinoLIDAR.py b/labtoolkit/RangeFinder/ArduinoLIDAR.py → src/RangeFinder/ArduinoLIDAR.py
diff --git a/labtoolkit/SCPI.py → src/SCPI.py b/labtoolkit/SCPI.py → src/SCPI.py
diff --git a/labtoolkit/SignalGenerator/Agilent83650B.py → src/SignalGenerator/Agilent83650B.py b/labtoolkit/SignalGenerator/Agilent83650B.py → src/SignalGenerator/Agilent83650B.py
diff --git a/labtoolkit/SignalGenerator/AgilentE4422B.py → src/SignalGenerator/AgilentE4422B.py b/labtoolkit/SignalGenerator/AgilentE4422B.py → src/SignalGenerator/AgilentE4422B.py
diff --git a/labtoolkit/SignalGenerator/AgilentE4438C.py → src/SignalGenerator/AgilentE4438C.py b/labtoolkit/SignalGenerator/AgilentE4438C.py → src/SignalGenerator/AgilentE4438C.py
diff --git a/labtoolkit/SignalGenerator/AgilentN5181A.py → src/SignalGenerator/AgilentN5181A.py b/labtoolkit/SignalGenerator/AgilentN5181A.py → src/SignalGenerator/AgilentN5181A.py
diff --git a/labtoolkit/SignalGenerator/AgilentN5182A.py → src/SignalGenerator/AgilentN5182A.py b/labtoolkit/SignalGenerator/AgilentN5182A.py → src/SignalGenerator/AgilentN5182A.py
diff --git a/...oolkit/SignalGenerator/AnritsuMG369nAB.py → src/SignalGenerator/AnritsuMG369nAB.py b/...oolkit/SignalGenerator/AnritsuMG369nAB.py → src/SignalGenerator/AnritsuMG369nAB.py
diff --git a/labtoolkit/SignalGenerator/AnritsuMG3710A.py → src/SignalGenerator/AnritsuMG3710A.py b/labtoolkit/SignalGenerator/AnritsuMG3710A.py → src/SignalGenerator/AnritsuMG3710A.py
diff --git a/labtoolkit/SignalGenerator/HP83752B.py → src/SignalGenerator/HP83752B.py b/labtoolkit/SignalGenerator/HP83752B.py → src/SignalGenerator/HP83752B.py
diff --git a/labtoolkit/SignalGenerator/HP85645A.py → src/SignalGenerator/HP85645A.py b/labtoolkit/SignalGenerator/HP85645A.py → src/SignalGenerator/HP85645A.py
diff --git a/labtoolkit/SignalGenerator/HP8657A.py → src/SignalGenerator/HP8657A.py b/labtoolkit/SignalGenerator/HP8657A.py → src/SignalGenerator/HP8657A.py
diff --git a/labtoolkit/SignalGenerator/HP866nX.py → src/SignalGenerator/HP866nX.py b/labtoolkit/SignalGenerator/HP866nX.py → src/SignalGenerator/HP866nX.py
diff --git a/labtoolkit/SignalGenerator/HPESG3000A.py → src/SignalGenerator/HPESG3000A.py b/labtoolkit/SignalGenerator/HPESG3000A.py → src/SignalGenerator/HPESG3000A.py
diff --git a/labtoolkit/SignalGenerator/IFR341n.py → src/SignalGenerator/IFR341n.py b/labtoolkit/SignalGenerator/IFR341n.py → src/SignalGenerator/IFR341n.py
diff --git a/labtoolkit/SignalGenerator/KeysightN5173B.py → src/SignalGenerator/KeysightN5173B.py b/labtoolkit/SignalGenerator/KeysightN5173B.py → src/SignalGenerator/KeysightN5173B.py
diff --git a/...SignalGenerator/MarconiInstruments203N.py → ...SignalGenerator/MarconiInstruments203N.py b/...SignalGenerator/MarconiInstruments203N.py → ...SignalGenerator/MarconiInstruments203N.py
diff --git a/...Generator/MarconiInstruments203N_NOMOD.py → ...Generator/MarconiInstruments203N_NOMOD.py b/...Generator/MarconiInstruments203N_NOMOD.py → ...Generator/MarconiInstruments203N_NOMOD.py
diff --git a/...lkit/SignalGenerator/RohdeSchwarzSHM52.py → src/SignalGenerator/RohdeSchwarzSHM52.py b/...lkit/SignalGenerator/RohdeSchwarzSHM52.py → src/SignalGenerator/RohdeSchwarzSHM52.py
diff --git a/...it/SignalGenerator/SCPISignalGenerator.py → src/SignalGenerator/SCPISignalGenerator.py b/...it/SignalGenerator/SCPISignalGenerator.py → src/SignalGenerator/SCPISignalGenerator.py
diff --git a/labtoolkit/SignalGenerator/Wiltron360SS69.py → src/SignalGenerator/Wiltron360SS69.py b/labtoolkit/SignalGenerator/Wiltron360SS69.py → src/SignalGenerator/Wiltron360SS69.py
diff --git a/labtoolkit/SignalGenerator/Wiltron6669A.py → src/SignalGenerator/Wiltron6669A.py b/labtoolkit/SignalGenerator/Wiltron6669A.py → src/SignalGenerator/Wiltron6669A.py
diff --git a/labtoolkit/SignalGenerator/Wiltron6672B.py → src/SignalGenerator/Wiltron6672B.py b/labtoolkit/SignalGenerator/Wiltron6672B.py → src/SignalGenerator/Wiltron6672B.py
diff --git a/labtoolkit/SignalGenerator/helper.py → src/SignalGenerator/helper.py b/labtoolkit/SignalGenerator/helper.py → src/SignalGenerator/helper.py
diff --git a/labtoolkit/SpectrumAnalyser/AgilentE4406A.py → src/SpectrumAnalyser/AgilentE4406A.py b/labtoolkit/SpectrumAnalyser/AgilentE4406A.py → src/SpectrumAnalyser/AgilentE4406A.py
diff --git a/labtoolkit/SpectrumAnalyser/AgilentE44nn.py → src/SpectrumAnalyser/AgilentE44nn.py b/labtoolkit/SpectrumAnalyser/AgilentE44nn.py → src/SpectrumAnalyser/AgilentE44nn.py
diff --git a/...oolkit/SpectrumAnalyser/AnritsuMS266nC.py → src/SpectrumAnalyser/AnritsuMS266nC.py b/...oolkit/SpectrumAnalyser/AnritsuMS266nC.py → src/SpectrumAnalyser/AnritsuMS266nC.py
diff --git a/labtoolkit/SpectrumAnalyser/HPGreenScreen.py → src/SpectrumAnalyser/HPGreenScreen.py b/labtoolkit/SpectrumAnalyser/HPGreenScreen.py → src/SpectrumAnalyser/HPGreenScreen.py
diff --git a/...oolkit/SpectrumAnalyser/KeysightN90nnB.py → src/SpectrumAnalyser/KeysightN90nnB.py b/...oolkit/SpectrumAnalyser/KeysightN90nnB.py → src/SpectrumAnalyser/KeysightN90nnB.py
diff --git a/labtoolkit/SpectrumAnalyser/RaSESW.py → src/SpectrumAnalyser/RaSESW.py b/labtoolkit/SpectrumAnalyser/RaSESW.py → src/SpectrumAnalyser/RaSESW.py
diff --git a/...lkit/SpectrumAnalyser/SpectrumAnalyser.py → src/SpectrumAnalyser/SpectrumAnalyser.py b/...lkit/SpectrumAnalyser/SpectrumAnalyser.py → src/SpectrumAnalyser/SpectrumAnalyser.py
diff --git a/labtoolkit/SpectrumAnalyser/__init____.py → src/SpectrumAnalyser/__init____.py b/labtoolkit/SpectrumAnalyser/__init____.py → src/SpectrumAnalyser/__init____.py
diff --git a/labtoolkit/Switch/HP3488A.py → src/Switch/HP3488A.py b/labtoolkit/Switch/HP3488A.py → src/Switch/HP3488A.py
diff --git a/labtoolkit/Switch/Keithley79996.py → src/Switch/Keithley79996.py b/labtoolkit/Switch/Keithley79996.py → src/Switch/Keithley79996.py
diff --git a/labtoolkit/Switch/__init__.py → src/Switch/__init__.py b/labtoolkit/Switch/__init__.py → src/Switch/__init__.py
diff --git a/labtoolkit/WaveformGenerator/HP33120A.py → src/WaveformGenerator/HP33120A.py b/labtoolkit/WaveformGenerator/HP33120A.py → src/WaveformGenerator/HP33120A.py
diff --git a/labtoolkit/WaveformGenerator/HP8116A.py → src/WaveformGenerator/HP8116A.py b/labtoolkit/WaveformGenerator/HP8116A.py → src/WaveformGenerator/HP8116A.py
diff --git a/labtoolkit/WirelessTestSet/RaSCMW500.py → src/WirelessTestSet/RaSCMW500.py b/labtoolkit/WirelessTestSet/RaSCMW500.py → src/WirelessTestSet/RaSCMW500.py
diff --git a/src/__about__.py b/src/__about__.py
@@ -0,0 +1 @@
+__version__ = "1.4.0"
diff --git a/labtoolkit/__init__.py → src/__init__.py b/labtoolkit/__init__.py → src/__init__.py
@@ -7,6 +7,16 @@
 import pandas as pd
 # import numpy as np
 import pyvisa
+from importlib.metadata import version  
+
+
+
+__version__ = "unknown package is not installed"
+try:
+    __version__ = version(__name__)
+except PackageNotFoundError:
+    pass  # package is not installed
+
 
 """Example Google style docstrings.