Resolve conflits #160

Job	Run time
Collect information & changes data	14s
Prepare pre-commit base	16s
Prepare dependencies (3.12)	15s
Check mypy	53s
Check hassfest	49s
Check all requirements	25s
Audit licenses	0s
Split tests for full run	7m 42s
Check pylint	8m 12s
Check pylint on tests	5m 55s
Check other linters	55s
Check ruff-format	10s
Check ruff	17s
Run tests Python ${{ matrix.python-version }} (${{ matrix.group }})	0s
Run postgres:12.14 tests Python 3.12	10m 26s
Run mariadb:10.3.32 tests Python 3.12	10m 7s
Run postgres:15.2 tests Python 3.12	10m 40s
Run mariadb:10.6.10 tests Python 3.12	10m 13s
Run mariadb:10.10.3 tests Python 3.12	9m 40s
Run mariadb:10.11.2 tests Python 3.12	9m 51s
Run mysql:8.0.32 tests Python 3.12	13m 29s
Upload test coverage to Codecov (partial suite)	0s
Run tests Python 3.12 (1)	8m 28s
Run tests Python 3.12 (2)	7m 7s
Run tests Python 3.12 (3)	8m 14s
Run tests Python 3.12 (4)	9m 17s
Run tests Python 3.12 (5)	11m 34s
Run tests Python 3.12 (6)	12m 36s
Run tests Python 3.12 (7)	10m 28s
Run tests Python 3.12 (8)	9m 59s
Run tests Python 3.12 (9)	11m 26s
Run tests Python 3.12 (10)	12m 56s
Upload test coverage to Codecov (full suite)	17s
	3h 22m 51s

Provide feedback