From cf4a596531eb96993f3f57e5b340cd07fbae1cc9 Mon Sep 17 00:00:00 2001 From: chrisjbillington Date: Tue, 25 Feb 2020 14:28:46 -0500 Subject: [PATCH 1/4] packaging_changes: Move modules into subdir --- AlazarTechBoard.py => labscript_devices/AlazarTechBoard.py | 0 {AndorSolis => labscript_devices/AndorSolis}/__init__.py | 0 .../AndorSolis}/andor_sdk/andor_capabilities.py | 0 .../AndorSolis}/andor_sdk/andor_solis.py | 0 .../AndorSolis}/andor_sdk/andor_structures.py | 0 .../AndorSolis}/andor_sdk/andor_utils.py | 0 .../AndorSolis}/andor_sdk/status_codes.py | 0 {AndorSolis => labscript_devices/AndorSolis}/blacs_tabs.py | 0 {AndorSolis => labscript_devices/AndorSolis}/blacs_workers.py | 0 {AndorSolis => labscript_devices/AndorSolis}/labscript_devices.py | 0 {AndorSolis => labscript_devices/AndorSolis}/register_classes.py | 0 Camera.py => labscript_devices/Camera.py | 0 .../CiceroOpalKellyXEM3001.py | 0 .../DummyIntermediateDevice.py | 0 .../DummyPseudoclock}/__init__.py | 0 .../DummyPseudoclock}/blacs_tabs.py | 0 .../DummyPseudoclock}/blacs_workers.py | 0 .../DummyPseudoclock}/labscript_devices.py | 0 .../DummyPseudoclock}/register_classes.py | 0 .../FlyCapture2Camera}/__init__.py | 0 .../FlyCapture2Camera}/blacs_tabs.py | 0 .../FlyCapture2Camera}/blacs_workers.py | 0 .../FlyCapture2Camera}/labscript_devices.py | 0 .../FlyCapture2Camera}/register_classes.py | 0 {FunctionRunner => labscript_devices/FunctionRunner}/__init__.py | 0 .../FunctionRunner}/blacs_tabs.py | 0 .../FunctionRunner}/blacs_workers.py | 0 .../FunctionRunner}/labscript_devices.py | 0 .../FunctionRunner}/register_classes.py | 0 .../FunctionRunner}/testing/test.py | 0 {FunctionRunner => labscript_devices/FunctionRunner}/utils.py | 0 {IMAQdxCamera => labscript_devices/IMAQdxCamera}/__init__.py | 0 .../IMAQdxCamera}/attributes_dialog.ui | 0 {IMAQdxCamera => labscript_devices/IMAQdxCamera}/blacs_tab.ui | 0 {IMAQdxCamera => labscript_devices/IMAQdxCamera}/blacs_tabs.py | 0 {IMAQdxCamera => labscript_devices/IMAQdxCamera}/blacs_workers.py | 0 .../IMAQdxCamera}/labscript_devices.py | 0 .../IMAQdxCamera}/register_classes.py | 0 {IMAQdxCamera => labscript_devices/IMAQdxCamera}/testing/test.py | 0 LightCrafterDMD.py => labscript_devices/LightCrafterDMD.py | 0 {NI_DAQmx => labscript_devices/NI_DAQmx}/__init__.py | 0 {NI_DAQmx => labscript_devices/NI_DAQmx}/blacs_tabs.py | 0 {NI_DAQmx => labscript_devices/NI_DAQmx}/blacs_workers.py | 0 {NI_DAQmx => labscript_devices/NI_DAQmx}/daqmx_utils.py | 0 {NI_DAQmx => labscript_devices/NI_DAQmx}/labscript_devices.py | 0 {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_PCI_6251.py | 0 {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_PCI_6534.py | 0 {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_PCI_6713.py | 0 {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_PCI_6733.py | 0 .../NI_DAQmx}/models/NI_PCI_DIO_32HS.py | 0 {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_PCIe_6363.py | 0 {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_PCIe_6738.py | 0 {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_PXI_6733.py | 0 {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_PXIe_6361.py | 0 {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_PXIe_6535.py | 0 {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_PXIe_6738.py | 0 {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_USB_6008.py | 0 {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_USB_6229.py | 0 {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_USB_6343.py | 0 {NI_DAQmx => labscript_devices/NI_DAQmx}/models/README.txt | 0 {NI_DAQmx => labscript_devices/NI_DAQmx}/models/__init__.py | 0 .../NI_DAQmx}/models/_subclass_template.py | 0 {NI_DAQmx => labscript_devices/NI_DAQmx}/models/capabilities.json | 0 .../NI_DAQmx}/models/generate_subclasses.py | 0 .../NI_DAQmx}/models/get_capabilities.py | 0 {NI_DAQmx => labscript_devices/NI_DAQmx}/register_classes.py | 0 {NI_DAQmx => labscript_devices/NI_DAQmx}/runviewer_parsers.py | 0 .../NI_DAQmx}/testing/test_NI_DAQmx_labscript.py | 0 {NI_DAQmx => labscript_devices/NI_DAQmx}/utils.py | 0 NI_PCI_6733.py => labscript_devices/NI_PCI_6733.py | 0 NI_PCIe_6363.py => labscript_devices/NI_PCIe_6363.py | 0 NI_USB_6343.py => labscript_devices/NI_USB_6343.py | 0 NovaTechDDS9M.py => labscript_devices/NovaTechDDS9M.py | 0 .../PhaseMatrixQuickSyn.py | 0 PineBlaster.py => labscript_devices/PineBlaster.py | 0 PulseBlaster.py => labscript_devices/PulseBlaster.py | 0 .../PulseBlasterESRPro200.py | 0 .../PulseBlasterESRPro500.py | 0 PulseBlasterUSB.py => labscript_devices/PulseBlasterUSB.py | 0 .../PulseBlaster_No_DDS.py | 0 .../PulseBlaster_SP2_24_100_32k.py | 0 {PylonCamera => labscript_devices/PylonCamera}/__init__.py | 0 {PylonCamera => labscript_devices/PylonCamera}/blacs_tabs.py | 0 {PylonCamera => labscript_devices/PylonCamera}/blacs_workers.py | 0 .../PylonCamera}/labscript_devices.py | 0 .../PylonCamera}/register_classes.py | 0 .../PylonCamera}/testing/ExposureTiming.py | 0 PythonCamera.py => labscript_devices/PythonCamera.py | 0 RFBlaster.py => labscript_devices/RFBlaster.py | 0 {TekScope => labscript_devices/TekScope}/TekScope.py | 0 {TekScope => labscript_devices/TekScope}/__init__.py | 0 {TekScope => labscript_devices/TekScope}/blacs_tabs.py | 0 {TekScope => labscript_devices/TekScope}/blacs_workers.py | 0 {TekScope => labscript_devices/TekScope}/labscript_devices.py | 0 {TekScope => labscript_devices/TekScope}/register_classes.py | 0 .../ZaberStageController}/__init__.py | 0 .../ZaberStageController}/blacs_tabs.py | 0 .../ZaberStageController}/blacs_workers.py | 0 .../ZaberStageController}/labscript_devices.py | 0 .../ZaberStageController}/register_classes.py | 0 .../ZaberStageController}/testing/test.py | 0 .../ZaberStageController}/utils.py | 0 __init__.py => labscript_devices/__init__.py | 0 atsapi.py => labscript_devices/atsapi.py | 0 camera.ui => labscript_devices/camera.ui | 0 imaqdx_server.py => labscript_devices/imaqdx_server.py | 0 .../phasematrixquicksyn.ui | 0 pulseblaster.ui => labscript_devices/pulseblaster.ui | 0 spec => labscript_devices/spec | 0 test_device.py => labscript_devices/test_device.py | 0 110 files changed, 0 insertions(+), 0 deletions(-) rename AlazarTechBoard.py => labscript_devices/AlazarTechBoard.py (100%) rename {AndorSolis => labscript_devices/AndorSolis}/__init__.py (100%) rename {AndorSolis => labscript_devices/AndorSolis}/andor_sdk/andor_capabilities.py (100%) rename {AndorSolis => labscript_devices/AndorSolis}/andor_sdk/andor_solis.py (100%) rename {AndorSolis => labscript_devices/AndorSolis}/andor_sdk/andor_structures.py (100%) rename {AndorSolis => labscript_devices/AndorSolis}/andor_sdk/andor_utils.py (100%) rename {AndorSolis => labscript_devices/AndorSolis}/andor_sdk/status_codes.py (100%) rename {AndorSolis => labscript_devices/AndorSolis}/blacs_tabs.py (100%) rename {AndorSolis => labscript_devices/AndorSolis}/blacs_workers.py (100%) rename {AndorSolis => labscript_devices/AndorSolis}/labscript_devices.py (100%) rename {AndorSolis => labscript_devices/AndorSolis}/register_classes.py (100%) rename Camera.py => labscript_devices/Camera.py (100%) rename CiceroOpalKellyXEM3001.py => labscript_devices/CiceroOpalKellyXEM3001.py (100%) rename DummyIntermediateDevice.py => labscript_devices/DummyIntermediateDevice.py (100%) rename {DummyPseudoclock => labscript_devices/DummyPseudoclock}/__init__.py (100%) rename {DummyPseudoclock => labscript_devices/DummyPseudoclock}/blacs_tabs.py (100%) rename {DummyPseudoclock => labscript_devices/DummyPseudoclock}/blacs_workers.py (100%) rename {DummyPseudoclock => labscript_devices/DummyPseudoclock}/labscript_devices.py (100%) rename {DummyPseudoclock => labscript_devices/DummyPseudoclock}/register_classes.py (100%) rename {FlyCapture2Camera => labscript_devices/FlyCapture2Camera}/__init__.py (100%) rename {FlyCapture2Camera => labscript_devices/FlyCapture2Camera}/blacs_tabs.py (100%) rename {FlyCapture2Camera => labscript_devices/FlyCapture2Camera}/blacs_workers.py (100%) rename {FlyCapture2Camera => labscript_devices/FlyCapture2Camera}/labscript_devices.py (100%) rename {FlyCapture2Camera => labscript_devices/FlyCapture2Camera}/register_classes.py (100%) rename {FunctionRunner => labscript_devices/FunctionRunner}/__init__.py (100%) rename {FunctionRunner => labscript_devices/FunctionRunner}/blacs_tabs.py (100%) rename {FunctionRunner => labscript_devices/FunctionRunner}/blacs_workers.py (100%) rename {FunctionRunner => labscript_devices/FunctionRunner}/labscript_devices.py (100%) rename {FunctionRunner => labscript_devices/FunctionRunner}/register_classes.py (100%) rename {FunctionRunner => labscript_devices/FunctionRunner}/testing/test.py (100%) rename {FunctionRunner => labscript_devices/FunctionRunner}/utils.py (100%) rename {IMAQdxCamera => labscript_devices/IMAQdxCamera}/__init__.py (100%) rename {IMAQdxCamera => labscript_devices/IMAQdxCamera}/attributes_dialog.ui (100%) rename {IMAQdxCamera => labscript_devices/IMAQdxCamera}/blacs_tab.ui (100%) rename {IMAQdxCamera => labscript_devices/IMAQdxCamera}/blacs_tabs.py (100%) rename {IMAQdxCamera => labscript_devices/IMAQdxCamera}/blacs_workers.py (100%) rename {IMAQdxCamera => labscript_devices/IMAQdxCamera}/labscript_devices.py (100%) rename {IMAQdxCamera => labscript_devices/IMAQdxCamera}/register_classes.py (100%) rename {IMAQdxCamera => labscript_devices/IMAQdxCamera}/testing/test.py (100%) rename LightCrafterDMD.py => labscript_devices/LightCrafterDMD.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/__init__.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/blacs_tabs.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/blacs_workers.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/daqmx_utils.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/labscript_devices.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_PCI_6251.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_PCI_6534.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_PCI_6713.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_PCI_6733.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_PCI_DIO_32HS.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_PCIe_6363.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_PCIe_6738.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_PXI_6733.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_PXIe_6361.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_PXIe_6535.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_PXIe_6738.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_USB_6008.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_USB_6229.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/models/NI_USB_6343.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/models/README.txt (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/models/__init__.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/models/_subclass_template.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/models/capabilities.json (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/models/generate_subclasses.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/models/get_capabilities.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/register_classes.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/runviewer_parsers.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/testing/test_NI_DAQmx_labscript.py (100%) rename {NI_DAQmx => labscript_devices/NI_DAQmx}/utils.py (100%) rename NI_PCI_6733.py => labscript_devices/NI_PCI_6733.py (100%) rename NI_PCIe_6363.py => labscript_devices/NI_PCIe_6363.py (100%) rename NI_USB_6343.py => labscript_devices/NI_USB_6343.py (100%) rename NovaTechDDS9M.py => labscript_devices/NovaTechDDS9M.py (100%) rename PhaseMatrixQuickSyn.py => labscript_devices/PhaseMatrixQuickSyn.py (100%) rename PineBlaster.py => labscript_devices/PineBlaster.py (100%) rename PulseBlaster.py => labscript_devices/PulseBlaster.py (100%) rename PulseBlasterESRPro200.py => labscript_devices/PulseBlasterESRPro200.py (100%) rename PulseBlasterESRPro500.py => labscript_devices/PulseBlasterESRPro500.py (100%) rename PulseBlasterUSB.py => labscript_devices/PulseBlasterUSB.py (100%) rename PulseBlaster_No_DDS.py => labscript_devices/PulseBlaster_No_DDS.py (100%) rename PulseBlaster_SP2_24_100_32k.py => labscript_devices/PulseBlaster_SP2_24_100_32k.py (100%) rename {PylonCamera => labscript_devices/PylonCamera}/__init__.py (100%) rename {PylonCamera => labscript_devices/PylonCamera}/blacs_tabs.py (100%) rename {PylonCamera => labscript_devices/PylonCamera}/blacs_workers.py (100%) rename {PylonCamera => labscript_devices/PylonCamera}/labscript_devices.py (100%) rename {PylonCamera => labscript_devices/PylonCamera}/register_classes.py (100%) rename {PylonCamera => labscript_devices/PylonCamera}/testing/ExposureTiming.py (100%) rename PythonCamera.py => labscript_devices/PythonCamera.py (100%) rename RFBlaster.py => labscript_devices/RFBlaster.py (100%) rename {TekScope => labscript_devices/TekScope}/TekScope.py (100%) rename {TekScope => labscript_devices/TekScope}/__init__.py (100%) rename {TekScope => labscript_devices/TekScope}/blacs_tabs.py (100%) rename {TekScope => labscript_devices/TekScope}/blacs_workers.py (100%) rename {TekScope => labscript_devices/TekScope}/labscript_devices.py (100%) rename {TekScope => labscript_devices/TekScope}/register_classes.py (100%) rename {ZaberStageController => labscript_devices/ZaberStageController}/__init__.py (100%) rename {ZaberStageController => labscript_devices/ZaberStageController}/blacs_tabs.py (100%) rename {ZaberStageController => labscript_devices/ZaberStageController}/blacs_workers.py (100%) rename {ZaberStageController => labscript_devices/ZaberStageController}/labscript_devices.py (100%) rename {ZaberStageController => labscript_devices/ZaberStageController}/register_classes.py (100%) rename {ZaberStageController => labscript_devices/ZaberStageController}/testing/test.py (100%) rename {ZaberStageController => labscript_devices/ZaberStageController}/utils.py (100%) rename __init__.py => labscript_devices/__init__.py (100%) rename atsapi.py => labscript_devices/atsapi.py (100%) rename camera.ui => labscript_devices/camera.ui (100%) rename imaqdx_server.py => labscript_devices/imaqdx_server.py (100%) rename phasematrixquicksyn.ui => labscript_devices/phasematrixquicksyn.ui (100%) rename pulseblaster.ui => labscript_devices/pulseblaster.ui (100%) rename spec => labscript_devices/spec (100%) rename test_device.py => labscript_devices/test_device.py (100%) diff --git a/AlazarTechBoard.py b/labscript_devices/AlazarTechBoard.py similarity index 100% rename from AlazarTechBoard.py rename to labscript_devices/AlazarTechBoard.py diff --git a/AndorSolis/__init__.py b/labscript_devices/AndorSolis/__init__.py similarity index 100% rename from AndorSolis/__init__.py rename to labscript_devices/AndorSolis/__init__.py diff --git a/AndorSolis/andor_sdk/andor_capabilities.py b/labscript_devices/AndorSolis/andor_sdk/andor_capabilities.py similarity index 100% rename from AndorSolis/andor_sdk/andor_capabilities.py rename to labscript_devices/AndorSolis/andor_sdk/andor_capabilities.py diff --git a/AndorSolis/andor_sdk/andor_solis.py b/labscript_devices/AndorSolis/andor_sdk/andor_solis.py similarity index 100% rename from AndorSolis/andor_sdk/andor_solis.py rename to labscript_devices/AndorSolis/andor_sdk/andor_solis.py diff --git a/AndorSolis/andor_sdk/andor_structures.py b/labscript_devices/AndorSolis/andor_sdk/andor_structures.py similarity index 100% rename from AndorSolis/andor_sdk/andor_structures.py rename to labscript_devices/AndorSolis/andor_sdk/andor_structures.py diff --git a/AndorSolis/andor_sdk/andor_utils.py b/labscript_devices/AndorSolis/andor_sdk/andor_utils.py similarity index 100% rename from AndorSolis/andor_sdk/andor_utils.py rename to labscript_devices/AndorSolis/andor_sdk/andor_utils.py diff --git a/AndorSolis/andor_sdk/status_codes.py b/labscript_devices/AndorSolis/andor_sdk/status_codes.py similarity index 100% rename from AndorSolis/andor_sdk/status_codes.py rename to labscript_devices/AndorSolis/andor_sdk/status_codes.py diff --git a/AndorSolis/blacs_tabs.py b/labscript_devices/AndorSolis/blacs_tabs.py similarity index 100% rename from AndorSolis/blacs_tabs.py rename to labscript_devices/AndorSolis/blacs_tabs.py diff --git a/AndorSolis/blacs_workers.py b/labscript_devices/AndorSolis/blacs_workers.py similarity index 100% rename from AndorSolis/blacs_workers.py rename to labscript_devices/AndorSolis/blacs_workers.py diff --git a/AndorSolis/labscript_devices.py b/labscript_devices/AndorSolis/labscript_devices.py similarity index 100% rename from AndorSolis/labscript_devices.py rename to labscript_devices/AndorSolis/labscript_devices.py diff --git a/AndorSolis/register_classes.py b/labscript_devices/AndorSolis/register_classes.py similarity index 100% rename from AndorSolis/register_classes.py rename to labscript_devices/AndorSolis/register_classes.py diff --git a/Camera.py b/labscript_devices/Camera.py similarity index 100% rename from Camera.py rename to labscript_devices/Camera.py diff --git a/CiceroOpalKellyXEM3001.py b/labscript_devices/CiceroOpalKellyXEM3001.py similarity index 100% rename from CiceroOpalKellyXEM3001.py rename to labscript_devices/CiceroOpalKellyXEM3001.py diff --git a/DummyIntermediateDevice.py b/labscript_devices/DummyIntermediateDevice.py similarity index 100% rename from DummyIntermediateDevice.py rename to labscript_devices/DummyIntermediateDevice.py diff --git a/DummyPseudoclock/__init__.py b/labscript_devices/DummyPseudoclock/__init__.py similarity index 100% rename from DummyPseudoclock/__init__.py rename to labscript_devices/DummyPseudoclock/__init__.py diff --git a/DummyPseudoclock/blacs_tabs.py b/labscript_devices/DummyPseudoclock/blacs_tabs.py similarity index 100% rename from DummyPseudoclock/blacs_tabs.py rename to labscript_devices/DummyPseudoclock/blacs_tabs.py diff --git a/DummyPseudoclock/blacs_workers.py b/labscript_devices/DummyPseudoclock/blacs_workers.py similarity index 100% rename from DummyPseudoclock/blacs_workers.py rename to labscript_devices/DummyPseudoclock/blacs_workers.py diff --git a/DummyPseudoclock/labscript_devices.py b/labscript_devices/DummyPseudoclock/labscript_devices.py similarity index 100% rename from DummyPseudoclock/labscript_devices.py rename to labscript_devices/DummyPseudoclock/labscript_devices.py diff --git a/DummyPseudoclock/register_classes.py b/labscript_devices/DummyPseudoclock/register_classes.py similarity index 100% rename from DummyPseudoclock/register_classes.py rename to labscript_devices/DummyPseudoclock/register_classes.py diff --git a/FlyCapture2Camera/__init__.py b/labscript_devices/FlyCapture2Camera/__init__.py similarity index 100% rename from FlyCapture2Camera/__init__.py rename to labscript_devices/FlyCapture2Camera/__init__.py diff --git a/FlyCapture2Camera/blacs_tabs.py b/labscript_devices/FlyCapture2Camera/blacs_tabs.py similarity index 100% rename from FlyCapture2Camera/blacs_tabs.py rename to labscript_devices/FlyCapture2Camera/blacs_tabs.py diff --git a/FlyCapture2Camera/blacs_workers.py b/labscript_devices/FlyCapture2Camera/blacs_workers.py similarity index 100% rename from FlyCapture2Camera/blacs_workers.py rename to labscript_devices/FlyCapture2Camera/blacs_workers.py diff --git a/FlyCapture2Camera/labscript_devices.py b/labscript_devices/FlyCapture2Camera/labscript_devices.py similarity index 100% rename from FlyCapture2Camera/labscript_devices.py rename to labscript_devices/FlyCapture2Camera/labscript_devices.py diff --git a/FlyCapture2Camera/register_classes.py b/labscript_devices/FlyCapture2Camera/register_classes.py similarity index 100% rename from FlyCapture2Camera/register_classes.py rename to labscript_devices/FlyCapture2Camera/register_classes.py diff --git a/FunctionRunner/__init__.py b/labscript_devices/FunctionRunner/__init__.py similarity index 100% rename from FunctionRunner/__init__.py rename to labscript_devices/FunctionRunner/__init__.py diff --git a/FunctionRunner/blacs_tabs.py b/labscript_devices/FunctionRunner/blacs_tabs.py similarity index 100% rename from FunctionRunner/blacs_tabs.py rename to labscript_devices/FunctionRunner/blacs_tabs.py diff --git a/FunctionRunner/blacs_workers.py b/labscript_devices/FunctionRunner/blacs_workers.py similarity index 100% rename from FunctionRunner/blacs_workers.py rename to labscript_devices/FunctionRunner/blacs_workers.py diff --git a/FunctionRunner/labscript_devices.py b/labscript_devices/FunctionRunner/labscript_devices.py similarity index 100% rename from FunctionRunner/labscript_devices.py rename to labscript_devices/FunctionRunner/labscript_devices.py diff --git a/FunctionRunner/register_classes.py b/labscript_devices/FunctionRunner/register_classes.py similarity index 100% rename from FunctionRunner/register_classes.py rename to labscript_devices/FunctionRunner/register_classes.py diff --git a/FunctionRunner/testing/test.py b/labscript_devices/FunctionRunner/testing/test.py similarity index 100% rename from FunctionRunner/testing/test.py rename to labscript_devices/FunctionRunner/testing/test.py diff --git a/FunctionRunner/utils.py b/labscript_devices/FunctionRunner/utils.py similarity index 100% rename from FunctionRunner/utils.py rename to labscript_devices/FunctionRunner/utils.py diff --git a/IMAQdxCamera/__init__.py b/labscript_devices/IMAQdxCamera/__init__.py similarity index 100% rename from IMAQdxCamera/__init__.py rename to labscript_devices/IMAQdxCamera/__init__.py diff --git a/IMAQdxCamera/attributes_dialog.ui b/labscript_devices/IMAQdxCamera/attributes_dialog.ui similarity index 100% rename from IMAQdxCamera/attributes_dialog.ui rename to labscript_devices/IMAQdxCamera/attributes_dialog.ui diff --git a/IMAQdxCamera/blacs_tab.ui b/labscript_devices/IMAQdxCamera/blacs_tab.ui similarity index 100% rename from IMAQdxCamera/blacs_tab.ui rename to labscript_devices/IMAQdxCamera/blacs_tab.ui diff --git a/IMAQdxCamera/blacs_tabs.py b/labscript_devices/IMAQdxCamera/blacs_tabs.py similarity index 100% rename from IMAQdxCamera/blacs_tabs.py rename to labscript_devices/IMAQdxCamera/blacs_tabs.py diff --git a/IMAQdxCamera/blacs_workers.py b/labscript_devices/IMAQdxCamera/blacs_workers.py similarity index 100% rename from IMAQdxCamera/blacs_workers.py rename to labscript_devices/IMAQdxCamera/blacs_workers.py diff --git a/IMAQdxCamera/labscript_devices.py b/labscript_devices/IMAQdxCamera/labscript_devices.py similarity index 100% rename from IMAQdxCamera/labscript_devices.py rename to labscript_devices/IMAQdxCamera/labscript_devices.py diff --git a/IMAQdxCamera/register_classes.py b/labscript_devices/IMAQdxCamera/register_classes.py similarity index 100% rename from IMAQdxCamera/register_classes.py rename to labscript_devices/IMAQdxCamera/register_classes.py diff --git a/IMAQdxCamera/testing/test.py b/labscript_devices/IMAQdxCamera/testing/test.py similarity index 100% rename from IMAQdxCamera/testing/test.py rename to labscript_devices/IMAQdxCamera/testing/test.py diff --git a/LightCrafterDMD.py b/labscript_devices/LightCrafterDMD.py similarity index 100% rename from LightCrafterDMD.py rename to labscript_devices/LightCrafterDMD.py diff --git a/NI_DAQmx/__init__.py b/labscript_devices/NI_DAQmx/__init__.py similarity index 100% rename from NI_DAQmx/__init__.py rename to labscript_devices/NI_DAQmx/__init__.py diff --git a/NI_DAQmx/blacs_tabs.py b/labscript_devices/NI_DAQmx/blacs_tabs.py similarity index 100% rename from NI_DAQmx/blacs_tabs.py rename to labscript_devices/NI_DAQmx/blacs_tabs.py diff --git a/NI_DAQmx/blacs_workers.py b/labscript_devices/NI_DAQmx/blacs_workers.py similarity index 100% rename from NI_DAQmx/blacs_workers.py rename to labscript_devices/NI_DAQmx/blacs_workers.py diff --git a/NI_DAQmx/daqmx_utils.py b/labscript_devices/NI_DAQmx/daqmx_utils.py similarity index 100% rename from NI_DAQmx/daqmx_utils.py rename to labscript_devices/NI_DAQmx/daqmx_utils.py diff --git a/NI_DAQmx/labscript_devices.py b/labscript_devices/NI_DAQmx/labscript_devices.py similarity index 100% rename from NI_DAQmx/labscript_devices.py rename to labscript_devices/NI_DAQmx/labscript_devices.py diff --git a/NI_DAQmx/models/NI_PCI_6251.py b/labscript_devices/NI_DAQmx/models/NI_PCI_6251.py similarity index 100% rename from NI_DAQmx/models/NI_PCI_6251.py rename to labscript_devices/NI_DAQmx/models/NI_PCI_6251.py diff --git a/NI_DAQmx/models/NI_PCI_6534.py b/labscript_devices/NI_DAQmx/models/NI_PCI_6534.py similarity index 100% rename from NI_DAQmx/models/NI_PCI_6534.py rename to labscript_devices/NI_DAQmx/models/NI_PCI_6534.py diff --git a/NI_DAQmx/models/NI_PCI_6713.py b/labscript_devices/NI_DAQmx/models/NI_PCI_6713.py similarity index 100% rename from NI_DAQmx/models/NI_PCI_6713.py rename to labscript_devices/NI_DAQmx/models/NI_PCI_6713.py diff --git a/NI_DAQmx/models/NI_PCI_6733.py b/labscript_devices/NI_DAQmx/models/NI_PCI_6733.py similarity index 100% rename from NI_DAQmx/models/NI_PCI_6733.py rename to labscript_devices/NI_DAQmx/models/NI_PCI_6733.py diff --git a/NI_DAQmx/models/NI_PCI_DIO_32HS.py b/labscript_devices/NI_DAQmx/models/NI_PCI_DIO_32HS.py similarity index 100% rename from NI_DAQmx/models/NI_PCI_DIO_32HS.py rename to labscript_devices/NI_DAQmx/models/NI_PCI_DIO_32HS.py diff --git a/NI_DAQmx/models/NI_PCIe_6363.py b/labscript_devices/NI_DAQmx/models/NI_PCIe_6363.py similarity index 100% rename from NI_DAQmx/models/NI_PCIe_6363.py rename to labscript_devices/NI_DAQmx/models/NI_PCIe_6363.py diff --git a/NI_DAQmx/models/NI_PCIe_6738.py b/labscript_devices/NI_DAQmx/models/NI_PCIe_6738.py similarity index 100% rename from NI_DAQmx/models/NI_PCIe_6738.py rename to labscript_devices/NI_DAQmx/models/NI_PCIe_6738.py diff --git a/NI_DAQmx/models/NI_PXI_6733.py b/labscript_devices/NI_DAQmx/models/NI_PXI_6733.py similarity index 100% rename from NI_DAQmx/models/NI_PXI_6733.py rename to labscript_devices/NI_DAQmx/models/NI_PXI_6733.py diff --git a/NI_DAQmx/models/NI_PXIe_6361.py b/labscript_devices/NI_DAQmx/models/NI_PXIe_6361.py similarity index 100% rename from NI_DAQmx/models/NI_PXIe_6361.py rename to labscript_devices/NI_DAQmx/models/NI_PXIe_6361.py diff --git a/NI_DAQmx/models/NI_PXIe_6535.py b/labscript_devices/NI_DAQmx/models/NI_PXIe_6535.py similarity index 100% rename from NI_DAQmx/models/NI_PXIe_6535.py rename to labscript_devices/NI_DAQmx/models/NI_PXIe_6535.py diff --git a/NI_DAQmx/models/NI_PXIe_6738.py b/labscript_devices/NI_DAQmx/models/NI_PXIe_6738.py similarity index 100% rename from NI_DAQmx/models/NI_PXIe_6738.py rename to labscript_devices/NI_DAQmx/models/NI_PXIe_6738.py diff --git a/NI_DAQmx/models/NI_USB_6008.py b/labscript_devices/NI_DAQmx/models/NI_USB_6008.py similarity index 100% rename from NI_DAQmx/models/NI_USB_6008.py rename to labscript_devices/NI_DAQmx/models/NI_USB_6008.py diff --git a/NI_DAQmx/models/NI_USB_6229.py b/labscript_devices/NI_DAQmx/models/NI_USB_6229.py similarity index 100% rename from NI_DAQmx/models/NI_USB_6229.py rename to labscript_devices/NI_DAQmx/models/NI_USB_6229.py diff --git a/NI_DAQmx/models/NI_USB_6343.py b/labscript_devices/NI_DAQmx/models/NI_USB_6343.py similarity index 100% rename from NI_DAQmx/models/NI_USB_6343.py rename to labscript_devices/NI_DAQmx/models/NI_USB_6343.py diff --git a/NI_DAQmx/models/README.txt b/labscript_devices/NI_DAQmx/models/README.txt similarity index 100% rename from NI_DAQmx/models/README.txt rename to labscript_devices/NI_DAQmx/models/README.txt diff --git a/NI_DAQmx/models/__init__.py b/labscript_devices/NI_DAQmx/models/__init__.py similarity index 100% rename from NI_DAQmx/models/__init__.py rename to labscript_devices/NI_DAQmx/models/__init__.py diff --git a/NI_DAQmx/models/_subclass_template.py b/labscript_devices/NI_DAQmx/models/_subclass_template.py similarity index 100% rename from NI_DAQmx/models/_subclass_template.py rename to labscript_devices/NI_DAQmx/models/_subclass_template.py diff --git a/NI_DAQmx/models/capabilities.json b/labscript_devices/NI_DAQmx/models/capabilities.json similarity index 100% rename from NI_DAQmx/models/capabilities.json rename to labscript_devices/NI_DAQmx/models/capabilities.json diff --git a/NI_DAQmx/models/generate_subclasses.py b/labscript_devices/NI_DAQmx/models/generate_subclasses.py similarity index 100% rename from NI_DAQmx/models/generate_subclasses.py rename to labscript_devices/NI_DAQmx/models/generate_subclasses.py diff --git a/NI_DAQmx/models/get_capabilities.py b/labscript_devices/NI_DAQmx/models/get_capabilities.py similarity index 100% rename from NI_DAQmx/models/get_capabilities.py rename to labscript_devices/NI_DAQmx/models/get_capabilities.py diff --git a/NI_DAQmx/register_classes.py b/labscript_devices/NI_DAQmx/register_classes.py similarity index 100% rename from NI_DAQmx/register_classes.py rename to labscript_devices/NI_DAQmx/register_classes.py diff --git a/NI_DAQmx/runviewer_parsers.py b/labscript_devices/NI_DAQmx/runviewer_parsers.py similarity index 100% rename from NI_DAQmx/runviewer_parsers.py rename to labscript_devices/NI_DAQmx/runviewer_parsers.py diff --git a/NI_DAQmx/testing/test_NI_DAQmx_labscript.py b/labscript_devices/NI_DAQmx/testing/test_NI_DAQmx_labscript.py similarity index 100% rename from NI_DAQmx/testing/test_NI_DAQmx_labscript.py rename to labscript_devices/NI_DAQmx/testing/test_NI_DAQmx_labscript.py diff --git a/NI_DAQmx/utils.py b/labscript_devices/NI_DAQmx/utils.py similarity index 100% rename from NI_DAQmx/utils.py rename to labscript_devices/NI_DAQmx/utils.py diff --git a/NI_PCI_6733.py b/labscript_devices/NI_PCI_6733.py similarity index 100% rename from NI_PCI_6733.py rename to labscript_devices/NI_PCI_6733.py diff --git a/NI_PCIe_6363.py b/labscript_devices/NI_PCIe_6363.py similarity index 100% rename from NI_PCIe_6363.py rename to labscript_devices/NI_PCIe_6363.py diff --git a/NI_USB_6343.py b/labscript_devices/NI_USB_6343.py similarity index 100% rename from NI_USB_6343.py rename to labscript_devices/NI_USB_6343.py diff --git a/NovaTechDDS9M.py b/labscript_devices/NovaTechDDS9M.py similarity index 100% rename from NovaTechDDS9M.py rename to labscript_devices/NovaTechDDS9M.py diff --git a/PhaseMatrixQuickSyn.py b/labscript_devices/PhaseMatrixQuickSyn.py similarity index 100% rename from PhaseMatrixQuickSyn.py rename to labscript_devices/PhaseMatrixQuickSyn.py diff --git a/PineBlaster.py b/labscript_devices/PineBlaster.py similarity index 100% rename from PineBlaster.py rename to labscript_devices/PineBlaster.py diff --git a/PulseBlaster.py b/labscript_devices/PulseBlaster.py similarity index 100% rename from PulseBlaster.py rename to labscript_devices/PulseBlaster.py diff --git a/PulseBlasterESRPro200.py b/labscript_devices/PulseBlasterESRPro200.py similarity index 100% rename from PulseBlasterESRPro200.py rename to labscript_devices/PulseBlasterESRPro200.py diff --git a/PulseBlasterESRPro500.py b/labscript_devices/PulseBlasterESRPro500.py similarity index 100% rename from PulseBlasterESRPro500.py rename to labscript_devices/PulseBlasterESRPro500.py diff --git a/PulseBlasterUSB.py b/labscript_devices/PulseBlasterUSB.py similarity index 100% rename from PulseBlasterUSB.py rename to labscript_devices/PulseBlasterUSB.py diff --git a/PulseBlaster_No_DDS.py b/labscript_devices/PulseBlaster_No_DDS.py similarity index 100% rename from PulseBlaster_No_DDS.py rename to labscript_devices/PulseBlaster_No_DDS.py diff --git a/PulseBlaster_SP2_24_100_32k.py b/labscript_devices/PulseBlaster_SP2_24_100_32k.py similarity index 100% rename from PulseBlaster_SP2_24_100_32k.py rename to labscript_devices/PulseBlaster_SP2_24_100_32k.py diff --git a/PylonCamera/__init__.py b/labscript_devices/PylonCamera/__init__.py similarity index 100% rename from PylonCamera/__init__.py rename to labscript_devices/PylonCamera/__init__.py diff --git a/PylonCamera/blacs_tabs.py b/labscript_devices/PylonCamera/blacs_tabs.py similarity index 100% rename from PylonCamera/blacs_tabs.py rename to labscript_devices/PylonCamera/blacs_tabs.py diff --git a/PylonCamera/blacs_workers.py b/labscript_devices/PylonCamera/blacs_workers.py similarity index 100% rename from PylonCamera/blacs_workers.py rename to labscript_devices/PylonCamera/blacs_workers.py diff --git a/PylonCamera/labscript_devices.py b/labscript_devices/PylonCamera/labscript_devices.py similarity index 100% rename from PylonCamera/labscript_devices.py rename to labscript_devices/PylonCamera/labscript_devices.py diff --git a/PylonCamera/register_classes.py b/labscript_devices/PylonCamera/register_classes.py similarity index 100% rename from PylonCamera/register_classes.py rename to labscript_devices/PylonCamera/register_classes.py diff --git a/PylonCamera/testing/ExposureTiming.py b/labscript_devices/PylonCamera/testing/ExposureTiming.py similarity index 100% rename from PylonCamera/testing/ExposureTiming.py rename to labscript_devices/PylonCamera/testing/ExposureTiming.py diff --git a/PythonCamera.py b/labscript_devices/PythonCamera.py similarity index 100% rename from PythonCamera.py rename to labscript_devices/PythonCamera.py diff --git a/RFBlaster.py b/labscript_devices/RFBlaster.py similarity index 100% rename from RFBlaster.py rename to labscript_devices/RFBlaster.py diff --git a/TekScope/TekScope.py b/labscript_devices/TekScope/TekScope.py similarity index 100% rename from TekScope/TekScope.py rename to labscript_devices/TekScope/TekScope.py diff --git a/TekScope/__init__.py b/labscript_devices/TekScope/__init__.py similarity index 100% rename from TekScope/__init__.py rename to labscript_devices/TekScope/__init__.py diff --git a/TekScope/blacs_tabs.py b/labscript_devices/TekScope/blacs_tabs.py similarity index 100% rename from TekScope/blacs_tabs.py rename to labscript_devices/TekScope/blacs_tabs.py diff --git a/TekScope/blacs_workers.py b/labscript_devices/TekScope/blacs_workers.py similarity index 100% rename from TekScope/blacs_workers.py rename to labscript_devices/TekScope/blacs_workers.py diff --git a/TekScope/labscript_devices.py b/labscript_devices/TekScope/labscript_devices.py similarity index 100% rename from TekScope/labscript_devices.py rename to labscript_devices/TekScope/labscript_devices.py diff --git a/TekScope/register_classes.py b/labscript_devices/TekScope/register_classes.py similarity index 100% rename from TekScope/register_classes.py rename to labscript_devices/TekScope/register_classes.py diff --git a/ZaberStageController/__init__.py b/labscript_devices/ZaberStageController/__init__.py similarity index 100% rename from ZaberStageController/__init__.py rename to labscript_devices/ZaberStageController/__init__.py diff --git a/ZaberStageController/blacs_tabs.py b/labscript_devices/ZaberStageController/blacs_tabs.py similarity index 100% rename from ZaberStageController/blacs_tabs.py rename to labscript_devices/ZaberStageController/blacs_tabs.py diff --git a/ZaberStageController/blacs_workers.py b/labscript_devices/ZaberStageController/blacs_workers.py similarity index 100% rename from ZaberStageController/blacs_workers.py rename to labscript_devices/ZaberStageController/blacs_workers.py diff --git a/ZaberStageController/labscript_devices.py b/labscript_devices/ZaberStageController/labscript_devices.py similarity index 100% rename from ZaberStageController/labscript_devices.py rename to labscript_devices/ZaberStageController/labscript_devices.py diff --git a/ZaberStageController/register_classes.py b/labscript_devices/ZaberStageController/register_classes.py similarity index 100% rename from ZaberStageController/register_classes.py rename to labscript_devices/ZaberStageController/register_classes.py diff --git a/ZaberStageController/testing/test.py b/labscript_devices/ZaberStageController/testing/test.py similarity index 100% rename from ZaberStageController/testing/test.py rename to labscript_devices/ZaberStageController/testing/test.py diff --git a/ZaberStageController/utils.py b/labscript_devices/ZaberStageController/utils.py similarity index 100% rename from ZaberStageController/utils.py rename to labscript_devices/ZaberStageController/utils.py diff --git a/__init__.py b/labscript_devices/__init__.py similarity index 100% rename from __init__.py rename to labscript_devices/__init__.py diff --git a/atsapi.py b/labscript_devices/atsapi.py similarity index 100% rename from atsapi.py rename to labscript_devices/atsapi.py diff --git a/camera.ui b/labscript_devices/camera.ui similarity index 100% rename from camera.ui rename to labscript_devices/camera.ui diff --git a/imaqdx_server.py b/labscript_devices/imaqdx_server.py similarity index 100% rename from imaqdx_server.py rename to labscript_devices/imaqdx_server.py diff --git a/phasematrixquicksyn.ui b/labscript_devices/phasematrixquicksyn.ui similarity index 100% rename from phasematrixquicksyn.ui rename to labscript_devices/phasematrixquicksyn.ui diff --git a/pulseblaster.ui b/labscript_devices/pulseblaster.ui similarity index 100% rename from pulseblaster.ui rename to labscript_devices/pulseblaster.ui diff --git a/spec b/labscript_devices/spec similarity index 100% rename from spec rename to labscript_devices/spec diff --git a/test_device.py b/labscript_devices/test_device.py similarity index 100% rename from test_device.py rename to labscript_devices/test_device.py From 1feea029bc451d4e8bdbd0b39d2b86cc7d69a740 Mon Sep 17 00:00:00 2001 From: chrisjbillington Date: Tue, 25 Feb 2020 14:48:23 -0500 Subject: [PATCH 2/4] setup.py, license files, gitignore --- .gitignore | 4 ++ .hgignore | 2 - BSD-2-CLAUSE-LICENSE.txt | 22 ++++++++ BSD-3-CLAUSE-LICENSE.txt | 24 +++++++++ LICENSE.txt | 10 ++++ README.md | 9 ++++ labscript_devices/__init__.py | 2 +- labscript_devices/__version__.py | 1 + labscript_devices/spec | 8 --- setup.py | 89 ++++++++++++++++++++++++++++++++ 10 files changed, 160 insertions(+), 11 deletions(-) create mode 100644 .gitignore delete mode 100644 .hgignore create mode 100644 BSD-2-CLAUSE-LICENSE.txt create mode 100644 BSD-3-CLAUSE-LICENSE.txt create mode 100644 LICENSE.txt create mode 100644 README.md create mode 100644 labscript_devices/__version__.py delete mode 100644 labscript_devices/spec create mode 100644 setup.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..acb10853 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.pyc +.eggs/* +*.egg-info/ +dist \ No newline at end of file diff --git a/.hgignore b/.hgignore deleted file mode 100644 index 2c9154d3..00000000 --- a/.hgignore +++ /dev/null @@ -1,2 +0,0 @@ -syntax: glob -*.pyc diff --git a/BSD-2-CLAUSE-LICENSE.txt b/BSD-2-CLAUSE-LICENSE.txt new file mode 100644 index 00000000..1f6fd80d --- /dev/null +++ b/BSD-2-CLAUSE-LICENSE.txt @@ -0,0 +1,22 @@ +Copyright (c) 2013, Monash University +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/BSD-3-CLAUSE-LICENSE.txt b/BSD-3-CLAUSE-LICENSE.txt new file mode 100644 index 00000000..3f397cbd --- /dev/null +++ b/BSD-3-CLAUSE-LICENSE.txt @@ -0,0 +1,24 @@ +Copyright (c) 2013, Monash University +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of the nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..62aa44cf --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,10 @@ +Copyright (c) 2013, Monash University +All rights reserved. + +This project (labscript_devices) is dual licensed under the 2-clause BSD license and 3-clause BSD license (see the files BSD-2-CLAUSE-LICENSE.txt and BSD-3-CLAUSE-LICENSE.txt), subject to the following conditions: + +1) If you wish to use this project with PySide and/or a commercial license of PyQt, the use of this project is governed by the terms of one of the licenses, chosen at your discretion. + +2) If you wish to use this project with the free (GPLv2 or GPLv3 licensed) version of PyQt, the use of this project is governed by the terms of the 3-clause BSD license only, along with the terms specified in the GPL_EXCEPTIONS.TXT file in the PyQt project source code. + +These terms are in place to guarantee compatibility with the terms outlined in the GPL License Exceptions of the PyQt project (see the GPL_EXCEPTIONS.TXT file in the source code of the PyQt project) \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 00000000..127d72aa --- /dev/null +++ b/README.md @@ -0,0 +1,9 @@ +# labscript_devices + +Device drivers for the labscript suite + +( +[view on Github](https://github.com/labscript-suite/labscript_devices) +) + + diff --git a/labscript_devices/__init__.py b/labscript_devices/__init__.py index ad6b30c1..82718be4 100644 --- a/labscript_devices/__init__.py +++ b/labscript_devices/__init__.py @@ -21,7 +21,7 @@ from labscript_utils import labscript_suite_install_dir, dedent from labscript_utils.labconfig import LabConfig -__version__ = '2.6.0' +from .__version__ import __version__ check_version('qtutils', '2.0.0', '3.0.0') check_version('labscript', '2.6', '3') diff --git a/labscript_devices/__version__.py b/labscript_devices/__version__.py new file mode 100644 index 00000000..28a27058 --- /dev/null +++ b/labscript_devices/__version__.py @@ -0,0 +1 @@ +__version__ = '2.7.0.dev0' \ No newline at end of file diff --git a/labscript_devices/spec b/labscript_devices/spec deleted file mode 100644 index 40371c5f..00000000 --- a/labscript_devices/spec +++ /dev/null @@ -1,8 +0,0 @@ -- worker classes - provide function to look up based on BLACS tab instance: - - enforce that there must be a worker defined - -- all classes - provide function to look up based on module name / labscript class name (identical) - -- labscript class decorator: enforce module name must equal class name - -- other class decorators: add classes to lookup dictionary in labscipt_devices diff --git a/setup.py b/setup.py new file mode 100644 index 00000000..321e4735 --- /dev/null +++ b/setup.py @@ -0,0 +1,89 @@ +# USAGE NOTES +# +# Make a PyPI release tarball with: +# +# python setup.py sdist +# +# Upload to test PyPI with: +# +# twine upload --repository-url https://test.pypi.org/legacy/ dist/* +# +# Install from test PyPI with: +# +# pip install --index-url https://test.pypi.org/simple/ labscript_devices +# +# Upload to real PyPI with: +# +# twine upload dist/* +# +# Build conda packages for all platforms (in a conda environment with setuptools_conda +# installed) with: +# +# python setup.py dist_conda +# +# Upoad to your own account (for testing) on anaconda cloud (in a conda environment with +# anaconda-client installed) with: +# +# anaconda upload --skip-existing conda_packages/*/* +# +# (Trickier on Windows, as it won't expand the wildcards) +# +# Upoad to the labscript-suite organisation's channel on anaconda cloud (in a +# conda environment with anaconda-client installed) with: +# +# anaconda upload -u labscript-suite --skip-existing conda_packages/*/* +# +# If you need to rebuild the same version of the package for conda due to a packaging +# issue, you must increment CONDA_BUILD_NUMBER in order to create a unique version on +# anaconda cloud. When subsequently releasing a new version of the package, +# CONDA_BUILD_NUMBER should be reset to zero. + +import os +from setuptools import setup +from runpy import run_path + +try: + from setuptools_conda import dist_conda +except ImportError: + dist_conda = None + +SETUP_REQUIRES = ['setuptools', 'setuptools_scm'] + +INSTALL_REQUIRES = [ + "labscript_utils >= 2.13.2", + "blacs >= 2.7.0", + "labscript >= 2.6.0", + "qtutils >=2.2.3", + "zprocess >=2.18.0", + "numpy >=1.15.1", + "pyserial", + # PyDAQmx + # PyNIVision + # spinapi +] + +setup( + name='labscript_devices', + version=run_path(os.path.join('labscript_devices', '__version__.py'))['__version__'], + description="Device drivers for the labscript suite", + long_description=open('README.md').read(), + long_description_content_type='text/markdown', + author='The labscript suite community', + author_email='labscriptsuite@googlegroups.com ', + url='http://labscriptsuite.org', + license="BSD", + packages=["labscript_devices"], + zip_safe=False, + setup_requires=SETUP_REQUIRES, + include_package_data=True, + python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5", + install_requires=INSTALL_REQUIRES if 'CONDA_BUILD' not in os.environ else [], + cmdclass={'dist_conda': dist_conda} if dist_conda is not None else {}, + command_options={ + 'dist_conda': { + 'pythons': (__file__, ['3.6', '3.7', '3.8']), + 'platforms': (__file__, ['linux-64', 'win-32', 'win-64', 'osx-64']), + 'force_conversion': (__file__, True), + }, + }, +) From 5c657468ed865559b162450ea9168276a10a5465 Mon Sep 17 00:00:00 2001 From: chrisjbillington Date: Wed, 1 Apr 2020 12:49:39 -0400 Subject: [PATCH 3/4] Add pillow requirement --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index 321e4735..ab921564 100644 --- a/setup.py +++ b/setup.py @@ -49,6 +49,7 @@ SETUP_REQUIRES = ['setuptools', 'setuptools_scm'] +# TODO: Add commented-out requirements once they are on conda: INSTALL_REQUIRES = [ "labscript_utils >= 2.13.2", "blacs >= 2.7.0", @@ -57,6 +58,7 @@ "zprocess >=2.18.0", "numpy >=1.15.1", "pyserial", + "pillow", # PyDAQmx # PyNIVision # spinapi From 5b3c2461cfcdeb8aa1027c9350e1df574122b5a8 Mon Sep 17 00:00:00 2001 From: chrisjbillington Date: Thu, 16 Apr 2020 15:50:47 -0400 Subject: [PATCH 4/4] Dev version bump for test PyPI --- labscript_devices/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/labscript_devices/__version__.py b/labscript_devices/__version__.py index 28a27058..95a2dc91 100644 --- a/labscript_devices/__version__.py +++ b/labscript_devices/__version__.py @@ -1 +1 @@ -__version__ = '2.7.0.dev0' \ No newline at end of file +__version__ = '2.7.0.dev1' \ No newline at end of file