Skip to content

Commit 4900515

Browse files
Replace flake8 with ruff (#2092)
1 parent 737a6a4 commit 4900515

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+301
-282
lines changed

.flake8

-5
This file was deleted.

.github/workflows/python-lint.yaml

+2-4
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ jobs:
4141
run: |
4242
poetry install --only=dev-host
4343
44-
- name: Analyzing the code with flake8
44+
- name: Analyzing the code with ruff
4545
run: |
46-
if [ -n "$(git ls-files '*.py')" ]; then
47-
poetry run flake8 $(git ls-files '*.py')
48-
fi
46+
poetry run ruff check .

anthias_app/helpers.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import uuid
2-
import yaml
2+
from os import getenv, path
33

4+
import yaml
45
from django.shortcuts import render
56
from django.utils import timezone
7+
8+
from anthias_app.models import Asset
69
from lib.github import is_up_to_date
710
from lib.utils import get_video_duration
8-
from os import getenv, path
9-
from anthias_app.models import Asset
1011
from settings import settings
1112

1213

anthias_app/models.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import uuid
2+
23
from django.db import models
34
from django.utils import timezone
45

anthias_app/urls.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from django.urls import path
2+
23
from . import views
34

45
app_name = 'anthias_app'

anthias_app/views.py

+15-13
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
1+
import ipaddress
12
from datetime import timedelta
2-
from django.views.decorators.http import require_http_methods
3-
from hurry.filesize import size
43
from os import (
54
getenv,
65
statvfs,
76
)
87
from platform import machine
9-
from settings import (
10-
CONFIGURABLE_SETTINGS,
11-
DEFAULTS,
12-
settings,
13-
ZmqPublisher,
14-
)
158
from urllib.parse import urlparse
9+
10+
import psutil
11+
from django.views.decorators.http import require_http_methods
12+
from hurry.filesize import size
13+
1614
from lib import (
17-
diagnostics,
1815
device_helper,
16+
diagnostics,
1917
)
2018
from lib.auth import authorized
2119
from lib.utils import (
@@ -26,14 +24,18 @@
2624
is_demo_node,
2725
is_docker,
2826
)
27+
from settings import (
28+
CONFIGURABLE_SETTINGS,
29+
DEFAULTS,
30+
ZmqPublisher,
31+
settings,
32+
)
33+
2934
from .helpers import (
3035
add_default_assets,
3136
remove_default_assets,
3237
template,
3338
)
34-
import ipaddress
35-
import psutil
36-
3739

3840
r = connect_to_redis()
3941

@@ -138,7 +140,7 @@ def settings_page(request):
138140
context['flash'] = {'class': "danger", 'message': e}
139141
else:
140142
settings.load()
141-
for field, default in list(DEFAULTS['viewer'].items()):
143+
for field, _default in list(DEFAULTS['viewer'].items()):
142144
context[field] = settings[field]
143145

144146
auth_backends = []

anthias_django/settings.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
https://docs.djangoproject.com/en/3.2/ref/settings/
1111
"""
1212

13-
import pytz
1413
import secrets
15-
from pathlib import Path
1614
from os import getenv
15+
from pathlib import Path
16+
17+
import pytz
1718

1819
from settings import settings as device_settings
1920

anthias_django/urls.py

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
from django.contrib import admin
1717
from django.urls import include, path
1818
from drf_spectacular.views import SpectacularAPIView, SpectacularRedocView
19+
1920
from lib.auth import authorized
2021

2122

api/helpers.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22

33
from dateutil import parser as date_parser
44
from rest_framework import status
5-
from rest_framework.views import exception_handler
65
from rest_framework.response import Response
6+
from rest_framework.views import exception_handler
7+
78
from anthias_app.models import Asset
89

910

10-
class AssetCreationException(Exception):
11+
class AssetCreationError(Exception):
1112
def __init__(self, errors):
1213
self.errors = errors
1314

api/serializers/__init__.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from os import path
2+
23
from django.utils import timezone
34
from rest_framework.serializers import (
45
CharField,
@@ -7,6 +8,7 @@
78
ModelSerializer,
89
Serializer,
910
)
11+
1012
from anthias_app.models import Asset
1113
from lib.utils import validate_url
1214

api/serializers/mixins.py

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
url_fails,
88
)
99
from settings import settings
10+
1011
from . import (
1112
get_unique_name,
1213
validate_uri,

api/serializers/v1_1.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import uuid
22
from os import path, rename
3+
34
from django.utils import timezone
45
from rest_framework.serializers import (
56
BooleanField,
@@ -15,6 +16,7 @@
1516
url_fails,
1617
)
1718
from settings import settings
19+
1820
from . import (
1921
get_unique_name,
2022
validate_uri,

api/serializers/v2.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
from django.utils import timezone
2-
from anthias_app.models import Asset
32
from rest_framework.serializers import (
43
BooleanField,
54
CharField,
@@ -9,6 +8,7 @@
98
Serializer,
109
)
1110

11+
from anthias_app.models import Asset
1212
from api.serializers import UpdateAssetSerializer
1313
from api.serializers.mixins import CreateAssetSerializerMixin
1414

api/tests.py

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
import json
2+
from os import path
3+
from pathlib import Path
4+
from unittest import mock
25

36
from django.conf import settings as django_settings
47
from django.test import TestCase
58
from django.urls import reverse
6-
from os import path
7-
from pathlib import Path
8-
from rest_framework.test import APIClient
99
from rest_framework import status
10-
from settings import settings as anthias_settings
11-
from unittest import mock
12-
from unittest_parametrize import parametrize, ParametrizedTestCase
10+
from rest_framework.test import APIClient
11+
from unittest_parametrize import ParametrizedTestCase, parametrize
1312

1413
from anthias_app.models import Asset
15-
14+
from settings import settings as anthias_settings
1615

1716
ASSET_LIST_V1_1_URL = reverse('api:asset_list_v1_1')
1817
ASSET_CREATION_DATA = {

api/urls/v1.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
from django.urls import path
22

33
from api.views.v1 import (
4-
AssetViewV1,
5-
AssetListViewV1,
64
AssetContentViewV1,
7-
FileAssetViewV1,
8-
PlaylistOrderViewV1,
9-
BackupViewV1,
10-
RecoverViewV1,
5+
AssetListViewV1,
116
AssetsControlViewV1,
7+
AssetViewV1,
8+
BackupViewV1,
9+
FileAssetViewV1,
1210
InfoView,
11+
PlaylistOrderViewV1,
1312
RebootViewV1,
13+
RecoverViewV1,
1414
ShutdownViewV1,
15-
ViewerCurrentAssetViewV1
15+
ViewerCurrentAssetViewV1,
1616
)
1717

1818

api/urls/v1_1.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
from django.urls import path
22

3-
from api.views.v1_1 import (
4-
AssetListViewV1_1,
5-
AssetViewV1_1
6-
)
3+
from api.views.v1_1 import AssetListViewV1_1, AssetViewV1_1
74

85

96
def get_url_patterns():

api/urls/v1_2.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
from django.urls import path
22

3-
from api.views.v1_2 import (
4-
AssetListViewV1_2,
5-
AssetViewV1_2
6-
)
3+
from api.views.v1_2 import AssetListViewV1_2, AssetViewV1_2
74

85

96
def get_url_patterns():

api/urls/v2.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
from api.views.v2 import (
44
AssetContentViewV2,
5-
AssetsControlViewV2,
65
AssetListViewV2,
6+
AssetsControlViewV2,
77
AssetViewV2,
88
BackupViewV2,
9+
FileAssetViewV2,
910
PlaylistOrderViewV2,
10-
RecoverViewV2,
1111
RebootViewV2,
12+
RecoverViewV2,
1213
ShutdownViewV2,
13-
FileAssetViewV2
1414
)
1515

1616

api/views/mixins.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import uuid
2-
32
from base64 import b64encode
43
from inspect import cleandoc
5-
from drf_spectacular.utils import extend_schema, OpenApiParameter, OpenApiTypes
6-
from mimetypes import guess_type, guess_extension
4+
from mimetypes import guess_extension, guess_type
5+
from os import path, remove
6+
7+
from drf_spectacular.utils import OpenApiParameter, OpenApiTypes, extend_schema
78
from rest_framework import status
89
from rest_framework.response import Response
910
from rest_framework.views import APIView
10-
from lib import backup_helper
11-
from lib.auth import authorized
1211

1312
from anthias_app.models import Asset
1413
from api.helpers import save_active_assets_ordering
1514
from celery_tasks import reboot_anthias, shutdown_anthias
16-
from os import path, remove
17-
from settings import settings, ZmqPublisher
15+
from lib import backup_helper
16+
from lib.auth import authorized
17+
from settings import ZmqPublisher, settings
1818

1919

2020
class DeleteAssetViewMixin:

api/views/v1.py

+22-21
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,26 @@
1+
from os import statvfs
2+
3+
from drf_spectacular.utils import (
4+
OpenApiExample,
5+
OpenApiRequest,
6+
extend_schema,
7+
inline_serializer,
8+
)
9+
from hurry.filesize import size
110
from rest_framework import serializers, status
211
from rest_framework.response import Response
312
from rest_framework.views import APIView
4-
from api.serializers.v1_1 import CreateAssetSerializerV1_1
5-
from api.serializers import (
6-
AssetSerializer,
7-
UpdateAssetSerializer,
8-
)
13+
14+
from anthias_app.models import Asset
915
from api.helpers import (
10-
AssetCreationException,
16+
AssetCreationError,
1117
parse_request,
1218
)
13-
from drf_spectacular.utils import (
14-
extend_schema,
15-
inline_serializer,
16-
OpenApiExample,
17-
OpenApiRequest,
19+
from api.serializers import (
20+
AssetSerializer,
21+
UpdateAssetSerializer,
1822
)
19-
from hurry.filesize import size
20-
from lib import diagnostics
21-
from lib.auth import authorized
22-
from lib.github import is_up_to_date
23-
from lib.utils import connect_to_redis
24-
from os import statvfs
25-
from anthias_app.models import Asset
23+
from api.serializers.v1_1 import CreateAssetSerializerV1_1
2624
from api.views.mixins import (
2725
AssetContentViewMixin,
2826
AssetsControlViewMixin,
@@ -34,9 +32,12 @@
3432
RecoverViewMixin,
3533
ShutdownViewMixin,
3634
)
35+
from lib import diagnostics
36+
from lib.auth import authorized
37+
from lib.github import is_up_to_date
38+
from lib.utils import connect_to_redis
3739
from settings import ZmqCollector, ZmqPublisher
3840

39-
4041
r = connect_to_redis()
4142

4243
MODEL_STRING_EXAMPLE = """
@@ -146,8 +147,8 @@ def post(self, request, format=None):
146147
try:
147148
serializer = CreateAssetSerializerV1_1(data=data)
148149
if not serializer.is_valid():
149-
raise AssetCreationException(serializer.errors)
150-
except AssetCreationException as error:
150+
raise AssetCreationError(serializer.errors)
151+
except AssetCreationError as error:
151152
return Response(error.errors, status=status.HTTP_400_BAD_REQUEST)
152153

153154
asset = Asset.objects.create(**serializer.data)

0 commit comments

Comments
 (0)