Switch linting to Ruff

.github/workflows/ci.yml

@@ -52,8 +52,7 @@ jobs:
       - name: Install pipenv
         run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python
       - run: pipenv install --dev
-      - run: pipenv run isort --check pylinks
-      - run: pipenv run black --check pylinks
+      - run: pipenv run ruff check pylinks
       - run: pipenv run python manage.py collectstatic --noinput
       - run: psql -c 'CREATE DATABASE ci_test;' -h 127.0.0.1 -U postgres
       - run: pipenv run python manage.py test

.ruff.toml

@@ -0,0 +1 @@
+select = ["E", "F", "I"]

Pipfile

@@ -18,8 +18,8 @@ sqlparse = "*"
 whoosh = "*"
 
 [dev-packages]
-isort = {extras = ["pipfile_deprecated_finder"], version = "5.12.0"}
 black = "*"
+ruff = "*"
 
 [requires]
 python_version = "3.8"

pylinks/links/migrations/0001_initial.py

@@ -61,7 +61,8 @@ class Migration(migrations.Migration):
                         upload_to=b"uploads/",
                         max_length=500,
                         blank=True,
-                        help_text=b"A file to be uploaded and linked to instead of the URL.",
+                        help_text=b"A file to be uploaded and " \
+                                  b"linked to instead of the URL.",
                         null=True,
                     ),
                 ),

pylinks/links/migrations/0002_auto_20170703_1843.py

@@ -1,6 +1,6 @@
 import os
 
-from django.db import migrations, models
+from django.db import migrations
 
 if not os.environ.get("UPLOADCARE_DISABLED", False):
     from pylinks.links.utils import LinkFileField

pylinks/main/templatetags/analytics.py

@@ -1,3 +1,5 @@
+# ruff: noqa: E501
+
 from django import template
 from django.conf import settings
 from django.utils.html import escape, mark_safe

pylinks/search/tests.py

@@ -1,9 +1,7 @@
 import haystack
-from django.core.management import call_command
 from django.test import TestCase
 from django.urls import reverse
 
-from pylinks.links import search_indexes
 from pylinks.links.models import Link
 
 

pylinks/search/views.py

@@ -21,6 +21,8 @@ def build_page(self):
             or self.request.GET.get("page")
             or 1
         )
+
+        paginator = Paginator(self.results, self.results_per_page)
         try:
             page_number = int(page)
         except ValueError:
@@ -31,7 +33,6 @@ def build_page(self):
                     _("Page is not 'last', nor can it be converted to an int.")
                 )
 
-        paginator = Paginator(self.results, self.results_per_page)
         try:
             page = paginator.page(page_number)
         except InvalidPage:

pylinks/settings.py

@@ -31,7 +31,8 @@
 
 AUTH_PASSWORD_VALIDATORS = [
     {
-        "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
+        "NAME": "django.contrib.auth.password_validation." \
+                "UserAttributeSimilarityValidator",
     },
     {
         "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",

pylinks/urls.py

@@ -1,12 +1,7 @@
 from django.contrib import admin
-from django.contrib.auth.models import Group, User
-from django.contrib.sites.models import Site
 from django.urls import include, re_path
 
 admin.autodiscover()
-# admin.site.unregister(User)
-# admin.site.unregister(Group)
-# admin.site.unregister(Site)
 
 urlpatterns = (
     re_path(r"^feed/", include("pylinks.feeds.urls")),

pylinks/wsgi.py

@@ -15,13 +15,13 @@
 """
 import os
 
+from django.core.wsgi import get_wsgi_application
+
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pylinks.settings")
 
 # This application object is used by any WSGI server configured to use this
 # file. This includes Django's development server, if the WSGI_APPLICATION
 # setting points here.
-from django.core.wsgi import get_wsgi_application
-
 application = get_wsgi_application()
 
 # Apply WSGI middleware here.