Merge remote-tracking branch 'upstream/dev' into template_number

* upstream/dev: (588 commits)
  Add select platform to template integration (home-assistant#54835)
  Honeywell Lyric - Entity Descriptions (home-assistant#54956)
  Add tests for Rituals init, sensor and switch (home-assistant#52406)
  Support for EnergyStorageTrait for vacuum cleaners (home-assistant#55134)
  Add support for Xiaomi Miio pedestal fans (home-assistant#55114)
  Sonos add bass & treble EQ option (home-assistant#53978)
  Address review of Nanoleaf Config Flow (home-assistant#55215)
  Implement color_mode support for mysensors (home-assistant#52068)
  Change logging to do rollover() instead of rotate() (home-assistant#55177)
  Support device triggers in HomeKit (home-assistant#53869)
  Remove temperature conversion - sht31 (home-assistant#55213)
  Finish EntityDescription implementation for RainMachine (home-assistant#55180)
  Remove temperature conversion - synology_dsm (home-assistant#55214)
  Report average of position and tilt_position for cover groups (home-assistant#52713)
  Ignore unsupported MeasureType-s from Withings (home-assistant#55205)
  Prevent setting _attr_unit_of_measurement in subclasses of SensorEntity (home-assistant#55211)
  Fix Fjäråskupan RSSI sensor unit (home-assistant#55210)
  ESPHome sensor use total_increasing state class (home-assistant#55208)
  Remove should poll property from Xiaomi Miio fan platform (home-assistant#55201)
  Fix last_reset in utility_meter (home-assistant#55209)
  ...

.coveragerc

@@ -36,6 +36,9 @@ omit =
     homeassistant/components/agent_dvr/helpers.py
     homeassistant/components/airnow/__init__.py
     homeassistant/components/airnow/sensor.py
+    homeassistant/components/airtouch4/__init__.py
+    homeassistant/components/airtouch4/climate.py
+    homeassistant/components/airtouch4/const.py
     homeassistant/components/airvisual/__init__.py
     homeassistant/components/airvisual/sensor.py
     homeassistant/components/aladdin_connect/*
@@ -314,6 +317,12 @@ omit =
     homeassistant/components/firmata/switch.py
     homeassistant/components/fitbit/*
     homeassistant/components/fixer/sensor.py
+    homeassistant/components/fjaraskupan/__init__.py
+    homeassistant/components/fjaraskupan/binary_sensor.py
+    homeassistant/components/fjaraskupan/const.py
+    homeassistant/components/fjaraskupan/fan.py
+    homeassistant/components/fjaraskupan/light.py
+    homeassistant/components/fjaraskupan/sensor.py
     homeassistant/components/fleetgo/device_tracker.py
     homeassistant/components/flexit/climate.py
     homeassistant/components/flic/binary_sensor.py
@@ -375,6 +384,7 @@ omit =
     homeassistant/components/google/*
     homeassistant/components/google_cloud/tts.py
     homeassistant/components/google_maps/device_tracker.py
+    homeassistant/components/google_pubsub/__init__.py
     homeassistant/components/google_travel_time/__init__.py
     homeassistant/components/google_travel_time/helpers.py
     homeassistant/components/google_travel_time/sensor.py
@@ -636,6 +646,7 @@ omit =
     homeassistant/components/modbus/cover.py
     homeassistant/components/modbus/climate.py
     homeassistant/components/modbus/modbus.py
+    homeassistant/components/modbus/sensor.py
     homeassistant/components/modbus/validators.py
     homeassistant/components/modem_callerid/sensor.py
     homeassistant/components/motion_blinds/__init__.py
@@ -672,8 +683,11 @@ omit =
     homeassistant/components/mystrom/switch.py
     homeassistant/components/myq/__init__.py
     homeassistant/components/myq/cover.py
+    homeassistant/components/myq/light.py
     homeassistant/components/nad/media_player.py
+    homeassistant/components/nanoleaf/__init__.py
     homeassistant/components/nanoleaf/light.py
+    homeassistant/components/nanoleaf/util.py
     homeassistant/components/neato/__init__.py
     homeassistant/components/neato/api.py
     homeassistant/components/neato/camera.py
@@ -696,7 +710,8 @@ omit =
     homeassistant/components/niko_home_control/light.py
     homeassistant/components/nilu/air_quality.py
     homeassistant/components/nissan_leaf/*
-    homeassistant/components/nmap_tracker/*
+    homeassistant/components/nmap_tracker/__init__.py
+    homeassistant/components/nmap_tracker/device_tracker.py
     homeassistant/components/nmbs/sensor.py
     homeassistant/components/notion/__init__.py
     homeassistant/components/notion/binary_sensor.py
@@ -830,9 +845,9 @@ omit =
     homeassistant/components/raincloud/*
     homeassistant/components/rainmachine/__init__.py
     homeassistant/components/rainmachine/binary_sensor.py
+    homeassistant/components/rainmachine/model.py
     homeassistant/components/rainmachine/sensor.py
     homeassistant/components/rainmachine/switch.py
-    homeassistant/components/rainforest_eagle/sensor.py
     homeassistant/components/raspihats/*
     homeassistant/components/raspyrfm/*
     homeassistant/components/recollect_waste/__init__.py
@@ -850,12 +865,8 @@ omit =
     homeassistant/components/ring/camera.py
     homeassistant/components/ripple/sensor.py
     homeassistant/components/rituals_perfume_genie/binary_sensor.py
-    homeassistant/components/rituals_perfume_genie/entity.py
     homeassistant/components/rituals_perfume_genie/number.py
     homeassistant/components/rituals_perfume_genie/select.py
-    homeassistant/components/rituals_perfume_genie/sensor.py
-    homeassistant/components/rituals_perfume_genie/switch.py
-    homeassistant/components/rituals_perfume_genie/__init__.py
     homeassistant/components/rocketchat/notify.py
     homeassistant/components/roomba/__init__.py
     homeassistant/components/roomba/binary_sensor.py
@@ -893,7 +904,9 @@ omit =
     homeassistant/components/screenlogic/switch.py
     homeassistant/components/scsgate/*
     homeassistant/components/sendgrid/notify.py
-    homeassistant/components/sense/*
+    homeassistant/components/sense/__init__.py
+    homeassistant/components/sense/binary_sensor.py
+    homeassistant/components/sense/sensor.py
     homeassistant/components/sensehat/light.py
     homeassistant/components/sensehat/sensor.py
     homeassistant/components/sensibo/climate.py
@@ -988,6 +1001,7 @@ omit =
     homeassistant/components/suez_water/*
     homeassistant/components/supervisord/sensor.py
     homeassistant/components/surepetcare/__init__.py
+    homeassistant/components/surepetcare/binary_sensor.py
     homeassistant/components/surepetcare/sensor.py
     homeassistant/components/swiss_hydrological_data/sensor.py
     homeassistant/components/swiss_public_transport/sensor.py
@@ -1082,6 +1096,8 @@ omit =
     homeassistant/components/trackr/device_tracker.py
     homeassistant/components/tractive/__init__.py
     homeassistant/components/tractive/device_tracker.py
+    homeassistant/components/tractive/entity.py
+    homeassistant/components/tractive/sensor.py
     homeassistant/components/tradfri/*
     homeassistant/components/trafikverket_train/sensor.py
     homeassistant/components/trafikverket_weatherstation/sensor.py

.devcontainer/devcontainer.json

@@ -24,7 +24,12 @@
     "editor.formatOnSave": true,
     "editor.formatOnType": true,
     "files.trimTrailingWhitespace": true,
-    "terminal.integrated.shell.linux": "/usr/bin/zsh",
+    "terminal.integrated.profiles.linux": {
+      "zsh": {
+        "path": "/usr/bin/zsh"
+      }
+    },
+    "terminal.integrated.defaultProfile.linux": "zsh",
     "yaml.customTags": [
       "!input scalar",
       "!secret scalar",

.github/PULL_REQUEST_TEMPLATE.md

@@ -71,6 +71,7 @@ If the code communicates with devices, web services, or third-party tools:
       Updated and included derived files by running: `python3 -m script.hassfest`.
 - [ ] New or updated dependencies have been added to `requirements_all.txt`.  
       Updated by running `python3 -m script.gen_requirements_all`.
+- [ ] For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.
 - [ ] Untested files have been added to `.coveragerc`.
 
 The integration reached or maintains the following [Integration Quality Scale][quality-scale]:

.github/workflows/ci.yaml

@@ -740,4 +740,4 @@ jobs:
           coverage report --fail-under=94
           coverage xml
       - name: Upload coverage to Codecov
-        uses: codecov/[email protected].2
+        uses: codecov/[email protected].3

.github/workflows/lock.yml

@@ -9,7 +9,7 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/[email protected].1
+      - uses: dessant/[email protected].2
         with:
           github-token: ${{ github.token }}
           issue-lock-inactive-days: "30"

.github/workflows/wheels.yml

@@ -66,6 +66,7 @@ jobs:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
         tag:
           - "3.9-alpine3.13"
+          - "3.9-alpine3.14"
     steps:
       - name: Checkout the repository
         uses: actions/[email protected]
@@ -106,6 +107,7 @@ jobs:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
         tag:
           - "3.9-alpine3.13"
+          - "3.9-alpine3.14"
     steps:
       - name: Checkout the repository
         uses: actions/[email protected]

.gitignore

@@ -2,7 +2,7 @@ config/*
 config2/*
 
 tests/testing_config/deps
-tests/testing_config/home-assistant.log
+tests/testing_config/home-assistant.log*
 
 # hass-release
 data/

.strict-typing

@@ -15,6 +15,7 @@ homeassistant.components.alarm_control_panel.*
 homeassistant.components.amazon_polly.*
 homeassistant.components.ambee.*
 homeassistant.components.ambient_station.*
+homeassistant.components.amcrest.*
 homeassistant.components.ampio.*
 homeassistant.components.automation.*
 homeassistant.components.binary_sensor.*

CODEOWNERS

@@ -29,6 +29,7 @@ homeassistant/components/aemet/* @noltari
 homeassistant/components/agent_dvr/* @ispysoftware
 homeassistant/components/airly/* @bieniu
 homeassistant/components/airnow/* @asymworks
+homeassistant/components/airtouch4/* @LonePurpleWolf
 homeassistant/components/airvisual/* @bachya
 homeassistant/components/alarmdecoder/* @ajschmidt8
 homeassistant/components/alexa/* @home-assistant/cloud @ochlocracy
@@ -118,7 +119,6 @@ homeassistant/components/dexcom/* @gagebenne
 homeassistant/components/dhcp/* @bdraco
 homeassistant/components/dht/* @thegardenmonkey
 homeassistant/components/digital_ocean/* @fabaff
-homeassistant/components/directv/* @ctalkington
 homeassistant/components/discogs/* @thibmaek
 homeassistant/components/doorbird/* @oblogic7 @bdraco
 homeassistant/components/dsmr/* @Robbie1221 @frenck
@@ -162,6 +162,7 @@ homeassistant/components/filter/* @dgomes
 homeassistant/components/fireservicerota/* @cyberjunky
 homeassistant/components/firmata/* @DaAwesomeP
 homeassistant/components/fixer/* @fabaff
+homeassistant/components/fjaraskupan/* @elupus
 homeassistant/components/flick_electric/* @ZephireNZ
 homeassistant/components/flipr/* @cnico
 homeassistant/components/flo/* @dmulcahey
@@ -187,7 +188,7 @@ homeassistant/components/geo_rss_events/* @exxamalte
 homeassistant/components/geonetnz_quakes/* @exxamalte
 homeassistant/components/geonetnz_volcano/* @exxamalte
 homeassistant/components/gios/* @bieniu
-homeassistant/components/github/* @timmo001
+homeassistant/components/github/* @timmo001 @ludeeus
 homeassistant/components/gitter/* @fabaff
 homeassistant/components/glances/* @fabaff @engrbm87
 homeassistant/components/goalzero/* @tkdrob
@@ -198,7 +199,7 @@ homeassistant/components/gpsd/* @fabaff
 homeassistant/components/gree/* @cmroche
 homeassistant/components/greeneye_monitor/* @jkeljo
 homeassistant/components/group/* @home-assistant/core
-homeassistant/components/growatt_server/* @indykoning @muppet3000
+homeassistant/components/growatt_server/* @indykoning @muppet3000 @JasperPlant
 homeassistant/components/guardian/* @bachya
 homeassistant/components/habitica/* @ASMfreaK @leikoilja
 homeassistant/components/harmony/* @ehendrix23 @bramkragten @bdraco @mkeesey
@@ -321,10 +322,11 @@ homeassistant/components/msteams/* @peroyvind
 homeassistant/components/mullvad/* @meichthys
 homeassistant/components/mutesync/* @currentoor
 homeassistant/components/my/* @home-assistant/core
-homeassistant/components/myq/* @bdraco
+homeassistant/components/myq/* @bdraco @ehendrix23
 homeassistant/components/mysensors/* @MartinHjelmare @functionpointer
 homeassistant/components/mystrom/* @fabaff
 homeassistant/components/nam/* @bieniu
+homeassistant/components/nanoleaf/* @milanmeu
 homeassistant/components/neato/* @dshokouhi @Santobert
 homeassistant/components/nederlandse_spoorwegen/* @YarmoM
 homeassistant/components/nello/* @pschmitt
@@ -339,6 +341,7 @@ homeassistant/components/nfandroidtv/* @tkdrob
 homeassistant/components/nightscout/* @marciogranzotto
 homeassistant/components/nilu/* @hfurubotten
 homeassistant/components/nissan_leaf/* @filcole
+homeassistant/components/nmap_tracker/* @bdraco
 homeassistant/components/nmbs/* @thibmaek
 homeassistant/components/no_ip/* @fabaff
 homeassistant/components/noaa_tides/* @jdelaney72
@@ -372,6 +375,7 @@ homeassistant/components/orangepi_gpio/* @pascallj
 homeassistant/components/oru/* @bvlaicu
 homeassistant/components/ovo_energy/* @timmo001
 homeassistant/components/ozw/* @cgarwood @marcelveldt @MartinHjelmare
+homeassistant/components/p1_monitor/* @klaasnicolaas
 homeassistant/components/panel_custom/* @home-assistant/frontend
 homeassistant/components/panel_iframe/* @home-assistant/frontend
 homeassistant/components/pcal9535a/* @Shulyaka
@@ -504,7 +508,7 @@ homeassistant/components/synology_dsm/* @hacf-fr @Quentame @mib1185
 homeassistant/components/synology_srm/* @aerialls
 homeassistant/components/syslog/* @fabaff
 homeassistant/components/system_bridge/* @timmo001
-homeassistant/components/tado/* @michaelarnauts @bdraco @noltari
+homeassistant/components/tado/* @michaelarnauts @noltari
 homeassistant/components/tag/* @balloob @dmulcahey
 homeassistant/components/tahoma/* @philklei
 homeassistant/components/tankerkoenig/* @guillempages
@@ -527,7 +531,7 @@ homeassistant/components/totalconnect/* @austinmroczek
 homeassistant/components/tplink/* @rytilahti @thegardenmonkey
 homeassistant/components/traccar/* @ludeeus
 homeassistant/components/trace/* @home-assistant/core
-homeassistant/components/tractive/* @Danielhiversen @zhulik
+homeassistant/components/tractive/* @Danielhiversen @zhulik @bieniu
 homeassistant/components/tradfri/* @janiversen
 homeassistant/components/trafikverket_train/* @endor-force
 homeassistant/components/trafikverket_weatherstation/* @endor-force
@@ -543,8 +547,9 @@ homeassistant/components/upb/* @gwww
 homeassistant/components/upc_connect/* @pvizeli @fabaff
 homeassistant/components/upcloud/* @scop
 homeassistant/components/updater/* @home-assistant/core
-homeassistant/components/upnp/* @StevenLooman
+homeassistant/components/upnp/* @StevenLooman @ehendrix23
 homeassistant/components/uptimerobot/* @ludeeus
+homeassistant/components/usb/* @bdraco
 homeassistant/components/usgs_earthquakes_feed/* @exxamalte
 homeassistant/components/utility_meter/* @dgomes
 homeassistant/components/velbus/* @Cereal2nd @brefra
@@ -580,7 +585,7 @@ homeassistant/components/worldclock/* @fabaff
 homeassistant/components/xbox/* @hunterjm
 homeassistant/components/xbox_live/* @MartinHjelmare
 homeassistant/components/xiaomi_aqara/* @danielhiversen @syssi
-homeassistant/components/xiaomi_miio/* @rytilahti @syssi @starkillerOG
+homeassistant/components/xiaomi_miio/* @rytilahti @syssi @starkillerOG @bieniu
 homeassistant/components/xiaomi_tv/* @simse
 homeassistant/components/xmpp/* @fabaff @flowolf
 homeassistant/components/yale_smart_alarm/* @gjohansson-ST

build.json

@@ -2,11 +2,11 @@
   "image": "homeassistant/{arch}-homeassistant",
   "shadow_repository": "ghcr.io/home-assistant",
   "build_from": {
-    "aarch64": "ghcr.io/home-assistant/aarch64-homeassistant-base:2021.07.0",
-    "armhf": "ghcr.io/home-assistant/armhf-homeassistant-base:2021.07.0",
-    "armv7": "ghcr.io/home-assistant/armv7-homeassistant-base:2021.07.0",
-    "amd64": "ghcr.io/home-assistant/amd64-homeassistant-base:2021.07.0",
-    "i386": "ghcr.io/home-assistant/i386-homeassistant-base:2021.07.0"
+    "aarch64": "ghcr.io/home-assistant/aarch64-homeassistant-base:2021.08.0",
+    "armhf": "ghcr.io/home-assistant/armhf-homeassistant-base:2021.08.0",
+    "armv7": "ghcr.io/home-assistant/armv7-homeassistant-base:2021.08.0",
+    "amd64": "ghcr.io/home-assistant/amd64-homeassistant-base:2021.08.0",
+    "i386": "ghcr.io/home-assistant/i386-homeassistant-base:2021.08.0"
   },
   "labels": {
     "io.hass.type": "core",

homeassistant/auth/auth_store.py

@@ -17,6 +17,8 @@
 from .permissions import PermissionLookup, system_policies
 from .permissions.types import PolicyType
 
+# mypy: disallow-any-generics
+
 STORAGE_VERSION = 1
 STORAGE_KEY = "auth"
 GROUP_NAME_ADMIN = "Administrators"
@@ -491,7 +493,7 @@ def _async_schedule_save(self) -> None:
         self._store.async_delay_save(self._data_to_save, 1)
 
     @callback
-    def _data_to_save(self) -> dict:
+    def _data_to_save(self) -> dict[str, list[dict[str, Any]]]:
         """Return the data to store."""
         assert self._users is not None
         assert self._groups is not None

homeassistant/auth/providers/__init__.py

@@ -22,6 +22,8 @@
 from ..const import MFA_SESSION_EXPIRATION
 from ..models import Credentials, RefreshToken, User, UserMeta
 
+# mypy: disallow-any-generics
+
 _LOGGER = logging.getLogger(__name__)
 DATA_REQS = "auth_prov_reqs_processed"
 
@@ -96,7 +98,7 @@ def async_create_credentials(self, data: dict[str, str]) -> Credentials:
 
     # Implement by extending class
 
-    async def async_login_flow(self, context: dict | None) -> LoginFlow:
+    async def async_login_flow(self, context: dict[str, Any] | None) -> LoginFlow:
         """Return the data flow for logging in with auth provider.
 
         Auth provider should extend LoginFlow and return an instance.

homeassistant/auth/providers/command_line.py

@@ -17,6 +17,8 @@
 from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 from ..models import Credentials, UserMeta
 
+# mypy: disallow-any-generics
+
 CONF_ARGS = "args"
 CONF_META = "meta"
 
@@ -56,7 +58,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         super().__init__(*args, **kwargs)
         self._user_meta: dict[str, dict[str, Any]] = {}
 
-    async def async_login_flow(self, context: dict | None) -> LoginFlow:
+    async def async_login_flow(self, context: dict[str, Any] | None) -> LoginFlow:
         """Return a flow to login."""
         return CommandLineLoginFlow(self)
 

homeassistant/auth/providers/homeassistant.py

@@ -19,6 +19,8 @@
 from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 from ..models import Credentials, UserMeta
 
+# mypy: disallow-any-generics
+
 STORAGE_VERSION = 1
 STORAGE_KEY = "auth_provider.homeassistant"
 
@@ -235,7 +237,7 @@ async def async_initialize(self) -> None:
             await data.async_load()
             self.data = data
 
-    async def async_login_flow(self, context: dict | None) -> LoginFlow:
+    async def async_login_flow(self, context: dict[str, Any] | None) -> LoginFlow:
         """Return a flow to login."""
         return HassLoginFlow(self)