Merge pull request #132 from plugwise/deprecate38

Python 3.9 default and small left-over linting

Author: CoMPaTech

.github/workflows/merge.yml

@@ -4,7 +4,7 @@
 name: Latest release
 
 env:
-  CACHE_VERSION: 3
+  CACHE_VERSION: 4
   DEFAULT_PYTHON: 3.9
 
 # Only run on merges

.github/workflows/verify.yml

@@ -4,13 +4,13 @@
 name: Latest commit
 
 env:
-  CACHE_VERSION: 3
+  CACHE_VERSION: 4
   DEFAULT_PYTHON: "3.9"
   PRE_COMMIT_HOME: ~/.cache/pre-commit
 
 on:
   schedule:
-    - cron: "0 0 * * 0" # weekly
+    - cron: "2 4 * * 0" # weekly
   workflow_dispatch:
   push:
 # pull_request:
@@ -167,7 +167,7 @@ jobs:
     needs: commitcheck
     strategy:
       matrix:
-        python-version: [3.8, 3.9, "3.10"]
+        python-version: [3.9, "3.10"]
     steps:
       - name: Check out committed code
         uses: actions/checkout@v2
@@ -206,7 +206,7 @@ jobs:
     needs: prepare-test-cache
     strategy:
       matrix:
-        python-version: [3.8, 3.9, "3.10"]
+        python-version: [3.9, "3.10"]
 
     steps:
       - name: Check out committed code

.pre-commit-config.yaml

@@ -1,18 +1,20 @@
+default_language_version:
+  # force all unspecified python hooks to run python3
+  python: python3.9
 repos:
   # Run manually in CI skipping the branch checks
   - repo: https://github.com/PyCQA/pylint
     rev: v2.12.2
     hooks:
       - id: pylint
         name: pylint
-        entry: pylint
+        entry: scripts/run-in-env.sh pylint
         language: system
         types: [python]
-        args:
-          [
-            "-rn",  # Only display messages
-            "-sn",  # Don't display the score
-          ]
+        args: [
+          "-rn",  # Only display messages
+          "-sn",  # Don't display the score
+        ]
   - repo: https://github.com/PyCQA/isort
     rev: 5.10.1
     hooks:
@@ -26,12 +28,12 @@ repos:
         args:
           - --branch=main
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.30.1
+    rev: v2.31.0
     hooks:
       - id: pyupgrade
         args: [--py37-plus]
   - repo: https://github.com/psf/black
-    rev: 21.12b0
+    rev: 22.1.0
     hooks:
       - id: black
         args:
@@ -56,7 +58,7 @@ repos:
           - pydocstyle==5.1.1
         files: ^(plugwise|tests)/.+\.py$
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.1
+    rev: 1.7.2
     hooks:
       - id: bandit
         args:

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# v0.16.2 - Generic and Stretch
+  - As per Core deprecation of python 3.8, removed CI/CD testing and bumped pypi to 3.9 and production
+  - Add support for Stretch with fw 2.7.18
+
 # v0.16.1 - Smile - various updates:
   - BREAKING: Change active device detection, detect both OpenTherm (replace Auxiliary) and OnOff (new) heating and cooling devices.
   - Stretch: base detection on the always present Stick

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 @laetificat, 2019-2020 @CoMPaTech & @bouwew
+Copyright (c) 2019 @laetificat, 2019-2020 @CoMPaTech & @bouwew, 2020-current @CoMPaTech, @bouwew & @brefra
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

plugwise/__init__.py

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

plugwise/nodes/circle_plus.py

@@ -57,10 +57,8 @@ def _process_scan_response(self, message):
                 "Linked plugwise node with mac %s found",
                 message.node_mac.value.decode(UTF8_DECODE),
             )
-            if (
-                message.node_mac.value.decode(UTF8_DECODE)
-                not in self._plugwise_nodes.keys()
-            ):
+            #  TODO: 20220206 is there 'mac' in the dict? Otherwise it can be rewritten to just if message... in
+            if not self._plugwise_nodes.get(message.node_mac.value.decode(UTF8_DECODE)):
                 self._plugwise_nodes[
                     message.node_mac.value.decode(UTF8_DECODE)
                 ] = message.node_address.value

plugwise/stick.py

@@ -316,7 +316,9 @@ def scan_timeout_expired(self):
         """Timeout for initial scan."""
         if not self.msg_controller.discovery_finished:
             for mac in self._nodes_to_discover:
-                if mac not in self._device_nodes.keys():
+                #  TODO: 20220206 is there 'mac' in the dict? Otherwise it can be rewritten as below (twice as fast above .get)
+                #        if mac not in self._device_nodes:
+                if not self._device_nodes.get(mac):
                     _LOGGER.info(
                         "Failed to discover node type for registered MAC '%s'. This is expected for battery powered nodes, they will be discovered at their first awake",
                         str(mac),

pyproject.toml

@@ -1,5 +1,5 @@
 [tool.black]
-target-version = ["py37", "py38"]
+target-version = ["py39", "py310"]
 exclude = 'generated'
 
 [tool.isort]

scripts/python-venv.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -eu
 
-pyversions=(3.10 3.9 3.8)
+pyversions=(3.10 3.9)
 my_path=$(git rev-parse --show-toplevel)
 my_venv=${my_path}/venv