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

# Conflicts:
#	homeassistant/components/concord232/manifest.json

.core_files.yaml

@@ -20,11 +20,14 @@ base_platforms: &base_platforms
   - homeassistant/components/camera/**
   - homeassistant/components/climate/**
   - homeassistant/components/cover/**
+  - homeassistant/components/date/**
+  - homeassistant/components/datetime/**
   - homeassistant/components/device_tracker/**
   - homeassistant/components/diagnostics/**
   - homeassistant/components/fan/**
   - homeassistant/components/geo_location/**
   - homeassistant/components/humidifier/**
+  - homeassistant/components/image/**
   - homeassistant/components/image_processing/**
   - homeassistant/components/light/**
   - homeassistant/components/lock/**
@@ -38,6 +41,8 @@ base_platforms: &base_platforms
   - homeassistant/components/siren/**
   - homeassistant/components/stt/**
   - homeassistant/components/switch/**
+  - homeassistant/components/text/**
+  - homeassistant/components/time/**
   - homeassistant/components/tts/**
   - homeassistant/components/update/**
   - homeassistant/components/vacuum/**
@@ -113,13 +118,18 @@ tests: &tests
   - tests/auth/**
   - tests/backports/**
   - tests/common.py
+  - tests/components/history/**
+  - tests/components/logbook/**
+  - tests/components/recorder/**
+  - tests/components/sensor/**
   - tests/conftest.py
   - tests/hassfest/**
   - tests/helpers/**
   - tests/ignore_uncaught_exceptions.py
   - tests/mock/**
   - tests/pylint/**
   - tests/scripts/**
+  - tests/syrupy.py
   - tests/test_util/**
   - tests/testing_config/**
   - tests/util/**
@@ -131,7 +141,6 @@ other: &other
 requirements: &requirements
   - .github/workflows/**
   - homeassistant/package_constraints.txt
-  - script/pip_check
   - requirements*.txt
   - pyproject.toml
 

.devcontainer/devcontainer.json

@@ -20,7 +20,6 @@
     "python.linting.enabled": true,
     "python.linting.pylintEnabled": true,
     "python.formatting.blackPath": "/usr/local/bin/black",
-    "python.linting.flake8Path": "/usr/local/bin/flake8",
     "python.linting.pycodestylePath": "/usr/local/bin/pycodestyle",
     "python.linting.pydocstylePath": "/usr/local/bin/pydocstyle",
     "python.linting.mypyPath": "/usr/local/bin/mypy",

.dockerignore

@@ -9,7 +9,6 @@ docs
 .vscode
 
 # Test related files
-.tox
 tests
 
 # Other virtualization methods

.gitattributes

@@ -8,5 +8,6 @@
 *.png binary
 *.zip binary
 *.mp3 binary
+*.pcm binary
 
 Dockerfile.dev linguist-language=Dockerfile

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -31,9 +31,9 @@ body:
       label: What version of Home Assistant Core has the issue?
       placeholder: core-
       description: >
-        Can be found in: [Settings -> About](https://my.home-assistant.io/redirect/info/).
+        Can be found in: [Settings ⇒ System ⇒ Repairs ⇒ Three Dots in Upper Right ⇒ System information](https://my.home-assistant.io/redirect/system_health/).
 
-        [![Open your Home Assistant instance and show your Home Assistant version information.](https://my.home-assistant.io/badges/info.svg)](https://my.home-assistant.io/redirect/info/)
+        [![Open your Home Assistant instance and show the system information.](https://my.home-assistant.io/badges/system_health.svg)](https://my.home-assistant.io/redirect/system_health/)
   - type: input
     attributes:
       label: What was the last working version of Home Assistant Core?
@@ -46,9 +46,9 @@ body:
     attributes:
       label: What type of installation are you running?
       description: >
-        Can be found in: [Settings -> System-> Repairs -> Three Dots in Upper Right -> System information](https://my.home-assistant.io/redirect/system_health/).
+        Can be found in: [Settings ⇒ System ⇒ Repairs ⇒ Three Dots in Upper Right ⇒ System information](https://my.home-assistant.io/redirect/system_health/).
 
-        [![Open your Home Assistant instance and show health information about your system.](https://my.home-assistant.io/badges/system_health.svg)](https://my.home-assistant.io/redirect/system_health/)
+        [![Open your Home Assistant instance and show the system information.](https://my.home-assistant.io/badges/system_health.svg)](https://my.home-assistant.io/redirect/system_health/)
       options:
         - Home Assistant OS
         - Home Assistant Container
@@ -59,15 +59,15 @@ body:
     attributes:
       label: Integration causing the issue
       description: >
-        The name of the integration. For example: Automation, Philips Hue
+        The name of the integration, for example Automation or Philips Hue.
   - type: input
     id: integration_link
     attributes:
       label: Link to integration documentation on our website
       placeholder: "https://www.home-assistant.io/integrations/..."
       description: |
-        Providing a link [to the documentation][docs] helps us categorize the
-        issue, while also providing a useful reference for others.
+        Providing a link [to the documentation][docs] helps us categorize the issue and might speed up the
+        investigation by automatically informing a contributor, while also providing a useful reference for others.
 
         [docs]: https://www.home-assistant.io/integrations
 
@@ -80,8 +80,7 @@ body:
       label: Diagnostics information
       placeholder: "drag-and-drop the diagnostics data file here (do not copy-and-paste the content)"
       description: >-
-        Many integrations provide the ability to download diagnostic data
-        on the device page (and on the integration dashboard).
+        Many integrations provide the ability to [download diagnostic data](https://www.home-assistant.io/docs/configuration/troubleshooting/#debug-logs-and-diagnostics).
 
         **It would really help if you could download the diagnostics data for the device you are having issues with,
         and <ins>drag-and-drop that file into the textbox below.</ins>**

.github/ISSUE_TEMPLATE/config.yml

@@ -1,6 +1,6 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Report a bug with the UI, Frontend or Lovelace
+  - name: Report a bug with the UI, Frontend or Dashboards
     url: https://github.com/home-assistant/frontend/issues
     about: This is the issue tracker for our backend. Please report issues with the UI in the frontend repository.
   - name: Report incorrect or missing information on our website

.github/PULL_REQUEST_TEMPLATE.md

@@ -59,6 +59,7 @@
 - [ ] Local tests pass. **Your PR cannot be merged unless tests pass**
 - [ ] There is no commented out code in this PR.
 - [ ] I have followed the [development checklist][dev-checklist]
+- [ ] I have followed the [perfect PR recommendations][perfect-pr]
 - [ ] The code has been formatted using Black (`black --fast homeassistant tests`)
 - [ ] Tests have been added to verify that the new code works.
 
@@ -103,7 +104,8 @@ To help with the load of incoming pull requests:
 
   Below, some useful links you could explore:
 -->
-[dev-checklist]: https://developers.home-assistant.io/docs/en/development_checklist.html
-[manifest-docs]: https://developers.home-assistant.io/docs/en/creating_integration_manifest.html
-[quality-scale]: https://developers.home-assistant.io/docs/en/next/integration_quality_scale_index.html
+[dev-checklist]: https://developers.home-assistant.io/docs/development_checklist/
+[manifest-docs]: https://developers.home-assistant.io/docs/creating_integration_manifest/
+[quality-scale]: https://developers.home-assistant.io/docs/integration_quality_scale_index/
 [docs-repository]: https://github.com/home-assistant/home-assistant.io
+[perfect-pr]: https://developers.home-assistant.io/docs/review-process/#creating-the-perfect-pr