Merge remote-tracking branch 'blueprint/dev' into dev

# Conflicts:
#	hacs.json
#	setup.cfg

.github/workflows/codeql-analysis.yml

@@ -48,11 +48,11 @@ jobs:
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
-        
+
         # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
         # queries: security-extended,security-and-quality
 
-        
+
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
@@ -61,7 +61,7 @@ jobs:
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 
-    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
     #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
 
     # - run: |

.github/workflows/issue-lock.yml

@@ -16,7 +16,7 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v3
+      - uses: dessant/lock-threads@v4
         with:
           github-token: ${{ github.token }}
           issue-lock-inactive-days: 30

.pre-commit-config.yaml

@@ -7,28 +7,28 @@ repos:
         language: script
         files: ^(custom_components/.+/const\.py|requirements\.txt)$
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.7.4
+    rev: v3.3.1
     hooks:
       - id: pyupgrade
-        args: [--py37-plus]
+        args: [ --py37-plus ]
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 23.1.0
     hooks:
       - id: black
         args:
           - --safe
           - --quiet
         files: ^(custom_components|bin|tests)/.+\.py$
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.1
+  - repo: https://github.com/pycqa/flake8.git
+    rev: 6.0.0
     hooks:
       - id: flake8
         additional_dependencies:
           - flake8-docstrings==1.5.0
           - pydocstyle==5.0.2
         files: ^(custom_components|bin|tests)/.+\.py$
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.0
+    rev: 1.7.4
     hooks:
       - id: bandit
         args:
@@ -37,11 +37,11 @@ repos:
           - --configfile=tests/bandit.yaml
         files: ^(custom_components|bin|tests)/.+\.py$
   - repo: https://github.com/pre-commit/mirrors-isort
-    rev: v5.6.4
+    rev: v5.10.1
     hooks:
       - id: isort
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.5.0
+    rev: v4.4.0
     hooks:
       - id: check-executables-have-shebangs
         stages: [manual]

bin/setup

@@ -14,7 +14,9 @@ source ./bin/_common
 
 if [ ! -d "venv" ]; then
     log.info "Initializing the virtual environment..."
-    ${python} -m venv venv
+    # For error 'executable `python` not found' run
+    # rm -Rf ~/.local/share/virtualenv
+    ${python} -m venv ./venv
     source ./venv/bin/activate
     python="${ROOT}/venv/bin/python3"
 fi

bin/update_requirements

@@ -27,7 +27,8 @@ def get_package(requre: str) -> str:
 
 harequire = ["homeassistant"]
 request = requests.get(
-    "https://raw.githubusercontent.com/home-assistant/core/dev/requirements.txt"
+    "https://raw.githubusercontent.com/home-assistant/core/dev/requirements.txt",
+    timeout=10
 )
 request = request.text.split("\n")
 for req in request:

hacs.json

@@ -1,5 +1,5 @@
 {
     "name": "Average Sensor",
     "hacs": "1.6.0",
-    "homeassistant": "2022.7.0"
+    "homeassistant": "2022.10.0"
 }

requirements-dev.txt

@@ -2,6 +2,6 @@
 black==22.10.0
 packaging==21.3
 pre-commit~=2.20
-PyGithub~=1.55
-pyupgrade~=3.0
+PyGithub~=1.57
+pyupgrade~=3.3
 yamllint~=1.28

requirements-test.txt

@@ -2,7 +2,7 @@
 asynctest~=0.13
 flake8~=5.0
 flake8-docstrings~=1.6
-mypy==0.982
+mypy==1.0.0
 pylint~=2.15
 pylint-strict-informational==0.1
 pytest~=7.1

setup.cfg

@@ -55,7 +55,6 @@ known_first_party = custom_components,tests
 forced_separate = tests
 
 [mypy]
-python_version = 3.9
 ignore_errors = true
 follow_imports = silent
 ignore_missing_imports = true

tests/test_recorder.py

@@ -3,17 +3,18 @@
 
 import logging
 from datetime import timedelta
-from unittest.mock import patch
 
-from homeassistant.components import recorder
 from homeassistant.components.input_boolean import DOMAIN
 from homeassistant.components.recorder.db_schema import StateAttributes, States
 from homeassistant.components.recorder.util import session_scope
 from homeassistant.const import ATTR_EDITABLE
 from homeassistant.core import HomeAssistant, State
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
-from pytest_homeassistant_custom_component.common import async_fire_time_changed
+from pytest_homeassistant_custom_component.common import (
+    SetupRecorderInstanceT,
+    async_fire_time_changed,
+)
 from pytest_homeassistant_custom_component.components.recorder.common import (
     wait_recording_done,
 )
@@ -23,38 +24,18 @@
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_init_recorder_component(hass, add_config=None):
-    """Initialize the recorder asynchronously."""
-    config = dict(add_config) if add_config else {}
-    if recorder.CONF_DB_URL not in config:
-        config[recorder.CONF_DB_URL] = "sqlite://"  # In memory DB
-        if recorder.CONF_COMMIT_INTERVAL not in config:
-            config[recorder.CONF_COMMIT_INTERVAL] = 0
-
-    with patch(
-        "homeassistant.components.recorder.ALLOW_IN_MEMORY_DB",
-        True,
-    ), patch("homeassistant.components.recorder.migration.migrate_schema"):
-        assert await async_setup_component(
-            hass, recorder.DOMAIN, {recorder.DOMAIN: config}
-        )
-        assert recorder.DOMAIN in hass.config.components
-    _LOGGER.info(
-        "Test recorder successfully started, database location: %s",
-        config[recorder.CONF_DB_URL],
-    )
-
-
 async def async_wait_recording_done_without_instance(hass: HomeAssistant) -> None:
     """Block till recording is done."""
     await hass.loop.run_in_executor(None, wait_recording_done, hass)
 
 
 async def test_exclude_attributes(
-    hass: HomeAssistant, enable_custom_integrations: None
+    hass: HomeAssistant,
+    async_setup_recorder_instance: SetupRecorderInstanceT,
+    enable_custom_integrations: None,
 ):
     """Test attributes to be excluded."""
-    await async_init_recorder_component(hass)
+    await async_setup_recorder_instance(hass)
     assert await async_setup_component(hass, DOMAIN, {DOMAIN: {"test": {}}})
 
     state = hass.states.get("input_boolean.test")