From 6196dbf6c42be977c49fedb20783be9d646d9c0d Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Wed, 31 Jan 2024 17:28:40 +0100
Subject: [PATCH] ci: add ruff to pre-commit hooks (#86371)

---
 .pre-commit-config.yaml                                   | 8 ++++++++
 fargo/fargo/api_fields.py                                 | 1 -
 .../migrations/0001_squashed_0017_auto_20180331_1532.py   | 3 ---
 fargo/fargo/migrations/0002_auto_20150818_2117.py         | 2 +-
 fargo/fargo/migrations/0004_auto_20220810_1352.py         | 2 +-
 fargo/fargo/models.py                                     | 6 +-----
 fargo/fargo/utils.py                                      | 1 -
 fargo/fargo/views.py                                      | 4 +---
 tests/test_api.py                                         | 3 +--
 9 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 51fea69..1ee9f7e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -34,3 +34,11 @@ repos:
     rev: v0.3
     hooks:
     - id: pre-commit-debian
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  # Ruff version.
+  rev: v0.1.15
+  hooks:
+    # Run the linter.
+    - id: ruff
+      args: ['--fix']
+      exclude: 'debian/.*'
diff --git a/fargo/fargo/api_fields.py b/fargo/fargo/api_fields.py
index 27f7ef8..9541dda 100644
--- a/fargo/fargo/api_fields.py
+++ b/fargo/fargo/api_fields.py
@@ -17,7 +17,6 @@
 import base64
 import uuid
 
-import six
 from django.core.files.base import ContentFile
 from rest_framework import fields, serializers
 
diff --git a/fargo/fargo/migrations/0001_squashed_0017_auto_20180331_1532.py b/fargo/fargo/migrations/0001_squashed_0017_auto_20180331_1532.py
index 5656e65..7245b19 100644
--- a/fargo/fargo/migrations/0001_squashed_0017_auto_20180331_1532.py
+++ b/fargo/fargo/migrations/0001_squashed_0017_auto_20180331_1532.py
@@ -1,12 +1,9 @@
 # Generated by Django 1.11.11 on 2018-03-31 13:34
 
-import datetime
 
-import django.db.models.deletion
 from django.conf import settings
 from django.contrib.postgres.fields import JSONField
 from django.db import migrations, models
-from django.utils.timezone import utc
 
 
 class Migration(migrations.Migration):
diff --git a/fargo/fargo/migrations/0002_auto_20150818_2117.py b/fargo/fargo/migrations/0002_auto_20150818_2117.py
index c8dcaa0..573807a 100644
--- a/fargo/fargo/migrations/0002_auto_20150818_2117.py
+++ b/fargo/fargo/migrations/0002_auto_20150818_2117.py
@@ -1,4 +1,4 @@
-from django.db import migrations, models
+from django.db import migrations
 
 
 class Migration(migrations.Migration):
diff --git a/fargo/fargo/migrations/0004_auto_20220810_1352.py b/fargo/fargo/migrations/0004_auto_20220810_1352.py
index 98470e3..14a0eda 100644
--- a/fargo/fargo/migrations/0004_auto_20220810_1352.py
+++ b/fargo/fargo/migrations/0004_auto_20220810_1352.py
@@ -1,7 +1,7 @@
 # Generated by Django 2.2.28 on 2022-08-10 11:52
 
 from django.conf import settings
-from django.db import migrations, models
+from django.db import migrations
 
 
 class Migration(migrations.Migration):
diff --git a/fargo/fargo/models.py b/fargo/fargo/models.py
index aec2b5f..5a38308 100644
--- a/fargo/fargo/models.py
+++ b/fargo/fargo/models.py
@@ -18,18 +18,14 @@ import base64
 import hashlib
 import os
 import re
-import subprocess
-import threading
 from urllib.parse import quote
 
 from django.conf import settings
 from django.core.files.storage import default_storage
 from django.db import models
-from django.db.models import JSONField
-from django.db.models.signals import post_delete, post_save
+from django.db.models.signals import post_delete
 from django.dispatch import receiver
 from django.urls import reverse
-from django.utils.encoding import force_str
 from django.utils.html import format_html
 from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
diff --git a/fargo/fargo/utils.py b/fargo/fargo/utils.py
index 36ea3ff..923266e 100644
--- a/fargo/fargo/utils.py
+++ b/fargo/fargo/utils.py
@@ -17,7 +17,6 @@
 import hashlib
 
 from django.apps import apps
-from django.utils.encoding import smart_bytes
 from django.utils.timezone import utc
 
 try:
diff --git a/fargo/fargo/views.py b/fargo/fargo/views.py
index 43a3dd3..5412da1 100644
--- a/fargo/fargo/views.py
+++ b/fargo/fargo/views.py
@@ -16,13 +16,11 @@
 
 import logging
 import urllib.parse
-from copy import deepcopy
 from json import dumps
 
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth import REDIRECT_FIELD_NAME, get_user_model
-from django.contrib.auth import logout as auth_logout
 from django.contrib.auth import views as auth_views
 from django.contrib.auth.decorators import login_required
 from django.core import signing
@@ -307,7 +305,7 @@ class ChooseDocumentKind(TemplateView):
 class LoginView(auth_views.LoginView):
     def get(self, request, *args, **kwargs):
         if any(get_idps()):
-            if not 'next' in request.GET:
+            if 'next' not in request.GET:
                 return HttpResponseRedirect(resolve_url('mellon_login'))
             return HttpResponseRedirect(
                 resolve_url('mellon_login') + '?next=' + quote(request.GET.get('next'))
diff --git a/tests/test_api.py b/tests/test_api.py
index 7f4fb2f..d6b1123 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -17,10 +17,9 @@
 import base64
 
 import pytest
-from django.utils.http import urlencode
 from test_manager import login
 
-from fargo.fargo import models, utils
+from fargo.fargo import models
 
 pytestmark = pytest.mark.django_db