Merge pull request #1400 from oven-lab/master

Code test changes and issue #1375, #1398

.github/workflows/combined.yaml

@@ -1,26 +0,0 @@
-name: "Validation And Formatting"
-on:
-  push:
-  pull_request:
-  schedule:
-    - cron: '0 0 * * *'
-jobs:
-  ci:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        name: Download repo
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-python@v2
-        name: Setup Python
-      - uses: actions/cache@v2
-        name: Cache
-        with:
-          path: |
-            ~/.cache/pip
-          key: custom-component-ci
-      - uses: KTibow/ha-blueprint@stable
-        name: CI
-        with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/tox.yaml

@@ -1,6 +1,8 @@
 name: Tox PR CI
 
-on: [pull_request]
+on:
+  pull_request:
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/validate.yml

@@ -0,0 +1,20 @@
+name: HACS Validate
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: "0 0 * * *"
+  workflow_dispatch:
+
+jobs:
+  validate-hacs:
+    runs-on: "ubuntu-latest"
+    steps:
+      - uses: "actions/checkout@v3"
+      - name: HACS validation
+        uses: "hacs/action@main"
+        with:
+          category: "integration"
+      - name: Hassfest validation
+        uses: home-assistant/actions/hassfest@master

custom_components/localtuya/config_flow.py

@@ -740,7 +740,7 @@ class LocalTuyaOptionsFlowHandler(config_entries.OptionsFlow):
                     new_data = self.config_entry.data.copy()
                     entry_id = self.config_entry.entry_id
                     # removing entities from registry (they will be recreated)
-                    ent_reg = await er.async_get_registry(self.hass)
+                    ent_reg = er.async_get(self.hass)
                     reg_entities = {
                         ent.unique_id: ent.entity_id
                         for ent in er.async_entries_for_config_entry(ent_reg, entry_id)

custom_components/localtuya/manifest.json

@@ -1,14 +1,14 @@
 {
   "domain": "localtuya",
   "name": "LocalTuya integration",
-  "version": "5.0.0",
-  "documentation": "https://github.com/rospogrigio/localtuya/",
-  "dependencies": [],
   "codeowners": [
     "@rospogrigio", "@postlund"
   ],
+  "config_flow": true,
+  "dependencies": [],
+  "documentation": "https://github.com/rospogrigio/localtuya/",
+  "iot_class": "local_push",
   "issue_tracker": "https://github.com/rospogrigio/localtuya/issues",
   "requirements": [],
-  "config_flow": true,
+  "version": "5.0.1"
-  "iot_class": "local_push"
 }

hacs.json

@@ -1,6 +1,4 @@
 {
   "name": "Local Tuya",
-  "domains": ["climate", "cover", "fan", "light", "number", "select", "sensor", "switch"],
+  "homeassistant": "0.116.0"
-  "homeassistant": "0.116.0",
-  "iot_class": ["Local Push"]
 }

tox.ini

@@ -10,7 +10,7 @@ python =
 
 [testenv]
 passenv = TOXENV,CI
-whitelist_externals =
+allowlist_externals =
     true
 setenv =
     LANG=en_US.UTF-8