Merge pull request #245 from plugwise/0_25_11

Plugwise v0.25.11

Author: bouwew

.pre-commit-config.yaml

@@ -16,12 +16,12 @@ repos:
         args:
           - --branch=main
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.32.0
+    rev: v3.1.0
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 22.10.0
     hooks:
       - id: black
         args:
@@ -37,7 +37,7 @@ repos:
           - --skip="./.*,*.csv,*.json"
           - --quiet-level=2
         exclude_types: [csv, json]
-  - repo: https://gitlab.com/pycqa/flake8
+  - repo: https://github.com/PyCQA/flake8
     rev: 4.0.1
     hooks:
       - id: flake8
@@ -46,8 +46,8 @@ repos:
           - pyflakes==2.4.0
           - flake8-docstrings==1.6.0
           - pydocstyle==6.1.1
-          - flake8-comprehensions==3.8.0
-          - flake8-noqa==1.2.1
+          - flake8-comprehensions==3.10.0
+          - flake8-noqa==1.2.8
           - mccabe==0.6.1
         files: ^(plugwise|tests)/.+\.py$
   - repo: https://github.com/PyCQA/bandit
@@ -60,15 +60,15 @@ repos:
           - --configfile=tests/bandit.yaml
         files: ^(plugwise|tests)/.+\.py$
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.26.3
+    rev: v1.28.0
     hooks:
       - id: yamllint
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.6.2
+    rev: v2.7.1
     hooks:
       - id: prettier
   - repo: https://github.com/cdce8p/python-typing-update
-    rev: v0.3.5
+    rev: v0.5.0
     hooks:
       # Run `python-typing-update` hook manually from time to time
       # to update python typing syntax.

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+# v0.25.11: Improve/change contents building on v0.25.10
+- Revert: Improve handling of xml-data missing, raise exception with warning; the reason for adding this fix is not clear. Needs further investigation.
+- Remove raising of InvalidSetupError, no longer needed; handled in Plugwise config_flow (function added by Frenck)
+- Simplify logic calling _power_data_from_location() (similar to v0.21.4); possible solution for https://github.com/home-assistant/core/issues/81672
+- _full_update_device(): revert back to v0.21.4 logic
+- async_update(): not needed to refresh self._modules
+- Add fix for Core #81712
+
 # v0.25.10: Thermostats: more improvements
 - Anna + Elga: hide cooling_enable switch, (hardware-)switch is on Elga, not in Plugwise App
 - Adam: improve collecting regulation_mode-related data. Fix for https://github.com/plugwise/python-plugwise/issues/240

plugwise/__init__.py

@@ -1,6 +1,6 @@
 """Plugwise module."""
 
-__version__ = "0.25.10"
+__version__ = "0.25.11"
 
 from plugwise.smile import Smile
 from plugwise.stick import Stick

plugwise/helper.py

@@ -5053,20 +5053,6 @@ async def test_connect_p1v4(self):
         await smile.close_connection()
         await self.disconnect(server, client)
 
-    @pytest.mark.asyncio
-    async def test_connect_p1v4_missing_logs(self):
-        """Test a P1 firmware 4 setup."""
-        testdata = {}
-        self.smile_setup = "p1v4_missing_logs"
-        server, smile, client = await self.connect_wrapper()
-        try:
-            await self.device_test(smile, testdata)
-        except pw_exceptions.XMLDataMissingError:
-            _LOGGER.info("Passed XML data missing testcase.")
-
-        await smile.close_connection()
-        await self.disconnect(server, client)
-
     @pytest.mark.asyncio
     async def test_fail_legacy_system(self):
         """Test erroneous legacy stretch system."""
@@ -5077,16 +5063,6 @@ async def test_fail_legacy_system(self):
         except pw_exceptions.InvalidXMLError:
             assert True
 
-    @pytest.mark.asyncio
-    async def test_fail_anna_connected_to_adam(self):
-        """Test erroneous adam with anna system."""
-        self.smile_setup = "anna_connected_to_adam"
-        try:
-            _server, _smile, _client = await self.connect_wrapper()
-            assert False  # pragma: no cover
-        except pw_exceptions.InvalidSetupError:
-            assert True
-
     @pytest.mark.asyncio
     async def test_invalid_credentials(self):
         """Test P1 with invalid credentials setup."""

plugwise/smile.py

@@ -1,5 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appliances>
+	<appliance id='d440da497ab549dfb7e76bcf4827f388'>
+		<name>OpenThermThermostat</name>
+		<description>A Thermostat</description>
+		<type>thermostat</type>
+		<created_date>2020-06-03T00:26:51.308+02:00</created_date>
+		<modified_date>2020-07-31T16:04:57.153+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<location id='c3807baa2be64289a6e8d0f64468bdad'/>
+		<groups/>
+		<logs>
+			<point_log id='2c4226827eae48559a697bb343f72b8a'>
+				<type>maximum_modulation_level</type>
+				<unit></unit>
+				<updated_date>2020-07-31T08:12:56.454+02:00</updated_date>
+				<last_consecutive_log_date>2020-06-03T00:27:08.401+02:00</last_consecutive_log_date>
+				<interval/>
+				<modulation_level id='f50ac168cc0a462b952c07bd0256f434'/>
+				<period start_date="2020-07-31T08:12:56.454+02:00" end_date="2020-07-31T08:12:56.454+02:00">
+					<measurement log_date="2020-07-31T08:12:56.454+02:00">1.00</measurement>
+				</period>
+			</point_log>
+		</logs>
+		<actuator_functionalities/>
+	</appliance>
 	<appliance id='2743216f626f43948deec1f7ab3b3d70'>
 		<name>Central heating boiler</name>
 		<description></description>