Apply ruff - I fixes

ulgens · ulgens · commit c2b84578df3f · 2025-12-18T13:31:53.000+03:00
diff --git a/drf_haystack/__init__.py b/drf_haystack/__init__.py
@@ -1,6 +1,5 @@
 import warnings
 
-
 __title__ = "drf-haystack"
 __version__ = "1.9.1"
 __author__ = "Rolf Haavard Blindheim"
diff --git a/drf_haystack/filters.py b/drf_haystack/filters.py
@@ -1,12 +1,12 @@
 import operator
-import six
 from functools import reduce
 
+import six
 from django.core.exceptions import ImproperlyConfigured
 from haystack.query import SearchQuerySet
 from rest_framework.filters import BaseFilterBackend, OrderingFilter
 
-from drf_haystack.query import BoostQueryBuilder, FilterQueryBuilder, FacetQueryBuilder, SpatialQueryBuilder
+from drf_haystack.query import BoostQueryBuilder, FacetQueryBuilder, FilterQueryBuilder, SpatialQueryBuilder
 
 
 class BaseHaystackFilterBackend(BaseFilterBackend):
diff --git a/drf_haystack/generics.py b/drf_haystack/generics.py
@@ -1,6 +1,5 @@
 from django.contrib.contenttypes.models import ContentType
 from django.http import Http404
-
 from haystack.backends import SQ
 from haystack.query import SearchQuerySet
 from rest_framework.generics import GenericAPIView
diff --git a/drf_haystack/query.py b/drf_haystack/query.py
@@ -1,9 +1,8 @@
 import operator
-import six
 import warnings
 from itertools import chain
 
-
+import six
 from dateutil import parser
 
 from drf_haystack import constants
diff --git a/drf_haystack/serializers.py b/drf_haystack/serializers.py
@@ -1,23 +1,23 @@
 import copy
-from itertools import chain
 from datetime import datetime
+from itertools import chain
 
 try:
     from collections import OrderedDict
 except ImportError:
     from django.utils.datastructures import SortedDict as OrderedDict
 
-from django.core.exceptions import ImproperlyConfigured, FieldDoesNotExist
-
+from django.core.exceptions import FieldDoesNotExist, ImproperlyConfigured
 from haystack import fields as haystack_fields
 from haystack.query import EmptySearchQuerySet
 from haystack.utils.highlighting import Highlighter
-
 from rest_framework import serializers
 from rest_framework.fields import empty
 from rest_framework.utils.field_mapping import ClassLookupDict, get_field_kwargs
 
 from drf_haystack.fields import (
+    FacetDictField,
+    FacetListField,
     HaystackBooleanField,
     HaystackCharField,
     HaystackDateField,
@@ -26,8 +26,6 @@
     HaystackFloatField,
     HaystackIntegerField,
     HaystackMultiValueField,
-    FacetDictField,
-    FacetListField,
 )
 
 
diff --git a/ez_setup.py b/ez_setup.py
@@ -14,12 +14,12 @@
 This file can also be run as a script to install or upgrade setuptools.
 """
 
+import fnmatch
 import os
 import sys
-import time
-import fnmatch
-import tempfile
 import tarfile
+import tempfile
+import time
 from distutils import log
 
 try:
diff --git a/setup.py b/setup.py
@@ -1,5 +1,5 @@
-import re
 import os
+import re
 
 try:
     from setuptools import setup
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -1,5 +1,6 @@
 import os
 from importlib.util import find_spec
+
 import django
 
 test_runner = None
diff --git a/tests/constants.py b/tests/constants.py
@@ -1,5 +1,6 @@
-import os
 import json
+import os
+
 from django.conf import settings
 
 with open(os.path.join(settings.BASE_DIR, "mockapp", "fixtures", "mocklocation.json")) as f:
diff --git a/tests/mockapp/migrations/0001_initial.py b/tests/mockapp/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
diff --git a/tests/mockapp/migrations/0002_mockperson.py b/tests/mockapp/migrations/0002_mockperson.py
@@ -1,4 +1,4 @@
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
diff --git a/tests/mockapp/migrations/0003_mockpet.py b/tests/mockapp/migrations/0003_mockpet.py
@@ -1,4 +1,4 @@
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
diff --git a/tests/mockapp/migrations/0005_mockperson_birthdate.py b/tests/mockapp/migrations/0005_mockperson_birthdate.py
@@ -1,6 +1,7 @@
 # Generated by Django 1.9.4 on 2016-04-16 07:05
 
 from django.db import migrations, models
+
 import tests.mockapp.models
 
 
diff --git a/tests/mockapp/migrations/0006_mockallfield.py b/tests/mockapp/migrations/0006_mockallfield.py
@@ -1,6 +1,7 @@
 # Generated by Django 1.11.9 on 2018-03-22 22:46
 
 from django.db import migrations, models
+
 import tests.mockapp.models
 
 
diff --git a/tests/mockapp/models.py b/tests/mockapp/models.py
@@ -1,7 +1,7 @@
-import pytz
 from datetime import date, datetime, timedelta
-from random import randrange, randint
+from random import randint, randrange
 
+import pytz
 from django.db import models
 
 
diff --git a/tests/mockapp/search_indexes.py b/tests/mockapp/search_indexes.py
@@ -1,7 +1,7 @@
 from django.utils import timezone
 from haystack import indexes
 
-from .models import MockLocation, MockPerson, MockPet, MockAllField
+from .models import MockAllField, MockLocation, MockPerson, MockPet
 
 
 class MockLocationIndex(indexes.SearchIndex, indexes.Indexable):
diff --git a/tests/mockapp/serializers.py b/tests/mockapp/serializers.py
@@ -1,8 +1,10 @@
 from datetime import datetime, timedelta
+
 from rest_framework.serializers import HyperlinkedIdentityField
 
-from drf_haystack.serializers import HaystackSerializer, HaystackFacetSerializer, HighlighterMixin
-from .search_indexes import MockPersonIndex, MockLocationIndex
+from drf_haystack.serializers import HaystackFacetSerializer, HaystackSerializer, HighlighterMixin
+
+from .search_indexes import MockLocationIndex, MockPersonIndex
 
 
 class SearchSerializer(HaystackSerializer):
diff --git a/tests/mockapp/views.py b/tests/mockapp/views.py
@@ -1,13 +1,13 @@
-from rest_framework.pagination import PageNumberPagination, LimitOffsetPagination
+from rest_framework.pagination import LimitOffsetPagination, PageNumberPagination
 
 from drf_haystack.filters import (
     HaystackFilter,
 )
-from drf_haystack.viewsets import HaystackViewSet
 from drf_haystack.mixins import FacetMixin, MoreLikeThisMixin
+from drf_haystack.viewsets import HaystackViewSet
 
 from .models import MockPerson
-from .serializers import SearchSerializer, MoreLikeThisSerializer, MockPersonFacetSerializer
+from .serializers import MockPersonFacetSerializer, MoreLikeThisSerializer, SearchSerializer
 
 
 class BasicPageNumberPagination(PageNumberPagination):
diff --git a/tests/test_filters.py b/tests/test_filters.py
@@ -5,17 +5,12 @@
 
 import json
 from datetime import date, datetime, timedelta
-
 from unittest import skipIf
 
 from django.test import TestCase
-
-from rest_framework import status
-from rest_framework import serializers
+from rest_framework import serializers, status
 from rest_framework.test import APIRequestFactory
 
-from drf_haystack.viewsets import HaystackViewSet
-from drf_haystack.serializers import HaystackSerializer, HaystackFacetSerializer
 from drf_haystack.filters import (
     HaystackAutocompleteFilter,
     HaystackBoostFilter,
@@ -26,8 +21,10 @@
     HaystackOrderingFilter,
 )
 from drf_haystack.mixins import FacetMixin
+from drf_haystack.serializers import HaystackFacetSerializer, HaystackSerializer
+from drf_haystack.viewsets import HaystackViewSet
 
-from . import geospatial_support, elasticsearch_version
+from . import elasticsearch_version, geospatial_support
 from .constants import MOCKLOCATION_DATA_SET_SIZE, MOCKPERSON_DATA_SET_SIZE
 from .mixins import WarningTestCaseMixin
 from .mockapp.models import MockAllField, MockLocation, MockPerson
diff --git a/tests/test_serializers.py b/tests/test_serializers.py
@@ -6,31 +6,30 @@
 import json
 from datetime import datetime, timedelta
 
-from django.urls import path, include
 from django.core.exceptions import ImproperlyConfigured
 from django.http import QueryDict
-from django.test import TestCase, SimpleTestCase, override_settings
+from django.test import SimpleTestCase, TestCase, override_settings
+from django.urls import include, path
 from haystack.query import SearchQuerySet
-
 from rest_framework import serializers
 from rest_framework.fields import CharField, IntegerField
 from rest_framework.routers import DefaultRouter
 from rest_framework.test import APIRequestFactory, APITestCase
 
 from drf_haystack import fields
+from drf_haystack.mixins import FacetMixin, MoreLikeThisMixin
 from drf_haystack.serializers import (
-    HighlighterMixin,
-    HaystackSerializer,
-    HaystackSerializerMixin,
     HaystackFacetSerializer,
+    HaystackSerializer,
     HaystackSerializerMeta,
+    HaystackSerializerMixin,
+    HighlighterMixin,
 )
 from drf_haystack.viewsets import HaystackViewSet
-from drf_haystack.mixins import MoreLikeThisMixin, FacetMixin
 
 from .mixins import WarningTestCaseMixin
-from .mockapp.models import MockPerson, MockAllField
-from .mockapp.search_indexes import MockPersonIndex, MockPetIndex, MockAllFieldIndex
+from .mockapp.models import MockAllField, MockPerson
+from .mockapp.search_indexes import MockAllFieldIndex, MockPersonIndex, MockPetIndex
 
 factory = APIRequestFactory()
 
diff --git a/tests/test_viewsets.py b/tests/test_viewsets.py
@@ -6,26 +6,23 @@
 import json
 from unittest import skipIf
 
-from django.test import TestCase
 from django.contrib.auth.models import User
-
+from django.test import TestCase
 from haystack.query import SearchQuerySet
-
 from rest_framework import status
 from rest_framework.pagination import PageNumberPagination
 from rest_framework.routers import SimpleRouter
 from rest_framework.serializers import Serializer
-from rest_framework.test import force_authenticate, APIRequestFactory
+from rest_framework.test import APIRequestFactory, force_authenticate
 
+from drf_haystack.mixins import FacetMixin, MoreLikeThisMixin
+from drf_haystack.serializers import HaystackFacetSerializer, HaystackSerializer
 from drf_haystack.viewsets import HaystackViewSet
-from drf_haystack.serializers import HaystackSerializer, HaystackFacetSerializer
-from drf_haystack.mixins import MoreLikeThisMixin, FacetMixin
 
 from . import restframework_version
 from .mockapp.models import MockPerson, MockPet
 from .mockapp.search_indexes import MockPersonIndex, MockPetIndex
 
-
 factory = APIRequestFactory()
 
 
diff --git a/tests/urls.py b/tests/urls.py
@@ -1,5 +1,4 @@
 from django.urls import include, path
-
 from rest_framework import routers
 
 from tests.mockapp.views import SearchPersonFacetViewSet, SearchPersonMLTViewSet

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from django.db import models, migrations`
	`1`	`+from django.db import migrations, models`
`2`	`2`
`3`	`3`
`4`	`4`	`class Migration(migrations.Migration):`