ruff: enable isort rule

Author: jelly

conftest.py

@@ -1,11 +1,9 @@
 import pytest
-
 from django.contrib.auth.models import Group
 from django.core.management import call_command
 
-from main.models import Repo
 from devel.models import UserProfile
-
+from main.models import Repo
 
 USERNAME = 'joeuser'
 FIRSTNAME = 'Joe'

devel/admin.py

@@ -2,7 +2,7 @@
 from django.contrib.auth.admin import UserAdmin
 from django.contrib.auth.models import User
 
-from .models import UserProfile, StaffGroup, MasterKey, DeveloperKey, PGPSignature
+from .models import DeveloperKey, MasterKey, PGPSignature, StaffGroup, UserProfile
 
 
 class UserProfileInline(admin.StackedInline):

devel/fields.py

@@ -1,5 +1,5 @@
-from django.db import models
 from django.core.validators import RegexValidator
+from django.db import models
 
 
 class PGPKeyField(models.CharField):

devel/forms.py

@@ -4,11 +4,11 @@
 from string import ascii_letters, digits
 
 from django import forms
-from django.contrib.auth.models import User, Group
+from django.contrib.auth.models import Group, User
 from django.contrib.sites.models import Site
 from django.core.mail import send_mail
-from django.template import loader
 from django.forms.widgets import NumberInput
+from django.template import loader
 
 from .models import UserProfile
 

devel/management/commands/archweb_inotify.py

@@ -1,13 +1,12 @@
 import logging
 import multiprocessing
 import os
-import pyinotify
 import threading
 import time
 
+import pyinotify
 from django.db.utils import OperationalError
 
-
 logger = logging.getLogger("command")
 logger.setLevel(logging.WARNING)
 

devel/management/commands/generate_keyring.py

@@ -7,11 +7,11 @@
 Usage: ./manage.py generate_keyring <keyserver> <keyring_path>
 """
 
-from django.core.management.base import BaseCommand, CommandError
-
 import logging
 import subprocess
 
+from django.core.management.base import BaseCommand, CommandError
+
 from devel.models import MasterKey, UserProfile
 
 logger = logging.getLogger("command")

devel/management/commands/pgp_import.py

@@ -7,18 +7,17 @@
 Usage: ./manage.py pgp_import <keyring_path>
 """
 
-from collections import OrderedDict
-from datetime import datetime, timezone
 import logging
 import subprocess
+from collections import OrderedDict
+from datetime import datetime, timezone
 
 from django.core.management.base import BaseCommand, CommandError
 from django.db import transaction
 
 from devel.models import DeveloperKey, PGPSignature
 from devel.utils import UserFinder
 
-
 logger = logging.getLogger("command")
 
 

devel/management/commands/read_rebuilderd_status.py

@@ -10,20 +10,17 @@
 
 import logging
 import re
-
 from collections import defaultdict
 
 import requests
-
+from django.conf import settings
 from django.core.cache import cache
 from django.core.mail import send_mail
-from django.conf import settings
 from django.core.management.base import BaseCommand
 from django.template import loader
 
 from devel.models import UserProfile
-from main.models import Arch, Repo, Package, RebuilderdStatus
-
+from main.models import Arch, Package, RebuilderdStatus, Repo
 
 EPOCH_REGEX = r'^(\d+):(.+)'
 

devel/management/commands/readlinks.py

@@ -5,8 +5,7 @@
 
 from django.core.management.base import BaseCommand, CommandError
 
-from main.models import Repo, Package, Soname
-
+from main.models import Package, Repo, Soname
 
 logger = logging.getLogger("command")
 

devel/management/commands/readlinks_inotify.py

@@ -1,13 +1,14 @@
 import logging
-import pyinotify
 import threading
 
+import pyinotify
 from django.core.management.base import BaseCommand, CommandError
 from django.db import connection, transaction
 
 from main.models import Arch, Repo
-from .readlinks import read_links
+
 from .archweb_inotify import EventHandler
+from .readlinks import read_links
 
 logger = logging.getLogger("command")
 

devel/management/commands/rematch_developers.py

@@ -11,16 +11,15 @@
 Usage: ./manage.py rematch_developers
 """
 
+import logging
+
 from django.core.management.base import BaseCommand
 from django.db import transaction
 
-import logging
-
 from devel.utils import UserFinder
 from main.models import Package
 from packages.models import FlagRequest
 
-
 logger = logging.getLogger("command")
 
 

devel/management/commands/reporead.py

@@ -13,28 +13,35 @@
   ./manage.py reporead x86_64 /tmp/core.db.tar.gz
 """
 
-from base64 import b64decode
-from collections import defaultdict
-from copy import copy
 import io
+import logging
 import os
 import re
-import xtarfile as tarfile
-import logging
+from base64 import b64decode
+from collections import defaultdict
+from copy import copy
 from datetime import datetime, timezone
 
+import xtarfile as tarfile
+from django.contrib.auth.models import User
 from django.core.management.base import BaseCommand, CommandError
 from django.db import connections, router, transaction
 from django.db.utils import IntegrityError
 from django.utils.timezone import now
-from django.contrib.auth.models import User
 
 from devel.utils import UserFinder
 from main.models import Arch, Package, PackageFile, Repo
-from packages.models import Depend, Conflict, FlagRequest, Provision, Replacement, Update, PackageRelation
+from packages.models import (
+    Conflict,
+    Depend,
+    FlagRequest,
+    PackageRelation,
+    Provision,
+    Replacement,
+    Update,
+)
 from packages.utils import parse_version
 
-
 TRACE = 5
 logging.addLevelName(TRACE, 'TRACE')
 logger = logging.getLogger("command")

devel/management/commands/reporead_inotify.py

@@ -15,16 +15,16 @@
 """
 
 import logging
-import pyinotify
 import threading
 
+import pyinotify
 from django.core.management.base import BaseCommand, CommandError
 from django.db import connection, transaction
 
 from main.models import Arch, Repo
-from .reporead import read_repo
-from .archweb_inotify import EventHandler
 
+from .archweb_inotify import EventHandler
+from .reporead import read_repo
 
 logger = logging.getLogger("command")
 logger.setLevel(logging.WARNING)

devel/management/commands/retire_user.py

@@ -10,12 +10,11 @@
 
 import logging
 
-from django.contrib.auth.models import User, Group
+from django.contrib.auth.models import Group, User
 from django.core.management.base import BaseCommand, CommandError
 
 from devel.models import UserProfile
 
-
 logger = logging.getLogger("command")
 logger.setLevel(logging.WARNING)
 

devel/migrations/0001_squashed_0002_staffgroup.py

@@ -2,11 +2,12 @@
 # Generated by Django 1.11.15 on 2018-11-17 20:54
 from __future__ import unicode_literals
 
-import devel.fields
-from django.conf import settings
-from django.db import migrations, models
 import django.db.models.deletion
 import django_countries.fields
+from django.conf import settings
+from django.db import migrations, models
+
+import devel.fields
 
 
 class Migration(migrations.Migration):

devel/models.py

@@ -1,18 +1,17 @@
 # -*- coding: utf-8 -*-
 import zoneinfo
-
-from django.urls import reverse
+from django.contrib.auth.models import Group, User
+from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
-from django.db.models.signals import pre_save, post_save
-from django.contrib.auth.models import User, Group
+from django.db.models.signals import post_save, pre_save
+from django.urls import reverse
 from django_countries.fields import CountryField
-from django.core.validators import MinValueValidator, MaxValueValidator
 
-from .fields import PGPKeyField
 from main.utils import make_choice, set_created_field
-
 from planet.models import Feed
 
+from .fields import PGPKeyField
+
 
 class UserProfile(models.Model):
     latin_name = models.CharField(

devel/reports.py

@@ -1,11 +1,12 @@
 from collections import defaultdict
 from datetime import timedelta, timezone
 
+from django.db import connection
 from django.db.models import F
 from django.template.defaultfilters import filesizeformat
-from django.db import connection
-from django.utils.timezone import now
 from django.utils.html import format_html
+from django.utils.timezone import now
+
 from main.models import Package, PackageFile, RebuilderdStatus
 from packages.models import Depend, PackageRelation
 

devel/tests/test_devel.py

@@ -1,5 +1,6 @@
+from django.contrib.auth.models import Group, User
 from django.test import TransactionTestCase
-from django.contrib.auth.models import User, Group
+
 from devel.models import UserProfile
 
 

devel/tests/test_pgp_import.py

@@ -4,7 +4,6 @@
 from django.core.management.base import CommandError
 from django.test import TransactionTestCase
 
-
 CREATED = 1541685162
 USER = 'John Doe <[email protected]>'
 ID1 = 'D6C055F238843F1C'

devel/tests/test_rematch_developers.py

@@ -1,6 +1,5 @@
 from unittest.mock import patch
 
-
 from django.core.management import call_command
 from django.test import TransactionTestCase
 

devel/tests/test_reporead.py

@@ -1,13 +1,11 @@
 import tarfile
-from unittest.mock import patch
 from datetime import datetime, timezone
-
+from unittest.mock import patch
 
 from django.core.management import call_command
 from django.core.management.base import CommandError
 from django.test import TransactionTestCase
 
-
 from main.models import Arch, Package, Repo
 from packages.models import FlagRequest
 

devel/tests/test_reports.py

@@ -1,5 +1,5 @@
-from django.test import TransactionTestCase
 from django.contrib.auth.models import User
+from django.test import TransactionTestCase
 
 
 class DeveloperReport(TransactionTestCase):

devel/tests/test_retire_user.py

@@ -1,11 +1,10 @@
+from django.contrib.auth.models import Group, User
 from django.core.management import call_command
 from django.core.management.base import CommandError
-from django.contrib.auth.models import User, Group
 from django.test import TransactionTestCase
 
-from main.models import Repo
-
 from devel.models import UserProfile
+from main.models import Repo
 
 
 class RetireUsertest(TransactionTestCase):

devel/tests/test_user.py

@@ -1,8 +1,8 @@
 from django.contrib.auth.models import User
 from django.test import TestCase
 
-from devel.utils import UserFinder
 from devel.models import UserProfile
+from devel.utils import UserFinder
 
 
 class DevelTest(TestCase):

devel/urls.py

@@ -1,8 +1,7 @@
-from django.urls import re_path, path
+from django.urls import path, re_path
 
 from devel import views
 
-
 urlpatterns = [
     path('admin_log/', views.admin_log),
     re_path(r'^admin_log/(?P<username>.*)/$', views.admin_log),

devel/utils.py

@@ -2,13 +2,13 @@
 import secrets
 
 from django.contrib.auth.models import User
-from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
+from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
 from django.db import connection
 from django.db.models import Count, Q
 
 from devel.models import UserProfile
-from main.utils import cache_function
 from main.models import Package
+from main.utils import cache_function
 from packages.models import PackageRelation