add Sensor aliases to Supported

Author: avaldebe

.pre-commit-config.yaml

@@ -15,7 +15,7 @@ repos:
       exclude: ^tests/captured_data/PMS5003T.hexdump$
       args: [--markdown-linebreak-ext=md]
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.11.8
+  rev: v0.11.10
   hooks:
     - id: ruff
     - id: ruff-format
@@ -25,7 +25,7 @@ repos:
   - id: mypy
     args: [--ignore-missing-imports, --no-warn-unused-ignores]
 - repo: https://github.com/astral-sh/uv-pre-commit
-  rev: 0.7.3
+  rev: 0.7.5
   hooks:
     - id: uv-lock
 - repo: local

src/pms/core/sensor.py

@@ -93,11 +93,11 @@ def decode(self, buffer: bytes, *, time: int | None = None) -> ObsData:
 class Supported(str, Enum):
     """Supported sensor names"""
 
-    _ignore_ = "s Supported"
+    _ignore_ = "name Supported"
 
     Supported = vars()
-    for s in Sensor:
-        Supported[s.name] = s.name
+    for name in Sensor.__members__:
+        Supported[name] = name
 
     default = "PMSx003"
 

tests/sensors/test_sensor.py

@@ -7,39 +7,42 @@
 import pytest
 
 from pms import SensorWarning
-from pms.core import Sensor, Supported
+from pms.core import Sensor
+
+
+@pytest.fixture(params=Sensor)
+def sensor(request: pytest.FixtureRequest) -> Sensor:
+    return request.param
 
 
-@pytest.mark.parametrize("sensor", Supported)
 @pytest.mark.parametrize("attr", ["Message", "Data", "Commands"])
-def test_sensor_attrs(sensor, attr):
-    assert getattr(Sensor[sensor], attr)
+def test_sensor_attrs(sensor: Sensor, attr: str):
+    assert getattr(sensor, attr)
 
 
-@pytest.mark.parametrize("sensor", Supported)
-@pytest.mark.parametrize("command", "passive_mode passive_read active_mode sleep wake".split())
-def test_commands(sensor, command):
-    assert Sensor[sensor].command(command)
+@pytest.mark.parametrize(
+    "command", ["passive_mode", "passive_read", "active_mode", "sleep", "wake"]
+)
+def test_commands(sensor: Sensor, command: str):
+    assert sensor.command(command)
 
 
-@pytest.mark.parametrize("sensor", Supported)
-def test_baud(sensor):
-    baud = 9600 if sensor != "SPS30" else 115200
-    assert Sensor[sensor].baud == baud
+def test_baud(sensor: Sensor):
+    baud = 9600 if sensor.name != "SPS30" else 115200
+    assert sensor.baud == baud
 
 
-@pytest.mark.parametrize("sensor", Supported)
-def test_pre_heat(sensor):
-    if sensor == "MHZ19B":
+def test_pre_heat(sensor: Sensor):
+    if sensor.name == "MHZ19B":
         pre_heat = 180
-    elif sensor == "PMSx003":
+    elif sensor.name == "PMSx003":
         pre_heat = 10
     else:
         pre_heat = 0
-    assert Sensor[sensor].pre_heat == pre_heat
+    assert sensor.pre_heat == pre_heat
 
 
-@pytest.mark.parametrize("sensor", ["HPMA115S0", "HPMA115C0"])
+@pytest.mark.parametrize("sensor", [Sensor["HPMA115S0"], Sensor["HPMA115C0"]])
 @pytest.mark.parametrize("command", ["passive_mode", "wake"])
 @pytest.mark.parametrize(
     "buffer,check",
@@ -50,8 +53,8 @@ def test_pre_heat(sensor):
         pytest.param(b"\xa5\xa5\x40\x0d\x04", False, id="no ACK at end"),
     ],
 )
-def test_HPMA115xx_ACK_message(sensor, command, buffer, check):
-    assert Sensor[sensor].check(buffer, command) == check
+def test_HPMA115xx_ACK_message(sensor: Sensor, command: str, buffer: bytes, check: bool):
+    assert sensor.check(buffer, command) == check
 
 
 class RawData(NamedTuple):