Skip to content

Commit 67aefa6

Browse files
fix(ci): Apply isort formatting and add pytest.ini config (#23)
- Applied isort to sort imports in all Python files - Added asyncio_default_fixture_loop_scope=function to pytest.ini (was missing from previous commit)
1 parent 0aa4673 commit 67aefa6

6 files changed

Lines changed: 28 additions & 80 deletions

File tree

modbus_app/admin.py

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,11 @@
44

55
from django.contrib import admin
66

7-
from modbus_app.models import (
8-
Alarm,
9-
AlarmHistory,
10-
AuditLog,
11-
CalculatedRegister,
12-
DashboardGroup,
13-
DashboardWidget,
14-
Device,
15-
DeviceTemplate,
16-
ModbusInterface,
17-
Register,
18-
TrendData,
19-
TrendDataAggregated,
20-
)
7+
from modbus_app.models import (Alarm, AlarmHistory, AuditLog,
8+
CalculatedRegister, DashboardGroup,
9+
DashboardWidget, Device, DeviceTemplate,
10+
ModbusInterface, Register, TrendData,
11+
TrendDataAggregated)
2112

2213

2314
@admin.register(ModbusInterface)

modbus_app/serializers.py

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,9 @@
55
from django.utils import timezone
66
from rest_framework import serializers
77

8-
from .models import (
9-
Alarm,
10-
AlarmHistory,
11-
AuditLog,
12-
CalculatedRegister,
13-
DashboardGroup,
14-
DashboardWidget,
15-
Device,
16-
DeviceTemplate,
17-
ModbusInterface,
18-
Register,
19-
TrendData,
20-
TrendDataAggregated,
21-
)
8+
from .models import (Alarm, AlarmHistory, AuditLog, CalculatedRegister,
9+
DashboardGroup, DashboardWidget, Device, DeviceTemplate,
10+
ModbusInterface, Register, TrendData, TrendDataAggregated)
2211

2312

2413
class ModbusInterfaceSerializer(serializers.ModelSerializer):

modbus_app/tasks.py

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,16 @@
99
from django.db import transaction
1010
from django.utils import timezone
1111

12-
from modbus_app.models import (
13-
Alarm,
14-
AlarmHistory,
15-
Device,
16-
ModbusInterface,
17-
Register,
18-
TrendData,
19-
TrendDataAggregated,
20-
)
12+
from modbus_app.models import (Alarm, AlarmHistory, Device, ModbusInterface,
13+
Register, TrendData, TrendDataAggregated)
2114
from modbus_app.services.alarm_checker import AlarmChecker
2215
from modbus_app.services.connection_manager import get_connection_manager
2316
from modbus_app.services.data_aggregator import DataAggregator
2417
from modbus_app.services.register_service import get_register_service
25-
from modbus_app.utils.websocket_broadcast import (
26-
broadcast_alarm,
27-
broadcast_connection_status,
28-
broadcast_device_update,
29-
broadcast_register_update,
30-
)
18+
from modbus_app.utils.websocket_broadcast import (broadcast_alarm,
19+
broadcast_connection_status,
20+
broadcast_device_update,
21+
broadcast_register_update)
3122

3223
logger = logging.getLogger(__name__)
3324

modbus_app/views.py

Lines changed: 12 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13,37 +13,18 @@
1313
from rest_framework.permissions import IsAdminUser, IsAuthenticated
1414
from rest_framework.response import Response
1515

16-
from .models import (
17-
Alarm,
18-
AlarmHistory,
19-
AuditLog,
20-
CalculatedRegister,
21-
DashboardGroup,
22-
DashboardWidget,
23-
Device,
24-
DeviceTemplate,
25-
ModbusInterface,
26-
Register,
27-
TrendData,
28-
TrendDataAggregated,
29-
)
30-
from .serializers import (
31-
AlarmHistorySerializer,
32-
AlarmSerializer,
33-
AuditLogSerializer,
34-
CalculatedRegisterSerializer,
35-
DashboardGroupSerializer,
36-
DashboardWidgetSerializer,
37-
DeviceListSerializer,
38-
DeviceSerializer,
39-
DeviceTemplateSerializer,
40-
ModbusInterfaceListSerializer,
41-
ModbusInterfaceSerializer,
42-
RegisterListSerializer,
43-
RegisterSerializer,
44-
TrendDataAggregatedSerializer,
45-
TrendDataSerializer,
46-
)
16+
from .models import (Alarm, AlarmHistory, AuditLog, CalculatedRegister,
17+
DashboardGroup, DashboardWidget, Device, DeviceTemplate,
18+
ModbusInterface, Register, TrendData, TrendDataAggregated)
19+
from .serializers import (AlarmHistorySerializer, AlarmSerializer,
20+
AuditLogSerializer, CalculatedRegisterSerializer,
21+
DashboardGroupSerializer, DashboardWidgetSerializer,
22+
DeviceListSerializer, DeviceSerializer,
23+
DeviceTemplateSerializer,
24+
ModbusInterfaceListSerializer,
25+
ModbusInterfaceSerializer, RegisterListSerializer,
26+
RegisterSerializer, TrendDataAggregatedSerializer,
27+
TrendDataSerializer)
4728
from .services.register_service import RegisterService
4829

4930

modbus_webserver/asgi.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
django_asgi_app = get_asgi_application()
1515

1616
from channels.auth import AuthMiddlewareStack
17-
1817
# Import after Django setup
1918
from channels.routing import ProtocolTypeRouter, URLRouter
2019

modbus_webserver/urls.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@
66
from django.conf.urls.static import static
77
from django.contrib import admin
88
from django.urls import include, path
9-
from drf_spectacular.views import (
10-
SpectacularAPIView,
11-
SpectacularRedocView,
12-
SpectacularSwaggerView,
13-
)
9+
from drf_spectacular.views import (SpectacularAPIView, SpectacularRedocView,
10+
SpectacularSwaggerView)
1411

1512
urlpatterns = [
1613
# Admin

0 commit comments

Comments
 (0)