Setup and run ruff formatter

.pre-commit-config.yaml

@@ -7,16 +7,12 @@ repos:
     - id: trailing-whitespace
       exclude_types: [sql]
 
-- repo: https://github.com/psf/black
-  rev: 24.10.0
-  hooks:
-    - id: black
-
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: "v0.8.0"
+  rev: v0.9.6
   hooks:
     - id: ruff
       args: [--fix, --exit-non-zero-on-fix]
+    - id: ruff-format
 
 - repo: https://github.com/adamchainz/django-upgrade
   rev: "1.22.1"
@@ -25,8 +21,7 @@ repos:
       args: [--target-version, "5.0"]
 
 - repo: https://github.com/astral-sh/uv-pre-commit
-  # uv version.
-  rev: 0.5.30
+  rev: 0.6.0
   hooks:
     - id: uv-lock
     - id: uv-export

manage.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 """Django's command-line utility for administrative tasks."""
+
 import os
 import sys
 

notebooks/dsrc_doc/ComponentTemplate.py

@@ -96,7 +96,10 @@ def _load_asset(rel_file_path):
 )
 
 context = Context(
-    {"projects": projects.order_by("-created_on")[:5], "csscore": csscore.data}
+    {
+        "projects": projects.order_by("-created_on")[:5],
+        "csscore": csscore.data,
+    }
 )
 
 HTML(template.render(context))

pyproject.toml

@@ -2,11 +2,11 @@
 name = "recoco"
 dynamic = ["version"]
 
-authors = [{name = "Recoco Dev Team"}]
+authors = [{ name = "Recoco Dev Team" }]
 maintainers = [
-  {name = "Guillaume Libersat", email = "[email protected]"}
+    { name = "Guillaume Libersat", email = "[email protected]" },
 ]
-license = {name = "AGPL-v3", file="LICENSE"}
+license = { name = "AGPL-v3", file = "LICENSE" }
 
 description = "Recommandations Collaboratives"
 readme = "README.md"
@@ -82,7 +82,7 @@ Repository = "https://github.com/betagouv/recommandations-collaboratives/"
 packages = ["recoco"]
 
 [tool.setuptools.dynamic]
-version = {attr = "recoco.__version__"}
+version = { attr = "recoco.__version__" }
 
 [build-system]
 requires = ["setuptools"]
@@ -194,7 +194,6 @@ django-webhook = { git = "https://github.com/etchegom/django-webhook.git", rev =
 
 [dependency-groups]
 dev = [
-    "black>=25.1.0",
     "coverage==7.4.1",
     "django-coverage-plugin>=3.1.0",
     "django-debug-toolbar==4.3.0",
@@ -231,3 +230,11 @@ dev = [
     "sphinxcontrib-django>=2.5",
     "sphinxcontrib-django-urls>=0.3",
 ]
+
+
+[tool.ruff]
+line-length = 88
+
+[tool.ruff.format]
+skip-magic-trailing-comma = false
+exclude = ["*.ipynb", "fabfile.py", "notebooks/*", "sql/*", "frontend_tests/*", "docs/*", "node_modules/*"]

recoco/apps/addressbook/admin.py

@@ -13,7 +13,7 @@ class OrganizationGroupAdmin(admin.ModelAdmin):
 
 @admin.register(models.Organization)
 class OrganizationAdmin(admin.ModelAdmin):
-    search_fields = ["name" "group__name"]
+    search_fields = ["name", "group__name"]
     list_display = ["name"]
     ordering = ["name"]
     list_filter = ["sites", "group"]

recoco/apps/addressbook/migrations/0010_organizationgroup_organization_group.py

@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("addressbook", "0009_alter_organization_departments"),
     ]

recoco/apps/addressbook/migrations/0011_contact_created_contact_modified_and_more.py

@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("addressbook", "0010_organizationgroup_organization_group"),
     ]

recoco/apps/addressbook/tests/test_rest_contact.py

@@ -164,9 +164,9 @@ def test_contact_search_filter(
         reverse("api-addressbook-contact-list"), {"search": search_terms}
     )
     assert response.status_code == 200
-    assert [
-        contact["id"] for contact in response.data["results"]
-    ] == expected_result, f"failure for search terms: {search_terms}"
+    assert [contact["id"] for contact in response.data["results"]] == expected_result, (
+        f"failure for search terms: {search_terms}"
+    )
 
 
 @pytest.mark.parametrize(

recoco/apps/addressbook/tests/test_views_organization.py

@@ -56,7 +56,6 @@ def test_organization_list_not_available_for_non_staff(client):
 
 @pytest.mark.django_db
 def test_create_existing_organization_and_redirect(current_site, client):
-
     organization = Recipe(
         Organization, sites=[current_site], name="my organization"
     ).make()

recoco/apps/addressbook/urls.py

@@ -7,7 +7,6 @@
 created : 2021-07-16 16:22:25 CEST
 """
 
-
 from django.urls import path
 
 from . import views

recoco/apps/communication/management/commands/senddigests.py

@@ -7,7 +7,6 @@
 created: 2022-01-24 22:39:27 CEST
 """
 
-
 import logging
 
 from django.conf import settings

recoco/apps/communication/management/commands/sendtestdigest.py

@@ -7,7 +7,6 @@
 created: 2022-01-24 22:39:27 CEST
 """
 
-
 import json
 
 from django.core.management.base import BaseCommand

recoco/apps/communication/migrations/0013_alter_emailtemplate_name.py

@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("communication", "0012_alter_emailtemplate_site"),
     ]

recoco/apps/crm/urls.py

@@ -7,7 +7,6 @@
 created : 2022-07-19 17:27:25 CEST
 """
 
-
 from django.urls import path
 
 from . import views

recoco/apps/demarches_simplifiees/migrations/0001_initial.py

@@ -7,7 +7,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

recoco/apps/demarches_simplifiees/migrations/0002_remove_dsresource_type.py

@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("demarches_simplifiees", "0001_initial"),
     ]

recoco/apps/demarches_simplifiees/migrations/0003_dsmapping.py

@@ -7,7 +7,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("sites", "0002_alter_domain_unique"),
         ("demarches_simplifiees", "0002_remove_dsresource_type"),

recoco/apps/demarches_simplifiees/tests/conftest.py

@@ -30,7 +30,7 @@ def ds_schema_sample():
                     "description": "Ce formulaire est destiné aux collectivités de Moselle qui souhaitent déposer une demande de subvention au titre de la DETR ou de la DSIL en 2024. Votre demande sera automatiquement orientée vers la sous-préfecture compétente.\r\n\r\nLa date limite de dépôt des dossiers est fixée au 30 novembre 2023.\r\n\r\nDans le cadre de l'instruction des demandes, les projets sont orientés par les sous-préfets en lien avec la préfecture vers la dotation la plus adaptée (DETR ou DSIL).\r\n\r\nPour l'éligibilité des opérations, il convient de se référer à l’appel à projets 2024 commun à la DETR et à la DSIL, disponible à l'adresse suivante : https://www.moselle.gouv.fr/Actions-de-l-Etat/Collectivites-controle-de-legalite-et-finances-locales/Subventions\r\n\r\n",
                     "required": False,
                     "collapsibleExplanationEnabled": True,
-                    "collapsibleExplanationText": "\r\nPour constituer votre dossier, les sections suivantes sont à compléter :\r\n\r\n-Informations sur le porteur de projet\r\n-Présentation de l'opération\r\n-Plan de financement prévisionnel\r\n-Finalisation du dossier\r\n\r\n\r\n\u003Cbr /\u003E\r\n\r\nVotre dossier est enregistré automatiquement après chaque modification. Vous pouvez à tout moment fermer la fenêtre et reprendre plus tard là où vous en étiez.",
+                    "collapsibleExplanationText": "\r\nPour constituer votre dossier, les sections suivantes sont à compléter :\r\n\r\n-Informations sur le porteur de projet\r\n-Présentation de l'opération\r\n-Plan de financement prévisionnel\r\n-Finalisation du dossier\r\n\r\n\r\n\u003cbr /\u003e\r\n\r\nVotre dossier est enregistré automatiquement après chaque modification. Vous pouvez à tout moment fermer la fenêtre et reprendre plus tard là où vous en étiez.",
                 },
                 {
                     "__typename": "YesNoChampDescriptor",

recoco/apps/demarches_simplifiees/tests/test_signals.py

@@ -16,7 +16,6 @@ def test_trigger_load_ds_resource_schema(settings, autoload_enabled, expected_ca
     with patch(
         "recoco.apps.demarches_simplifiees.signals.load_ds_resource_schema"
     ) as mock_load_ds_resource_schema:
-
         ds_resource = baker.make(DSResource)
         ds_resource.schema = {"number": 123}
         ds_resource.save()

recoco/apps/dsrc/urls.py

@@ -7,7 +7,6 @@
 created : 2024-03-02 01:13:25 CEST
 """
 
-
 from django.urls import path
 
 from . import views

recoco/apps/feature_flag/migrations/0001_initial.py

@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

recoco/apps/geomatics/migrations/0005_alter_commune_unique_together.py

@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("geomatics", "0004_alter_department_region"),
     ]

recoco/apps/geomatics/models.py

@@ -7,7 +7,6 @@
 created: 2021-07-12 12:05:28 CEST
 """
 
-
 from django.db import models
 
 

recoco/apps/hitcount/migrations/0001_initial.py

@@ -8,7 +8,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

recoco/apps/hitcount/migrations/0002_alter_hit_hitcount_alter_hit_user_and_more.py

@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ("hitcount", "0001_initial"),

recoco/apps/hitcount/tests/test_views.py

@@ -60,6 +60,6 @@ def test_hit_view():
     )
     assert response.status_code == 200
     assert HitCount.objects.count() == 1
-    assert (
-        hitcount.hits.count() == 2
-    ), "no hit should be registered when user is hijacked"
+    assert hitcount.hits.count() == 2, (
+        "no hit should be registered when user is hijacked"
+    )

recoco/apps/home/forms.py

@@ -28,9 +28,9 @@ class UVSignupForm(SignupForm):
     def __init__(self, *args, **kwargs):
         super(UVSignupForm, self).__init__(*args, **kwargs)
 
-        self.fields["password1"].label = (
-            "Définissez votre mot de passe (8 caractères minimum)"
-        )
+        self.fields[
+            "password1"
+        ].label = "Définissez votre mot de passe (8 caractères minimum)"
         self.fields["password1"].widget = forms.PasswordInput(
             attrs={"class": "fr-input fr-mt-2v fr-mb-4v"}
         )

recoco/apps/home/management/commands/create_site.py

@@ -71,7 +71,6 @@ def handle(self, *args, **options):
         email_logo = options["email_logo"]
 
         try:
-
             admin_user = None
             if options["admin_user"]:
                 admin_user = User.objects.get(username=options["admin_user"])

recoco/apps/home/migrations/0024_siteconfiguration_onboarding_questions.py

@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("survey", "0033_alter_session_project"),
         ("home", "0023_auto_20240206_1216"),

recoco/apps/home/migrations/0026_merge_20240422_0744.py

@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("home", "0024_siteconfiguration_onboarding_questions"),
         ("home", "0025_siteconfiguration_legal_address"),

recoco/apps/home/migrations/0026_merge_20240422_1101.py

@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("home", "0024_siteconfiguration_onboarding_questions"),
         ("home", "0025_siteconfiguration_legal_address"),

recoco/apps/home/migrations/0027_merge_20240423_1117.py

@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("home", "0026_merge_20240422_0744"),
         ("home", "0026_merge_20240422_1101"),

recoco/apps/home/migrations/0030_siteconfiguration_logo_large_and_more.py

@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("home", "0029_siteconfiguration_description"),
     ]

recoco/apps/home/migrations/0031_alter_siteconfiguration_contact_form_recipient_and_more.py

@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("taggit", "0005_auto_20220424_2025"),
         ("home", "0030_siteconfiguration_logo_large_and_more"),

recoco/apps/home/migrations/0032_siteconfiguration_accept_handover_and_more.py

@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("taggit", "0005_auto_20220424_2025"),
         ("home", "0031_alter_siteconfiguration_contact_form_recipient_and_more"),

recoco/apps/home/migrations/0033_siteconfiguration_main_topic.py

@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("home", "0032_siteconfiguration_accept_handover_and_more"),
     ]

recoco/apps/home/migrations/0034_siteconfiguration_crisp_token.py

@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("home", "0033_siteconfiguration_main_topic"),
     ]

recoco/apps/home/rest.py

@@ -12,7 +12,6 @@
 
 
 class UserNotificationsMarkOneAsRead(APIView):
-
     permission_classes = [IsAuthenticated]
 
     def patch(self, request, pk):
@@ -33,7 +32,6 @@ def patch(self, request, pk):
 
 
 class UserNotificationsMarkAllAsRead(APIView):
-
     permission_classes = [IsAuthenticated]
 
     def patch(self, request, *args, **kwargs):

recoco/apps/home/serializers.py

@@ -7,7 +7,6 @@
 created: 2022-05-16 17:44:55 CET
 """
 
-
 from django.contrib.auth import models as auth_models
 from django.contrib.sites import models as sites_models
 from rest_framework import serializers