Merge pull request #295 from plugwise/plugwise-smile

Smile(/stretch) initial

Author: bouwew

.github/ISSUE_TEMPLATE/bug.yml

@@ -81,13 +81,12 @@ body:
     attributes:
       label: What kind of Plugwise device is having issues?
       description: >
-        Select the best possible option (i.e. for issues with a Lisa or Tom, select Adam - for issues with a Circle, select Stretch or USB).
+        Select the best possible option (i.e. for issues with a Lisa or Tom, select Adam, etc)
       options:
         - "Smile: Adam (including Lisa, Tom, Floor)"
         - "Smile: Anna"
         - "Smile: P1"
         - "Smile: Stretch"
-        - "USB: Stick"
         - "Other product (we might not (yet) know of it's existence!)"
   - type: input
     validations:

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -83,13 +83,12 @@ body:
     attributes:
       label: What kind of Plugwise device is having issues?
       description: >
-        Select the best possible option (i.e. for issues with a Lisa or Tom, select Adam - for issues with a Circle, select Stretch or USB).
+        Select the best possible option (i.e. for issues with a Lisa or Tom, select Adam, etc.)
       options:
         - "Smile: Adam (including Lisa, Tom, Floor)"
         - "Smile: Anna"
         - "Smile: P1"
         - "Smile: Stretch"
-        - "USB: Stick"
         - "Other product (we might not (yet) know of it's existence!)"
   - type: input
     validations:

.github/workflows/verify.yml

@@ -4,7 +4,7 @@
 name: Latest commit
 
 env:
-  CACHE_VERSION: 9
+  CACHE_VERSION: 10
   DEFAULT_PYTHON: "3.11"
   PRE_COMMIT_HOME: ~/.cache/pre-commit
 
@@ -113,7 +113,10 @@ jobs:
   commitcheck:
     runs-on: ubuntu-latest
     name: Check commit
-    needs: black
+    needs:
+      - black
+      - shellcheck
+      - dependencies_check
     steps:
       - name: Check out committed code
         uses: actions/checkout@v3
@@ -399,4 +402,4 @@ jobs:
         run: |
           . venv/bin/activate
           echo "Showing complexity higher or equal to 'C'"
-          radon cc plugwise/smile.py plugwise/helper.py tests/test_smile.py -s -nc --no-assert
+          radon cc plugwise/ tests/ -s -nc --no-assert

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
-## Ongoing: Logic separation between USB and non-USB
+## v0.31 refactoring (alpha only, effectively not to be released): Logic separation between USB and non-USB
+
+- Smile component (suggested `python-plugwise-usb` for USB (or stick-standalone) route)
+
+## v0.30 refactoring (alpha only, effectively unreleased)
+
+- More formal Split between Networked and USB code
 
 ## v0.27.10: Anna + Elga: final fix for [#320](https://github.com/plugwise/plugwise-beta/issues/320)
 

CODEOWNERS

@@ -15,15 +15,5 @@ requirements*.txt @plugwise/devs
 /tests/ @bouwew @compatech
 /scripts/ @bouwew @compatech
 
-# NET specific
-/plugwise/smile.py @bouwew @compatech
-
-# USB specific
-/plugwise/connections/ @brefra
-/plugwise/controller.py @bouwew @brefra
-/plugwise/messages/ @brefra
-/plugwise/nodes/ @brefra
-/plugwise/parser.py @brefra
-/plugwise/stick.py @brefra
-/plugwise/util.py @brefra
-
+# Networked Plugwise components
+/plugwise @bouwew @compatech

README.md

@@ -1,6 +1,8 @@
 # Plugwise python module
 
-This module is the backend for the [`plugwise` component](https://github.com/home-assistant/core/tree/dev/homeassistant/components/plugwise) which we maintain as co-code owners Home Assistant Core.
+This module is the backend for the [`plugwise` component](https://github.com/home-assistant/core/tree/dev/homeassistant/components/plugwise) in Home Assistant Core (which we maintain as co-code owners).
+
+This module supports `Smile`s (and `Stretch`), i.e. the networked plugwise devices. For the USB (or Stick-standalone version) please refer to upcoming [`plugwise-usb` component](https://github.com/plugwise/plugwise-usb-beta).
 
 Our main usage for this module is supporting [Home Assistant](https://www.home-assistant.io) / [home-assistant](http://github.com/home-assistant/core/)
 
@@ -67,15 +69,6 @@ Module providing interfacing with the Plugwise devices:
 - [x] Stretch
 - [ ] Some of the equipment mentioned in USB when in use via Stretch or Adam
 
-### USB
-
-- [x] Stick
-  - [x] Circle+ / Stealth+
-  - [x] Circle / Stealth
-  - [x] Scan
-  The devices listed below have **NOT** been tested and are therefore unknown for their correct operation
-    - [x] Sense
-    - [x] Switch
 - [x] [Home-Assistant](https://home-assistant.io) via
   - [x] Native supporting networked Plugwise products
   - [x] [HACS](https://hacs.xyz) and `custom_component` [Plugwise Beta](https://github.com/plugwise/plugwise-beta/) (supporting all devices above)
@@ -86,6 +79,7 @@ As per the origins we have retained the appropriate licensing and including the
 
 Origins (from newest to oldest):
 
+- Networked (Smile/Stretch) Plugwise support by @bouwew (Bouwe) and @CoMPaTech (Tom). We both support and help out @brefra (Frank) where possible, he's supporting the USB module and integration.
 - 'All' available Plugwise support by @bouwew (Bouwe), @brefra (Frank) and @CoMPaTech (Tom)
 - Upstreamed haanna/HA-core Anna, including all later products - 'Plugwise-Smile/Plugwise-HA/plugwise-beta` by @bouwew (Bouwe) & @CoMPaTech (Tom)
 - Networked Plugwise Anna module with custom_module - `haanna/anna-ha` via <https://github.com/laetificat> (Kevin)