ruff: enable isort rule

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,10 +7,10 @@
 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
@@ -18,7 +18,6 @@
 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
 """
 
+import io
+import logging
+import os
+import re
 from base64 import b64decode
 from collections import defaultdict
 from copy import copy
-import io
-import os
-import re
-import xtarfile as tarfile
-import logging
 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,17 +1,16 @@
 # -*- 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 main.utils import make_choice, set_created_field
+from planet.models import Feed
 
 from .fields import PGPKeyField
-from main.utils import make_choice, set_created_field
-
-from planet.models import Feed
 
 
 class UserProfile(models.Model):

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 <jdoe@archlinux.org>'
 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
 
 

devel/views.py

@@ -6,9 +6,11 @@
 from django.conf import settings
 from django.contrib import admin
 from django.contrib.admin.models import ADDITION, LogEntry
-from django.contrib.auth.decorators import (login_required,
-                                            permission_required,
-                                            user_passes_test)
+from django.contrib.auth.decorators import (
+    login_required,
+    permission_required,
+    user_passes_test,
+)
 from django.contrib.auth.models import Group, User
 from django.contrib.contenttypes.models import ContentType
 from django.core.cache import cache
@@ -21,6 +23,7 @@
 from django.utils.http import http_date
 from django.utils.timezone import now
 from django.views.decorators.cache import cache_control, never_cache
+
 from main.models import Arch, Package, Repo
 from news.models import News
 from packages.models import FlagRequest, PackageRelation, Signoff
@@ -31,7 +34,7 @@
 from .forms import NewUserForm, ProfileForm, UserProfileForm
 from .models import UserProfile
 from .reports import available_reports
-from .utils import get_annotated_maintainers, generate_repo_auth_token
+from .utils import generate_repo_auth_token, get_annotated_maintainers
 
 
 @login_required

feeds.py

@@ -1,20 +1,20 @@
-from datetime import datetime, timezone, time
+from datetime import datetime, time, timezone
 
-from django.core.exceptions import ObjectDoesNotExist
 from django.contrib.admin.models import ADDITION, DELETION
 from django.contrib.sites.models import Site
 from django.contrib.syndication.views import Feed
+from django.core.exceptions import ObjectDoesNotExist
 from django.db import connection
 from django.db.models import Q
 from django.urls import reverse
 from django.utils.feedgenerator import Rss201rev2Feed
 from django.views.decorators.http import condition
 
-from main.models import Arch, Repo, Package
+from main.models import Arch, Package, Repo
 from news.models import News
 from packages.models import Update
-from releng.models import Release
 from planet.models import FeedItem
+from releng.models import Release
 
 
 class BatchWritesWrapper(object):

main/admin.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
+
 from main.models import Arch, Donor, Package, Repo
 
 

main/log.py

@@ -1,8 +1,8 @@
 # Derived from Django snippets: http://djangosnippets.org/snippets/2242/
+import traceback
 from collections import OrderedDict
 from datetime import datetime, timedelta, timezone
 from hashlib import md5
-import traceback
 
 
 class LimitedSizeDict(OrderedDict):

main/management/commands/donor_import.py

@@ -16,19 +16,17 @@
 """
 
 import codecs
-import logging
 import email
+import logging
 import sys
-
+from argparse import FileType
 from email.header import decode_header
 
-from parse import parse
-from argparse import FileType
-
-from django.db.utils import Error as DBError
 from django.core.management.base import BaseCommand, CommandError
-from main.models import Donor
+from django.db.utils import Error as DBError
+from parse import parse
 
+from main.models import Donor
 
 logger = logging.getLogger("command")
 logger.setLevel(logging.WARNING)

main/migrations/0001_initial.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
 
-from django.db import models, migrations
 import django.db.models.deletion
 from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

main/migrations/0003_rebuilderdstatus.py

@@ -1,7 +1,7 @@
 # Generated by Django 3.0.7 on 2020-06-28 19:34
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

main/migrations/0004_soname.py

@@ -1,7 +1,7 @@
 # Generated by Django 3.1.3 on 2020-11-03 20:33
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

main/models.py

@@ -1,16 +1,17 @@
-from itertools import groupby
-from pgpdump import BinaryData
 from datetime import datetime, timezone
+from itertools import groupby
 
-from django.db import models
-from django.db.models import Q
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
+from django.db import models
+from django.db.models import Q
+from pgpdump import BinaryData
 
-from .utils import set_created_field, DependStandin, SignatureWrapper
 from devel.models import DeveloperKey
 from packages.alpm import AlpmAPI
 
+from .utils import DependStandin, SignatureWrapper, set_created_field
+
 
 class PackageManager(models.Manager):
     def flagged(self):

main/storage.py

@@ -1,6 +1,5 @@
 import cssmin
 import jsmin
-
 from django.contrib.staticfiles.storage import ManifestStaticFilesStorage
 from django.core.files.base import ContentFile
 from django.utils.encoding import smart_str

main/templatetags/attributes.py

@@ -1,4 +1,5 @@
 import re
+
 from django import template
 from django.conf import settings
 

main/templatetags/details_link.py

@@ -1,6 +1,9 @@
-from urllib.parse import urlencode, quote as urlquote, unquote
+from urllib.parse import quote as urlquote
+from urllib.parse import unquote, urlencode
+
 from django import template
 from django.conf import settings
+
 from main.templatetags import pgp
 from main.utils import gitlab_project_name_to_path
 

main/templatetags/pgp.py

@@ -3,7 +3,6 @@
 from django.utils.html import conditional_escape, format_html
 from django.utils.safestring import mark_safe
 
-
 register = template.Library()
 
 

main/tests/test_donor_import.py

@@ -5,13 +5,11 @@
 from io import StringIO
 
 import pytest
-
 from django.core.management import call_command
 from django.core.management.base import CommandError
 
-from main.models import Donor
 from main.management.commands.donor_import import Command
-
+from main.models import Donor
 
 command = Command()
 

main/tests/test_templatetags_pgp.py

@@ -1,4 +1,4 @@
-from main.templatetags.pgp import pgp_key_link, format_key, pgp_fingerprint
+from main.templatetags.pgp import format_key, pgp_fingerprint, pgp_key_link
 
 
 def test_format_key():

main/utils.py

@@ -1,16 +1,15 @@
-import pickle
 import hashlib
+import pickle
 import re
 
 import markdown
-from markdown.extensions import Extension
-from pgpdump.packet import SignaturePacket
-
 from django.core.cache import cache
 from django.db import connections, router
 from django.http import HttpResponse
-from django.utils.timezone import now
 from django.template.defaultfilters import slugify
+from django.utils.timezone import now
+from markdown.extensions import Extension
+from pgpdump.packet import SignaturePacket
 
 
 def cache_function_key(func, args, kwargs):

mirrors/admin.py

@@ -1,11 +1,10 @@
 from datetime import datetime
-from urllib.parse import urlunsplit, urlparse
+from urllib.parse import urlparse, urlunsplit
 
 from django import forms
 from django.contrib import admin
 
-from .models import (Mirror, MirrorProtocol, MirrorUrl, MirrorRsync,
-                     CheckLocation)
+from .models import CheckLocation, Mirror, MirrorProtocol, MirrorRsync, MirrorUrl
 
 
 class MirrorUrlForm(forms.ModelForm):

mirrors/fields.py

@@ -1,9 +1,8 @@
-from IPy import IP
-
 from django import forms
 from django.core import validators
 from django.core.exceptions import ValidationError
 from django.db import models
+from IPy import IP
 
 
 class IPNetworkFormField(forms.Field):

mirrors/management/commands/mirrorcheck.py

@@ -9,28 +9,27 @@
 Usage: ./manage.py mirrorcheck
 """
 
-from collections import deque
-from datetime import datetime, timedelta, timezone
-from http.client import HTTPException
 import logging
 import os
 import re
 import socket
 import ssl
 import subprocess
-import time
 import tempfile
-from threading import Thread
-from queue import Queue, Empty
+import time
 import urllib
+from collections import deque
+from datetime import datetime, timedelta, timezone
+from http.client import HTTPException
+from queue import Empty, Queue
+from threading import Thread
 
+from django.conf import settings
 from django.core.management.base import BaseCommand
 from django.db import transaction
-from django.conf import settings
 from django.utils.timezone import now
 
-from mirrors.models import MirrorUrl, MirrorLog, CheckLocation
-
+from mirrors.models import CheckLocation, MirrorLog, MirrorUrl
 
 logger = logging.getLogger("command")
 logger.setLevel(logging.WARNING)

mirrors/management/commands/mirrorresolv.py

@@ -8,13 +8,12 @@
 Usage: ./manage.py mirrorresolv
 """
 
-from django.core.management.base import BaseCommand
-
 import logging
 import socket
 
-from mirrors.models import MirrorUrl
+from django.core.management.base import BaseCommand
 
+from mirrors.models import MirrorUrl
 
 logger = logging.getLogger("command")
 logger.setLevel(logging.WARNING)

mirrors/migrations/0001_squashed_0002_mirrorurl_bandwidth.py

@@ -2,9 +2,10 @@
 # Generated by Django 1.11.15 on 2018-11-17 20:54
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
 import django_countries.fields
+from django.db import migrations, models
+
 import mirrors.fields
 
 

mirrors/models.py

@@ -1,16 +1,17 @@
-from datetime import timedelta
 import socket
+from datetime import timedelta
 from urllib.parse import urlparse
 
-from django.core.exceptions import ValidationError
 from django.contrib.sites.models import Site
+from django.core.exceptions import ValidationError
 from django.db import models
 from django.db.models.signals import pre_save
 from django_countries.fields import CountryField
 
-from .fields import IPNetworkField
 from main.utils import set_created_field
 
+from .fields import IPNetworkField
+
 
 class Mirror(models.Model):
     TIER_CHOICES = (

mirrors/templatetags/mirror_status.py

@@ -1,4 +1,5 @@
 from datetime import timedelta
+
 from django import template
 
 register = template.Library()

mirrors/tests/conftest.py

@@ -1,7 +1,6 @@
 import pytest
 
-from mirrors.models import CheckLocation, MirrorLog, MirrorUrl, MirrorProtocol, Mirror
-
+from mirrors.models import CheckLocation, Mirror, MirrorLog, MirrorProtocol, MirrorUrl
 
 NAME = 'mirror1'
 ADMIN_EMAIL = 'admin@archlinux.org'

mirrors/tests/test_mirrorcheck.py

@@ -1,17 +1,14 @@
 import time
-
+from datetime import timedelta
 from http.client import BadStatusLine
+from socket import error, timeout
+from ssl import CertificateError
 from unittest import mock
 from urllib.error import HTTPError, URLError
-from ssl import CertificateError
-from socket import timeout, error
 
 import pytest
-
-from django.utils.timezone import now
-from datetime import timedelta
-
 from django.core.management import call_command
+from django.utils.timezone import now
 
 from mirrors.models import CheckLocation, MirrorLog
 from mirrors.tests.conftest import HOSTNAME, PROTOCOL

mirrors/tests/test_mirrorrsync.py

@@ -1,7 +1,6 @@
 from django.test import TransactionTestCase
 
-from mirrors.models import MirrorRsync, Mirror
-
+from mirrors.models import Mirror, MirrorRsync
 
 TEST_IPV6 = "2a0b:4342:1a31:410::"
 TEST_IPV4 = "8.8.8.8"

mirrors/tests/test_mirrorstatus.py

@@ -1,5 +1,5 @@
-from datetime import datetime, timedelta
 import xml.etree.ElementTree as ET
+from datetime import datetime, timedelta
 
 
 def test_mirror_status(db, client, create_mirrorlog):

mirrors/tests/test_models.py

@@ -1,4 +1,4 @@
-from mirrors.tests.conftest import NAME, HOSTNAME, PROTOCOL
+from mirrors.tests.conftest import HOSTNAME, NAME, PROTOCOL
 
 
 def test_mirror_get_full_url(mirror):

mirrors/urls.py

@@ -1,8 +1,8 @@
-from django.urls import re_path, path
+from django.urls import path, re_path
 from django.views.decorators.cache import cache_page
 
-from .views import mirrors, status, mirror_details, url_details
-from .views.api import status_json, mirror_details_json, locations_json
+from .views import mirror_details, mirrors, status, url_details
+from .views.api import locations_json, mirror_details_json, status_json
 
 urlpatterns = [
     path('', mirrors, name='mirror-list'),

mirrors/urls_mirrorlist.py

@@ -1,4 +1,5 @@
-from django.urls import re_path, path
+from django.urls import path, re_path
+
 from mirrors.views import mirrorlist as views
 
 urlpatterns = [

mirrors/utils.py

@@ -6,8 +6,8 @@
 from django.utils.timezone import now
 
 from main.utils import cache_function, database_vendor
-from .models import MirrorLog, MirrorUrl
 
+from .models import MirrorLog, MirrorUrl
 
 DEFAULT_CUTOFF = timedelta(hours=24)
 

mirrors/views/__init__.py

@@ -9,8 +9,8 @@
 from django.views.decorators.http import condition
 from django_countries.fields import Country
 
-from ..models import Mirror, MirrorUrl, MirrorLog
-from ..utils import get_mirror_statuses, get_mirror_errors
+from ..models import Mirror, MirrorLog, MirrorUrl
+from ..utils import get_mirror_errors, get_mirror_statuses
 
 
 def mirrors(request, tier=None):

mirrors/views/api.py

@@ -1,14 +1,14 @@
-from datetime import timedelta
 import json
+from datetime import timedelta
 
-from django.views.decorators.cache import cache_control
 from django.core.serializers.json import DjangoJSONEncoder
 from django.http import Http404, HttpResponse
 from django.shortcuts import get_object_or_404
 from django.utils.timezone import now
+from django.views.decorators.cache import cache_control
 
-from ..models import (Mirror, MirrorUrl, MirrorProtocol, MirrorLog, CheckLocation)
-from ..utils import get_mirror_statuses, DEFAULT_CUTOFF
+from ..models import CheckLocation, Mirror, MirrorLog, MirrorProtocol, MirrorUrl
+from ..utils import DEFAULT_CUTOFF, get_mirror_statuses
 
 
 class MirrorStatusJSONEncoder(DjangoJSONEncoder):

mirrors/views/mirrorlist.py

@@ -1,17 +1,16 @@
+import random
 from operator import attrgetter, itemgetter
 
 from django import forms
 from django.db.models import Q
-from django.forms.widgets import SelectMultiple, CheckboxSelectMultiple
+from django.forms.widgets import CheckboxSelectMultiple, SelectMultiple
 from django.shortcuts import get_object_or_404, redirect, render
 from django.views.decorators.csrf import csrf_exempt
 from django_countries import countries
 
-from ..models import MirrorUrl, MirrorProtocol
+from ..models import MirrorProtocol, MirrorUrl
 from ..utils import get_mirror_statuses
 
-import random
-
 
 class MirrorlistForm(forms.Form):
     country = forms.MultipleChoiceField(required=False, widget=SelectMultiple(attrs={'size': '12'}))

news/migrations/0001_squashed_0002_news_send_announce.py

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

news/models.py

@@ -1,7 +1,7 @@
-from django.db import models
-from django.db.models.signals import pre_save
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
+from django.db import models
+from django.db.models.signals import pre_save
 from django.utils.safestring import mark_safe
 from django.utils.timezone import now
 

news/tests/test_crud.py

@@ -1,7 +1,7 @@
-from news.models import News
-
 from django.core import mail
 
+from news.models import News
+
 
 def create(admin_client, title='Bash broken', content='Broken in [testing]', announce=False):
     data = {

news/urls.py

@@ -1,8 +1,15 @@
-from django.urls import re_path, path
 from django.contrib.auth.decorators import permission_required
-from .views import (NewsDetailView, NewsListView, NewsCreateView, NewsEditView,
-                    NewsDeleteView, preview, view_redirect)
+from django.urls import path, re_path
 
+from .views import (
+    NewsCreateView,
+    NewsDeleteView,
+    NewsDetailView,
+    NewsEditView,
+    NewsListView,
+    preview,
+    view_redirect,
+)
 
 urlpatterns = [
     path('', NewsListView.as_view(), name='news-list'),

news/views.py

@@ -5,10 +5,17 @@
 from django.shortcuts import get_object_or_404, redirect
 from django.template import loader
 from django.views.decorators.http import require_POST
-from django.views.generic import DetailView, ListView, CreateView, UpdateView, DeleteView
+from django.views.generic import (
+    CreateView,
+    DeleteView,
+    DetailView,
+    ListView,
+    UpdateView,
+)
+
+from main.utils import find_unique_slug, parse_markdown
 
 from .models import News
-from main.utils import find_unique_slug, parse_markdown
 
 
 class NewsForm(forms.ModelForm):

packages/admin.py

@@ -1,7 +1,13 @@
 from django.contrib import admin
 
-from .models import (PackageRelation, FlagDenylist, FlagRequest, Signoff,
-                     SignoffSpecification, Update)
+from .models import (
+    FlagDenylist,
+    FlagRequest,
+    PackageRelation,
+    Signoff,
+    SignoffSpecification,
+    Update,
+)
 
 
 class PackageRelationAdmin(admin.ModelAdmin):

packages/alpm.py

@@ -1,6 +1,6 @@
 import ctypes
-from ctypes.util import find_library
 import operator
+from ctypes.util import find_library
 
 
 def load_alpm(name=None):  # pragma: no cover

packages/management/commands/populate_signoffs.py

@@ -11,16 +11,15 @@
 import logging
 import urllib.parse
 
+import requests
 from django.conf import settings
 from django.core.management.base import BaseCommand
 
-import requests
-
-from main.utils import gitlab_project_name_to_path
-from ...models import FakeSignoffSpecification, SignoffSpecification, Signoff
-from ...utils import get_signoff_groups
 from devel.utils import UserFinder
+from main.utils import gitlab_project_name_to_path
 
+from ...models import FakeSignoffSpecification, Signoff, SignoffSpecification
+from ...utils import get_signoff_groups
 
 logger = logging.getLogger("command")
 

packages/migrations/0001_squashed_0003_auto_20170524_0704.py

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

packages/models.py

@@ -1,12 +1,12 @@
 from collections import namedtuple
 
-from django.db import models
-from django.db.models.signals import pre_save
 from django.contrib.admin.models import ADDITION, CHANGE, DELETION
 from django.contrib.auth.models import User
+from django.db import models
+from django.db.models.signals import pre_save
 
-from main.models import Arch, Repo, Package
-from main.utils import set_created_field, database_vendor
+from main.models import Arch, Package, Repo
+from main.utils import database_vendor, set_created_field
 from packages.alpm import AlpmAPI
 
 

packages/templatetags/package_extras.py

@@ -1,9 +1,8 @@
-from urllib.parse import urlencode, parse_qs
+from urllib.parse import parse_qs, urlencode
 
 from django import template
 from django.utils.html import format_html
 
-
 register = template.Library()
 
 

packages/tests/test_alpm.py

@@ -1,7 +1,6 @@
-from packages.alpm import AlpmAPI
-
 import pytest
 
+from packages.alpm import AlpmAPI
 
 alpm = AlpmAPI()
 

packages/tests/test_populate_signoffs.py

@@ -1,12 +1,12 @@
-from unittest import mock
 from datetime import datetime, timezone
+from unittest import mock
 
 from django.core.management import call_command
 from django.test import TransactionTestCase
 
+import packages.management.commands.populate_signoffs  # noqa
 from main.models import Arch, Repo
 from packages.models import Package, SignoffSpecification
-import packages.management.commands.populate_signoffs  # noqa
 
 
 class RematchDeveloperTest(TransactionTestCase):

packages/urls.py

@@ -1,8 +1,8 @@
 from django.conf.urls import include
-from django.urls import re_path, path
-from packages import views
-from packages.views import display, flag, signoff, search
+from django.urls import path, re_path
 
+from packages import views
+from packages.views import display, flag, search, signoff
 
 package_patterns = [
     path('', display.details),

packages/urls_groups.py

@@ -1,6 +1,7 @@
-from django.urls import re_path, path
+from django.urls import path, re_path
+
 from packages.views import search
-from packages.views.display import groups, group_details
+from packages.views.display import group_details, groups
 
 urlpatterns = [
     path('', groups, name='groups-list'),

packages/utils.py

@@ -1,21 +1,30 @@
+import re
 from collections import defaultdict
 from itertools import chain
 from operator import itemgetter
-import re
 
+from django.contrib.auth.models import User
 from django.core.serializers.json import DjangoJSONEncoder
 from django.db import connection
-from django.db.models import Count, Max, F
+from django.db.models import Count, F, Max
 from django.db.models.query import QuerySet
-from django.contrib.auth.models import User
 
-from main.models import Package, PackageFile, Arch, Repo
-from main.utils import database_vendor, groupby_preserve_order, PackageStandin
-from .models import (PackageGroup, PackageRelation,
-                     License, Depend, Conflict, Provision, Replacement,
-                     SignoffSpecification, Signoff, fake_signoff_spec)
+from main.models import Arch, Package, PackageFile, Repo
+from main.utils import PackageStandin, database_vendor, groupby_preserve_order
 from todolists.models import TodolistPackage
 
+from .models import (
+    Conflict,
+    Depend,
+    License,
+    PackageGroup,
+    PackageRelation,
+    Provision,
+    Replacement,
+    Signoff,
+    SignoffSpecification,
+    fake_signoff_spec,
+)
 
 VERSION_RE = re.compile(r'^((\d+):)?(.+)-([^-]+)$')
 

packages/views/__init__.py

@@ -10,11 +10,12 @@
 from django.http import HttpResponse, HttpResponseBadRequest
 from django.shortcuts import redirect, render
 from django.views.decorators.cache import cache_control
-from django.views.decorators.http import require_safe, require_POST
+from django.views.decorators.http import require_POST, require_safe
 
 from main.models import Package, Soname
 from packages.models import PackageRelation
-from ..utils import multilib_differences, get_wrong_permissions
+
+from ..utils import get_wrong_permissions, multilib_differences
 
 
 @require_safe

packages/views/display.py

@@ -2,15 +2,16 @@
 import json
 from urllib.parse import urlencode
 
-from django.http import HttpResponse, Http404
+from django.http import Http404, HttpResponse
 from django.shortcuts import get_object_or_404, redirect, render
 from django.utils.timezone import now
 
-from main.models import Package, PackageFile, Arch, Repo, Soname, RebuilderdStatus
+from main.models import Arch, Package, PackageFile, RebuilderdStatus, Repo, Soname
 from main.utils import empty_response
 from mirrors.utils import get_mirror_url_for_download
+
 from ..models import Update
-from ..utils import get_group_info, PackageJSONEncoder
+from ..utils import PackageJSONEncoder, get_group_info
 
 
 def arch_plus_agnostic(arch):

packages/views/flag.py

@@ -10,9 +10,10 @@
 from django.utils.timezone import now
 from django.views.decorators.cache import cache_page, never_cache
 
-from ..models import FlagDenylist, FlagRequest
 from main.models import Package
 
+from ..models import FlagDenylist, FlagRequest
+
 
 class FlagForm(forms.Form):
     email = forms.EmailField(label='E-mail Address')

packages/views/search.py

@@ -3,17 +3,18 @@
 from functools import reduce
 
 from django import forms
-from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from django.contrib.auth.models import User
+from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 from django.db.models import Q
 from django.http import HttpResponse, HttpResponseBadRequest
 from django.views.generic import ListView
 
 from devel.models import UserProfile
-from main.models import Package, Arch, Repo
+from main.models import Arch, Package, Repo
 from main.utils import empty_response, make_choice
+
 from ..models import PackageRelation
-from ..utils import attach_maintainers, PackageJSONEncoder
+from ..utils import PackageJSONEncoder, attach_maintainers
 
 
 class GroupSearchForm(forms.Form):

packages/views/signoff.py

@@ -7,16 +7,16 @@
 from django.core.mail import EmailMessage
 from django.core.serializers.json import DjangoJSONEncoder
 from django.db import transaction
-from django.http import HttpResponse, Http404
+from django.http import Http404, HttpResponse
 from django.shortcuts import get_list_or_404, redirect, render
 from django.template import loader
 from django.utils.timezone import now
 from django.views.decorators.cache import never_cache
 
-from main.models import Package, Arch, Repo
-from ..models import SignoffSpecification, Signoff
-from ..utils import (get_signoff_groups, approved_by_signoffs,
-                     PackageSignoffGroup)
+from main.models import Arch, Package, Repo
+
+from ..models import Signoff, SignoffSpecification
+from ..utils import PackageSignoffGroup, approved_by_signoffs, get_signoff_groups
 
 
 @permission_required('packages.change_signoff')

planet/management/commands/update_planet.py

@@ -10,19 +10,16 @@
 
 import logging
 import time
-
 from datetime import datetime, timezone
 
 import bleach
 import feedparser
-
+from django.conf import settings
 from django.core.cache import cache
 from django.core.management.base import BaseCommand
 from django.template.defaultfilters import truncatewords_html
-from django.conf import settings
-
-from planet.models import Feed, FeedItem, FEEDITEM_SUMMARY_LIMIT
 
+from planet.models import FEEDITEM_SUMMARY_LIMIT, Feed, FeedItem
 
 logger = logging.getLogger("command")
 logger.setLevel(logging.WARNING)

planet/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # Generated by Django 2.2.8 on 2019-12-18 19:39
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

planet/migrations/0002_alter_feeditem_feed.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.0.4 on 2022-06-20 19:09
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

planet/models.py

@@ -1,6 +1,5 @@
 from django.db import models
 
-
 # FeedItem summary field length
 FEEDITEM_SUMMARY_LIMIT = 2048
 

planet/tests/test_command.py

@@ -1,11 +1,11 @@
 import time
 from unittest import mock
 
-import pytest
 import feedparser
+import pytest
 
-from planet.models import Feed, FeedItem, FEEDITEM_SUMMARY_LIMIT
 from planet.management.commands.update_planet import Command
+from planet.models import FEEDITEM_SUMMARY_LIMIT, Feed, FeedItem
 
 
 @pytest.fixture

public/utils.py

@@ -1,8 +1,9 @@
 from collections import defaultdict
 from operator import attrgetter
 
-from main.models import Arch, Repo, Package
-from main.utils import groupby_preserve_order, PackageStandin
+from main.models import Arch, Package, Repo
+from main.utils import PackageStandin, groupby_preserve_order
+
 
 class RecentUpdate(object):
     def __init__(self, packages):

public/views.py

@@ -1,5 +1,5 @@
-from datetime import datetime
 import json
+from datetime import datetime
 from operator import attrgetter
 
 from django.contrib.auth.models import User
@@ -8,11 +8,12 @@
 from django.shortcuts import get_object_or_404, render
 from django.views.decorators.cache import cache_control, cache_page
 
-from devel.models import MasterKey, DeveloperKey, PGPSignature, StaffGroup, UserProfile
-from main.models import Arch, Repo, Donor
+from devel.models import DeveloperKey, MasterKey, PGPSignature, StaffGroup, UserProfile
+from main.models import Arch, Donor, Repo
 from mirrors.models import MirrorUrl
 from news.models import News
 from releng.models import Release
+
 from .utils import get_recent_updates
 
 

releng/migrations/0001_squashed_0005_auto_20180616_0947.py

@@ -3,8 +3,9 @@
 from __future__ import unicode_literals
 
 import datetime
-from django.db import migrations, models
+
 import django.db.models.deletion
+from django.db import migrations, models
 from django.utils.timezone import utc
 
 

releng/migrations/0003_release_pgp_key.py

@@ -1,8 +1,9 @@
 # Generated by Django 3.0.6 on 2020-05-22 22:14
 
-import devel.fields
 from django.db import migrations
 
+import devel.fields
+
 
 class Migration(migrations.Migration):
 

releng/models.py

@@ -1,16 +1,16 @@
-from base64 import b64decode
-from bencode import bdecode, bencode
-from datetime import datetime, timezone
 import binascii
 import hashlib
+from base64 import b64decode
+from datetime import datetime, timezone
 
-from django.urls import reverse
+from bencode import bdecode, bencode
 from django.db import models
 from django.db.models.signals import pre_save
+from django.urls import reverse
 from django.utils.safestring import mark_safe
 
-from main.utils import set_created_field, parse_markdown
 from devel.fields import PGPKeyField
+from main.utils import parse_markdown, set_created_field
 
 
 class Release(models.Model):

releng/tests/conftest.py

@@ -1,12 +1,11 @@
-from datetime import datetime
 from base64 import b64encode
-from bencode import bencode
+from datetime import datetime
 
 import pytest
+from bencode import bencode
 
 from releng.models import Release
 
-
 VERSION = '1.0'
 KERNEL_VERSION = '4.18'
 

releng/urls.py

@@ -1,8 +1,10 @@
 from django.conf.urls import include
-from django.urls import re_path, path
-from .views import ReleaseListView, ReleaseDetailView
+from django.urls import path, re_path
+
 from releng import views
 
+from .views import ReleaseDetailView, ReleaseListView
+
 releases_patterns = [
     path('', ReleaseListView.as_view(), name='releng-release-list'),
     path('json/', views.releases_json, name='releng-release-list-json'),

releng/views.py

@@ -1,16 +1,17 @@
-from base64 import b64decode
 import json
+from base64 import b64decode
 
+from django.conf import settings
 from django.core.serializers.json import DjangoJSONEncoder
-from django.urls import reverse
 from django.http import Http404, HttpResponse
 from django.shortcuts import get_object_or_404, render
+from django.urls import reverse
 from django.views.generic import DetailView, ListView
-from django.conf import settings
+
+from main.models import Package
+from mirrors.models import MirrorUrl
 
 from .models import Release
-from mirrors.models import MirrorUrl
-from main.models import Package
 
 
 class ReleaseListView(ListView):

ruff.toml

@@ -3,6 +3,7 @@ select = [
     "E",       # pycodestyle
     "F",       # pyflakes
     "G",       # flake8-logging-format
+    "I",       # isort
 ]
 
 # Never enforce `E501` (line length violations).

settings.py

@@ -1,6 +1,6 @@
 # Django settings for archweb project.
-from os import path
 import sys
+from os import path
 
 # Set the debug values
 DEBUG = False

todolists/migrations/0001_squashed_0002_remove_todolist_old_id.py

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

todolists/models.py

@@ -2,10 +2,10 @@
 from django.contrib.sites.models import Site
 from django.core.mail import EmailMessage
 from django.db import models
-from django.db.models.signals import pre_save, post_save
+from django.db.models.signals import post_save, pre_save
 from django.template import loader
 
-from main.models import Arch, Repo, Package
+from main.models import Arch, Package, Repo
 from main.utils import set_created_field
 
 

todolists/tests/conftest.py

@@ -3,7 +3,6 @@
 from main.models import Package
 from todolists.models import Todolist, TodolistPackage
 
-
 NAME = 'Boost rebuild'
 SLUG = 'boost-rebuild'
 DESCRIPTION = 'Boost 1.66 rebuild'

todolists/tests/test_models.py

@@ -1,7 +1,6 @@
-from todolists.tests.conftest import NAME
-
 from main.models import Package
 from todolists.models import TodolistPackage
+from todolists.tests.conftest import NAME
 
 
 def test_stripped_description(todolist):