Merge pull request #554 from jwillemsen/jwi-precommit

Removed reorder-python-imports, it conflicts with black, see https://…

.github/workflows/constraints.txt

@@ -2,4 +2,3 @@ pip==24.0
 pre-commit==3.6.2
 black==24.2.0
 flake8==7.0.0
-reorder-python-imports==3.12.0

.github/workflows/tests.yaml

@@ -34,7 +34,7 @@ jobs:
 
       - name: Install Python modules
         run: |
-          pip install --constraint=.github/workflows/constraints.txt pre-commit black flake8 reorder-python-imports
+          pip install --constraint=.github/workflows/constraints.txt pre-commit black flake8
 
       - name: Run pre-commit on all files
         run: |

.pre-commit-config.yaml

@@ -20,12 +20,6 @@ repos:
         language: system
         types: [python]
         require_serial: true
-      - id: reorder-python-imports
-        name: Reorder python imports
-        entry: reorder-python-imports
-        language: system
-        types: [python]
-        args: [--application-directories=custom_components]
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v3.1.0
     hooks:

custom_components/myenergi/__init__.py

@@ -4,6 +4,7 @@
 For more details about this integration, please refer to
 https://github.com/cjne/myenergi
 """
+
 import asyncio
 import logging
 from datetime import timedelta

custom_components/myenergi/binary_sensor.py

@@ -1,4 +1,5 @@
 """Sensor platform for myenergi."""
+
 import operator
 
 from homeassistant.components.binary_sensor import BinarySensorEntity

custom_components/myenergi/config_flow.py

@@ -1,4 +1,5 @@
 """Adds config flow for myenergi."""
+
 import logging
 import traceback
 

custom_components/myenergi/const.py

@@ -1,4 +1,5 @@
 """Constants for myenergi."""
+
 # Base component constants
 NAME = "myenergi"
 DOMAIN = "myenergi"

custom_components/myenergi/diagnostics.py

@@ -1,4 +1,5 @@
 """Diagnostics support for Daikin Diagnostics."""
+
 from __future__ import annotations
 
 from typing import Any

custom_components/myenergi/entity.py

@@ -1,4 +1,5 @@
 """MyenergiEntity class"""
+
 import logging
 
 from homeassistant.helpers.entity import EntityCategory

custom_components/myenergi/number.py

@@ -1,4 +1,5 @@
 """Sensor platform for myenergi."""
+
 from homeassistant.components.number import NumberEntity
 from homeassistant.helpers.entity import EntityCategory
 

custom_components/myenergi/select.py

@@ -1,4 +1,5 @@
 """Sensor platform for myenergi."""
+
 import voluptuous as vol
 from homeassistant.components.select import SelectEntity
 from homeassistant.helpers import entity_platform

custom_components/myenergi/sensor.py

@@ -1,4 +1,5 @@
 """Sensor platform for myenergi."""
+
 import operator
 
 from homeassistant.components.sensor import SensorDeviceClass

requirements_dev.txt

@@ -1,7 +1,6 @@
 pre-commit==3.6.2
 black==24.2.0
 flake8==7.0.0
-reorder-python-imports==3.12.0
 homeassistant
 pymyenergi
 pytest

tests/__init__.py

@@ -1,4 +1,5 @@
 """Tests for myenergi integration."""
+
 from __future__ import annotations
 
 import json

tests/conftest.py

@@ -1,4 +1,5 @@
 """Global fixtures for myenergi integration."""
+
 from typing import Any
 from unittest.mock import patch
 

tests/const.py

@@ -1,4 +1,5 @@
 """Constants for myenergi tests."""
+
 from custom_components.myenergi.const import (
     CONF_PASSWORD,
 )

tests/test_config_flow.py

@@ -1,4 +1,5 @@
 """Test myenergi config flow."""
+
 from unittest.mock import patch
 
 import pytest

tests/test_init.py

@@ -1,4 +1,5 @@
 """Test myenergi setup process."""
+
 import pytest
 from custom_components.myenergi import (
     async_reload_entry,

tests/test_number.py

@@ -1,4 +1,5 @@
 """Test myenergi sensor."""
+
 from unittest.mock import MagicMock
 
 from homeassistant.components.number import DOMAIN as NUMBER_DOMAIN

tests/test_select.py

@@ -1,4 +1,5 @@
 """Test myenergi sensor."""
+
 from unittest.mock import MagicMock
 
 from homeassistant.components.select import DOMAIN as SELECT_DOMAIN

tests/test_sensor.py

@@ -1,4 +1,5 @@
 """Test myenergi sensor."""
+
 from homeassistant.core import HomeAssistant
 
 from . import setup_mock_myenergi_config_entry

tests/test_services.py

@@ -1,4 +1,5 @@
 """Test myenergi sensor."""
+
 from unittest.mock import MagicMock
 
 from homeassistant.const import ATTR_ENTITY_ID