From a27d5c306716dc40558d0912fbdc792ed46ea377 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Fri, 31 May 2024 21:23:02 +0200
Subject: [PATCH] ruff.toml: enable ruff ruleset

---
 main/models.py              | 2 +-
 mirrors/views/mirrorlist.py | 2 +-
 packages/views/search.py    | 2 +-
 ruff.toml                   | 3 ++-
 settings.py                 | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/main/models.py b/main/models.py
index ac833ade..ef6f36e4 100644
--- a/main/models.py
+++ b/main/models.py
@@ -246,7 +246,7 @@ def get_requiredby(self):
 
         # sort out duplicate packages; this happens if something has a double
         # versioned depend such as a kernel module
-        requiredby = [list(vals)[0] for _, vals in groupby(requiredby, lambda x: x.pkg.id)]
+        requiredby = [next(iter(vals)) for _, vals in groupby(requiredby, lambda x: x.pkg.id)]
         if not requiredby:
             return requiredby
 
diff --git a/mirrors/views/mirrorlist.py b/mirrors/views/mirrorlist.py
index 5dd07703..92b4241a 100644
--- a/mirrors/views/mirrorlist.py
+++ b/mirrors/views/mirrorlist.py
@@ -23,7 +23,7 @@ class MirrorlistForm(forms.Form):
     def __init__(self, *args, **kwargs):
         super(MirrorlistForm, self).__init__(*args, **kwargs)
         fields = self.fields
-        fields['country'].choices = [('all', 'All')] + self.get_countries()
+        fields['country'].choices = [('all', 'All'), *self.get_countries()]
         fields['country'].initial = ['all']
         protos = [(p.protocol, p.protocol) for p in MirrorProtocol.objects.filter(is_download=True)]
         initial = MirrorProtocol.objects.filter(is_download=True, default=True)
diff --git a/packages/views/search.py b/packages/views/search.py
index b58e553b..52243f11 100644
--- a/packages/views/search.py
+++ b/packages/views/search.py
@@ -54,7 +54,7 @@ class PackageSearchForm(forms.Form):
     maintainer = forms.ChoiceField(required=False)
     packager = forms.ChoiceField(required=False)
     flagged = forms.ChoiceField(
-        choices=[('', 'All')] + make_choice(['Flagged', 'Not Flagged']),
+        choices=[('', 'All'), *make_choice(['Flagged', 'Not Flagged'])],
         required=False)
 
     def __init__(self, *args, **kwargs):
diff --git a/ruff.toml b/ruff.toml
index 2b354b30..1b021416 100644
--- a/ruff.toml
+++ b/ruff.toml
@@ -12,6 +12,7 @@ select = [
     "PIE",     # flake8-pie
     "PLE",     # pylint errors
     "RSE",     # flake8-raise
+    "RUF",     # ruff rules
     "T10",     # flake8-debugger
     "TCH",     # flake8-type-checking
     "UP032",   # f-string
@@ -20,4 +21,4 @@ select = [
 ]
 
 # Never enforce `E501` (line length violations).
-ignore = ["E501", "E731", "B904"]
+ignore = ["E501", "E731", "B904", "RUF012"]
diff --git a/settings.py b/settings.py
index 9955758d..4833efb8 100644
--- a/settings.py
+++ b/settings.py
@@ -261,8 +261,8 @@
 
 # Enable the debug toolbar if requested
 if DEBUG_TOOLBAR:
-    MIDDLEWARE = ['debug_toolbar.middleware.DebugToolbarMiddleware'] + list(MIDDLEWARE)
+    MIDDLEWARE = ['debug_toolbar.middleware.DebugToolbarMiddleware', *list(MIDDLEWARE)]
 
-    INSTALLED_APPS = list(INSTALLED_APPS) + ['debug_toolbar']
+    INSTALLED_APPS = [*list(INSTALLED_APPS), 'debug_toolbar']
 
 # vim: set ts=4 sw=4 et: