Merge branch 'main' into devel-1.1.x

changelog

@@ -7,10 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [1.1.0] - 2024-04-09
+## [1.1.0] - 2024-08-28
 
 ### Added
 - Additional HEPHY EnvironBox commands for driver and emulator (#74).
+- Generic base classes `PowerSupply` and `PowerSupplyChannel` and `LightSource`.
+- Rhode&Schwarz NGE100 power supply (#77).
+- Photonic F3000 LED light source (#75).
+
+### Removed
+- Dropped support for Python 3.8
 
 ## [1.0.0] - 2024-03-26
 

docs/index.md

@@ -14,5 +14,5 @@ utilities for instrumentation applications. Inspired by
 Install from GitHub using pip
 
 ```bash
-pip install git+https://github.com/hephy-dd/comet.git@1.0.0
+pip install git+https://github.com/hephy-dd/comet.git@v1.1.0
 ```

mkdocs.yml

@@ -15,4 +15,4 @@ theme:
     highlightjs: true
 extra_css: [extra.css]
 extra:
-    version: 1.0.0
+    version: 1.1.0

mypy.ini

@@ -0,0 +1,7 @@
+[mypy]
+
+[mypy-pint.*]
+ignore_missing_imports = True
+
+[mypy-schema.*]
+ignore_missing_imports = True

pyproject.toml

@@ -1,3 +1,32 @@
+[project]
+name = "comet"
+description = "Control and Measurement Toolkit"
+authors = [
+  {name = "Bernhard Arnold", email = "[email protected]"},
+]
+readme = "README.md"
+license = {text = "GPLv3"}
+requires-python = ">=3.9"
+dependencies = [
+    "PyVISA",
+    "PyVISA-py",
+    "PyVISA-sim",
+    "pyserial",
+    "pyusb",
+    "numpy",
+    "pint",
+    "schema",
+    "PyYAML",
+]
+dynamic = ["version"]
+
+[project.urls]
+Homepage = "https://github.com/hephy-dd/comet/"
+Source = "https://github.com/hephy-dd/comet/"
+
 [build-system]
-requires = ["setuptools"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+path = "src/comet/__init__.py"

src/comet/driver/generic/__init__.py

@@ -1,8 +1,8 @@
 from .instrument import (
-    InstrumentError,
     BeeperMixin,
     ErrorQueueMixin,
     RouteTerminalMixin,
+    InstrumentError,
     Instrument,
 )
 from .source_meter_unit import SourceMeterUnit
@@ -13,4 +13,19 @@
     MotionController,
     MotionControllerAxis,
 )
-from .light_source import LightSource
+from .light_source import LightSource
+
+__all__ = [
+    "BeeperMixin",
+    "ErrorQueueMixin",
+    "RouteTerminalMixin",
+    "InstrumentError",
+    "Instrument",
+    "SourceMeterUnit",
+    "Electrometer",
+    "LCRMeter",
+    "SwitchingMatrix",
+    "MotionController",
+    "MotionControllerAxis",
+    "LightSource",
+]

src/comet/driver/generic/electrometer.py

@@ -9,17 +9,13 @@ class Electrometer(Instrument):
     # Measurements
 
     @abstractmethod
-    def measure_voltage(self) -> float:
-        ...
+    def measure_voltage(self) -> float: ...
 
     @abstractmethod
-    def measure_current(self) -> float:
-        ...
+    def measure_current(self) -> float: ...
 
     @abstractmethod
-    def measure_resistance(self) -> float:
-        ...
+    def measure_resistance(self) -> float: ...
 
     @abstractmethod
-    def measure_charge(self) -> float:
-        ...
+    def measure_charge(self) -> float: ...

src/comet/driver/generic/instrument.py

@@ -1,12 +1,15 @@
 from abc import ABC, abstractmethod
-from typing import List, Iterable, Optional, Tuple
+from typing import Optional
 
 from ..driver import Driver
 
 __all__ = [
     "InstrumentError",
-    "BeeperMixin",
+    "IdentifyMixin",
+    "ResetMixin",
+    "ClearMixin",
     "ErrorQueueMixin",
+    "BeeperMixin",
     "RouteTerminalMixin",
     "Instrument",
 ]
@@ -23,55 +26,56 @@ def __repr__(self) -> str:
         return f"{cls_name}({self.code}, {self.message!r})"
 
 
-class BeeperMixin(ABC):
+class IdentifyMixin(ABC):
 
-    BEEPER_ON: bool = True
-    BEEPER_OFF: bool = False
+    @abstractmethod
+    def identify(self) -> str: ...
+
+
+class ResetMixin(ABC):
 
-    @property  # type: ignore
     @abstractmethod
-    def beeper(self) -> bool:
-        ...
+    def reset(self) -> None: ...
+
+
+class ClearMixin(ABC):
 
-    @beeper.setter  # type: ignore
     @abstractmethod
-    def beeper(self, value: bool) -> None:
-        ...
+    def clear(self) -> None: ...
 
 
 class ErrorQueueMixin(ABC):
 
     @abstractmethod
-    def next_error(self) -> Optional[InstrumentError]:
-        ...
+    def next_error(self) -> Optional[InstrumentError]: ...
 
 
-class RouteTerminalMixin(ABC):
+class BeeperMixin(ABC):
 
-    ROUTE_TERMINAL_FRONT: str = "front"
-    ROUTE_TERMINAL_REAR: str = "rear"
+    BEEPER_ON: bool = True
+    BEEPER_OFF: bool = False
 
-    @property  # type: ignore
+    @property
     @abstractmethod
-    def route_terminal(self) -> str:
-        ...
+    def beeper(self) -> bool: ...
 
-    @route_terminal.setter  # type: ignore
+    @beeper.setter
     @abstractmethod
-    def route_terminal(self, route_terminal: str) -> None:
-        ...
+    def beeper(self, value: bool) -> None: ...
 
 
-class Instrument(ErrorQueueMixin, Driver):
+class RouteTerminalMixin(ABC):
 
-    @abstractmethod
-    def identify(self) -> str:
-        ...
+    ROUTE_TERMINAL_FRONT: str = "front"
+    ROUTE_TERMINAL_REAR: str = "rear"
 
+    @property
     @abstractmethod
-    def reset(self) -> None:
-        ...
+    def route_terminal(self) -> str: ...
 
+    @route_terminal.setter
     @abstractmethod
-    def clear(self) -> None:
-        ...
+    def route_terminal(self, route_terminal: str) -> None: ...
+
+
+class Instrument(IdentifyMixin, ResetMixin, ClearMixin, ErrorQueueMixin, Driver): ...

src/comet/driver/generic/lcr_meter.py

@@ -8,36 +8,29 @@
 
 class LCRMeter(Instrument):
 
-    @property  # type: ignore
+    @property
     @abstractmethod
-    def function(self) -> str:
-        ...
+    def function(self) -> str: ...
 
-    @function.setter  # type: ignore
+    @function.setter
     @abstractmethod
-    def function(self, function: str) -> None:
-        ...
+    def function(self, function: str) -> None: ...
 
-    @property  # type: ignore
+    @property
     @abstractmethod
-    def amplitude(self) -> float:
-        ...
+    def amplitude(self) -> float: ...
 
-    @amplitude.setter  # type: ignore
+    @amplitude.setter
     @abstractmethod
-    def amplitude(self, level: float) -> None:
-        ...
+    def amplitude(self, level: float) -> None: ...
 
-    @property  # type: ignore
+    @property
     @abstractmethod
-    def frequency(self) -> float:
-        ...
+    def frequency(self) -> float: ...
 
-    @frequency.setter  # type: ignore
+    @frequency.setter
     @abstractmethod
-    def frequency(self, frequency: float) -> None:
-        ...
+    def frequency(self, frequency: float) -> None: ...
 
     @abstractmethod
-    def measure_impedance(self) -> Tuple[float, float]:
-        ...
+    def measure_impedance(self) -> Tuple[float, float]: ...