Merge branch 'release/v7.5.0'

jabesq-org · Jan 2, 2023 · 6cbd8ee · 6cbd8ee
2 parents 434658f + e185f1e
commit 6cbd8ee
Show file tree

Hide file tree

Showing 21 changed files with 920 additions and 527 deletions.
diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml
@@ -14,7 +14,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Set up Python 3.8
-        uses: actions/setup-python@v4.3.0
+        uses: actions/setup-python@v4.4.0
         with:
           python-version: 3.8
       - name: Install dependencies

diff --git a/.github/workflows/publish-to-test-pypi.yml b/.github/workflows/publish-to-test-pypi.yml
@@ -17,7 +17,7 @@ jobs:
           ref: development
           fetch-depth: 0
       - name: Set up Python 3.8
-        uses: actions/setup-python@v4.3.0
+        uses: actions/setup-python@v4.4.0
         with:
           python-version: 3.8
       - name: Install dependencies

diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
@@ -16,14 +16,14 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-        python-version: [3.10.0]
+        python-version: [3.10.8]
 
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4.3.0
+        uses: actions/setup-python@v4.4.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -39,12 +39,12 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.10.0]
+        python-version: [3.10.8]
 
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4.3.0
+        uses: actions/setup-python@v4.4.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -63,12 +63,12 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.8, 3.9, 3.10.0]
+        python-version: [3.8, 3.9, 3.10.8]
 
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4.3.0
+        uses: actions/setup-python@v4.4.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Run tests with tox

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -7,14 +7,14 @@ ci:
 
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.2.0
+    rev: v3.3.1
     hooks:
       - id: pyupgrade
         args: [--py38-plus]
         exclude: "external_src/int-tools"
 
   - repo: https://github.com/asottile/add-trailing-comma
-    rev: v2.3.0
+    rev: v2.4.0
     hooks:
       - id: add-trailing-comma
         args: [--py36-plus]
@@ -26,19 +26,19 @@ repos:
       - id: yesqa
 
   - repo: https://github.com/psf/black
-    rev: 22.10.0
+    rev: 22.12.0
     hooks:
       - id: black
         language_version: python3
 
   - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
+    rev: 5.11.4
     hooks:
       - id: isort
         name: isort (python)
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.982
+    rev: v0.991
     hooks:
       - id: mypy
         name: mypy
@@ -47,7 +47,7 @@ repos:
           - types-requests
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0 # Use the ref you want to point at
+    rev: v4.4.0 # Use the ref you want to point at
     hooks:
       - id: check-ast
       - id: no-commit-to-branch
@@ -63,11 +63,11 @@ repos:
       - id: check-toml
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 5.0.4 # pick a git hash / tag to point to
+    rev: 6.0.0 # pick a git hash / tag to point to
     hooks:
       - id: flake8
         exclude: (otp)
-        additional_dependencies: [flake8-typing-imports==1.11.0]
+        additional_dependencies: [flake8-typing-imports==1.14.0]
 
   - repo: https://github.com/asottile/setup-cfg-fmt
     rev: v2.2.0

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,11 +31,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 -
 
+## [7.5.0]
+
+### Added
+
+- Add NLAS - wireless batteryless scene switch device type
+- Add BNEU, EBU, NLDD, NLAO, NLLF, NLUO, NLUP, Z3L, NLTS, NLUF
+
+### Fixed
+
+- Update Legrand and BTicino devices
+- Fix broken temperature setter when OTM is in the setup
+
 ## [7.4.0]
 
 ### Added
 
 - Add NLUF device stub
+- Add TPSRS Somfy shutters
+
 
 ### Changed
 

diff --git a/Pipfile b/Pipfile
@@ -21,6 +21,7 @@ pytest-mock = "*"
 requests-mock = "*"
 tox = ">=3.25"
 twine = "*"
+no-implicit-optional = "*"
 
 [packages]
 requests = "*"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/fixtures/homesdata.json b/fixtures/homesdata.json
@@ -23,7 +23,8 @@
                 "12:34:56:00:f1:62",
                 "12:34:56:10:f1:66",
                 "12:34:56:00:e3:9b",
-                "0009999992"
+                "0009999992",
+                "0009999993"
               ]
             },
             {
@@ -174,7 +175,7 @@
               "name": "module iDiamant",
               "setup_date": 1562262465,
               "room_id": "222452125",
-              "modules_bridged": ["0009999992"]
+              "modules_bridged": ["0009999992", "0009999993"]
             },
             {
               "id": "0009999992",
@@ -184,6 +185,14 @@
               "room_id": "3688132631",
               "bridge": "12:34:56:30:d5:d4"
             },
+            {
+              "id": "0009999993",
+              "type": "NBO",
+              "name": "Bubendorff blind",
+              "setup_date": 1594132017,
+              "room_id": "3688132631",
+              "bridge": "12:34:56:30:d5:d4"
+            },
             {
               "id": "12:34:56:80:bb:26",
               "type": "NAMain",
@@ -806,4 +815,3 @@
     "time_exec": 0.056135892868042,
     "time_server": 1559171003
   }
-
diff --git a/fixtures/homestatus_91763b24c43d3e344f424e8b.json b/fixtures/homestatus_91763b24c43d3e344f424e8b.json
@@ -139,6 +139,18 @@
             "reachable": true,
             "bridge": "12:34:56:30:d5:d4"
           },
+          {
+            "id": "0009999993",
+            "type": "NBO",
+            "current_position": 0,
+            "target_position": 0,
+            "target_position:step": 100,
+            "firmware_revision": 22,
+            "rf_strength": 0,
+            "last_seen": 1671395511,
+            "reachable": true,
+            "bridge": "12:34:56:30:d5:d4"
+          },
           {
             "id": "12:34:56:00:86:99",
             "type": "NACamDoorTag",
@@ -347,4 +359,3 @@
       }
     }
   }
-
diff --git a/src/pyatmo/camera.py b/src/pyatmo/camera.py
@@ -153,7 +153,7 @@ def get_light_state(self, camera_id: str) -> str | None:
 
         return camera_data.get("light_mode_status")
 
-    def persons_at_home(self, home_id: str = None) -> list:
+    def persons_at_home(self, home_id: str | None = None) -> list:
         """Return a list of known persons who are currently at home."""
         home_data = self.homes.get(home_id, {})
         return [
@@ -528,9 +528,9 @@ def _check_url(self, url: str) -> str | None:
     def set_state(
         self,
         camera_id: str,
-        home_id: str = None,
-        floodlight: str = None,
-        monitoring: str = None,
+        home_id: str | None = None,
+        floodlight: str | None = None,
+        monitoring: str | None = None,
     ) -> bool:
         """Turn camera (light) on/off.
 
@@ -570,7 +570,7 @@ def set_state(
         LOG.debug("%s", resp)
         return True
 
-    def set_persons_home(self, home_id: str, person_ids: list[str] = None):
+    def set_persons_home(self, home_id: str, person_ids: list[str] | None = None):
         """Mark persons as home."""
         post_params: dict[str, str | list] = {"home_id": home_id}
         if person_ids:
@@ -619,8 +619,8 @@ def get_profile_image(
     def update_events(
         self,
         home_id: str,
-        event_id: str = None,
-        device_type: str = None,
+        event_id: str | None = None,
+        device_type: str | None = None,
     ) -> None:
         """Update the list of events."""
         if not (event_id or device_type):
@@ -691,9 +691,9 @@ async def _async_update_all_camera_urls(self) -> None:
     async def async_set_state(
         self,
         camera_id: str,
-        home_id: str = None,
-        floodlight: str = None,
-        monitoring: str = None,
+        home_id: str | None = None,
+        floodlight: str | None = None,
+        monitoring: str | None = None,
     ) -> bool:
         """Turn camera (light) on/off.
 
@@ -773,7 +773,7 @@ async def _async_check_url(self, url: str) -> str | None:
     async def async_set_persons_home(
         self,
         home_id: str,
-        person_ids: list[str] = None,
+        person_ids: list[str] | None = None,
     ):
         """Mark persons as home."""
         post_params: dict[str, str | list] = {"home_id": home_id}

diff --git a/src/pyatmo/home.py b/src/pyatmo/home.py
@@ -158,6 +158,9 @@ def is_valid_schedule(self, schedule_id: str) -> bool:
         """Check if valid schedule."""
         return schedule_id in self.schedules
 
+    def has_otm(self) -> bool:
+        return any("OTM" in room.device_types for room in self.rooms.values())
+
     def get_hg_temp(self) -> float | None:
         """Return frost guard temperature value for given home."""
         if (schedule := self.get_selected_schedule()) is None:

diff --git a/src/pyatmo/modules/__init__.py b/src/pyatmo/modules/__init__.py
@@ -1,17 +1,22 @@
 """Expose submodules."""
 from .base_class import Place
-from .bticino import BNCX, BNDL, BNSL
+from .bticino import BNCX, BNDL, BNEU, BNSL
 from .idiamant import NBG, NBO, NBR, NBS
 from .legrand import (
+    EBU,
+    NLAO,
+    NLAS,
     NLC,
     NLD,
+    NLDD,
     NLE,
     NLF,
     NLFE,
     NLFN,
     NLG,
     NLIS,
     NLL,
+    NLLF,
     NLLM,
     NLLV,
     NLM,
@@ -23,9 +28,13 @@
     NLPS,
     NLPT,
     NLT,
+    NLTS,
     NLUF,
     NLUI,
+    NLUO,
+    NLUP,
     NLV,
+    Z3L,
     NLunknown,
 )
 from .module import Camera, Dimmer, Module, Shutter, Switch
@@ -52,10 +61,12 @@
     PublicWeatherArea,
 )
 from .smarther import BNS
+from .somfy import TPSRS
 
 __all__ = [
     "BNCX",
     "BNDL",
+    "BNEU",
     "BNS",
     "BNSL",
     "Camera",
@@ -81,6 +92,7 @@
     "NIS",
     "NLC",
     "NLD",
+    "NLDD",
     "NLE",
     "NLF",
     "NLFE",
@@ -101,8 +113,14 @@
     "NLT",
     "NLUF",
     "NLUI",
+    "NLAO",
+    "NLLF",
+    "NLUO",
     "NLunknown",
+    "NLUP",
     "NLV",
+    "EBU",
+    "Z3L",
     "NOC",
     "NRV",
     "NSD",
@@ -112,4 +130,7 @@
     "PublicWeatherArea",
     "Shutter",
     "Switch",
+    "TPSRS",
+    "NLAS",
+    "NLTS",
 ]
diff --git a/src/pyatmo/modules/bticino.py b/src/pyatmo/modules/bticino.py
@@ -17,4 +17,8 @@ class BNSL(Switch):  # pylint: disable=too-many-ancestors
 
 
 class BNCX(Module):
-    """BTicino"""
+    """BTicino internal panel = gateway."""
+
+
+class BNEU(Module):
+    """BTicino external unit."""