Set up ruff

.github/workflows/checks.yml

@@ -29,14 +29,6 @@ jobs:
       uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
-    - name: isort
-      uses: jamescurtin/isort-action@master
-    - uses: actions/cache@v3
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('requirements/*.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
 
     - name: Install Poetry
       uses: snok/install-poetry@v1

.pre-commit-config.yaml

@@ -8,42 +8,12 @@ repos:
       - id: check-merge-conflict
       - id: detect-private-key
 
-  - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.6.2
     hooks:
-      - id: isort
-        name: isort (python)
-
-  - repo: https://github.com/pycqa/flake8
-    rev: 6.1.0
-    hooks:
-      - id: flake8
-        exclude: node_modules|migrations|scripts|.venv|__init__.py
-        additional_dependencies: [
-          # A flake8 plugin that checks django code style.
-          # https://github.com/rocioar/flake8-django
-          flake8-django,
-          # required by flake8-django
-          django,
-          django_extensions,
-          # A plugin for Flake8 finding likely bugs and design problems in your program.
-          # https://github.com/PyCQA/flake8-bugbear
-          flake8-bugbear,
-          # A flake8 plugin checking common style issues or inconsistencies with pytest-based tests.
-          # https://github.com/m-burst/flake8-pytest-style
-          flake8-pytest-style,
-          # A flake8 plugin that warn about backslashes usage.
-          # https://github.com/wemake-services/flake8-broken-line
-          flake8-broken-line,
-          # A simple module that adds an extension for the fantastic pydocstyle tool to flake8.
-          # https://github.com/PyCQA/flake8-docstrings
-          flake8-docstrings,
-          # McCabe complexity checker.
-          # https://github.com/PyCQA/mccabe
-          mccabe,
-          # A flake8 plug-in loading the configuration from pyproject.toml
-          flake8-pyproject,
-        ]
+      - id: ruff
+        args: [ --fix ]
+      - id: ruff-format
 
   - repo: https://github.com/asottile/add-trailing-comma
     rev: v2.4.0

docs/conf.py

@@ -1,14 +1,15 @@
 import os
+import pathlib
 import sys
 
 import django
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.append(os.path.abspath("."))
-sys.path.append(os.path.abspath(".."))
-sys.path.append(os.path.abspath("../tests"))
+sys.path.append(str(pathlib.Path.cwd()))
+sys.path.append(str(pathlib.Path("..").resolve()))
+sys.path.append(str(pathlib.Path("../tests").resolve()))
 os.environ["DJANGO_SETTINGS_MODULE"] = "settings"
 
 django.setup()
@@ -106,7 +107,7 @@
 ]
 
 
-# -- Options for Texinfo output ------------------------------------------------
+# -- Options for Texinfo output -----------------------------------------------
 
 # Grouping the document tree into Texinfo files. List of tuples
 # (source start file, target name, title, author,
@@ -129,5 +130,8 @@
 # intersphinx documentation
 intersphinx_mapping = {
     "tablib": ("https://tablib.readthedocs.io/en/stable/", None),
-    "django-import-export": ("https://django-import-export.readthedocs.io/en/latest/", None),
+    "django-import-export": (
+        "https://django-import-export.readthedocs.io/en/latest/",
+        None,
+    ),
 }

import_export_extensions/admin/forms/import_admin_form.py

@@ -5,6 +5,7 @@
 
 class ForceImportForm(base_forms.ImportForm):
     """Import form with `force_import` option."""
+
     force_import = forms.BooleanField(
         required=False,
         initial=False,

import_export_extensions/admin/mixins/export_mixin.py

@@ -40,17 +40,24 @@ class CeleryExportAdminMixin(
             If errors - traceback and error message.
 
     """
+
     # export data encoding
     to_encoding = "utf-8"
 
     # template used to display ExportForm
     celery_export_template_name = "admin/import_export/export.html"
 
-    export_status_template_name = "admin/import_export_extensions/celery_export_status.html"
+    export_status_template_name = (
+        "admin/import_export_extensions/celery_export_status.html"
+    )
 
-    export_results_template_name = "admin/import_export_extensions/celery_export_results.html"
+    export_results_template_name = (
+        "admin/import_export_extensions/celery_export_results.html"
+    )
 
-    import_export_change_list_template = "admin/import_export/change_list_export.html"
+    import_export_change_list_template = (
+        "admin/import_export/change_list_export.html"
+    )
 
     # Statuses that should be displayed on 'results' page
     export_results_statuses = models.ExportJob.export_finished_statuses
@@ -262,11 +269,8 @@ def create_export_job(
         job = models.ExportJob.objects.create(
             resource_path=resource_class.class_path,
             resource_kwargs=resource_kwargs,
-            file_format_path=".".join(
-                [
-                    file_format.__module__,
-                    file_format.__name__,
-                ],
+            file_format_path=(
+                f"{file_format.__module__}.{file_format.__name__}"
             ),
         )
         return job
@@ -278,7 +282,7 @@ def get_export_job(
     ) -> models.ExportJob:
         """Get ExportJob instance.
 
-        Raises:
+        Raises
             Http404
 
         """
@@ -317,7 +321,7 @@ def _redirect_to_export_results_page(
     def changelist_view(
         self,
         request: WSGIRequest,
-        context: typing.Optional[dict[str, typing.Any]] = None,
+        context: dict[str, typing.Any] | None = None,
     ):
         """Add the check for permission to changelist template context."""
         context = context or {}

import_export_extensions/admin/mixins/import_export_mixin.py

@@ -9,4 +9,6 @@ class CeleryImportExportMixin(
     """Import and export mixin."""
 
     # template for change_list view
-    import_export_change_list_template = "admin/import_export/change_list_import_export.html"
+    import_export_change_list_template = (
+        "admin/import_export/change_list_import_export.html"
+    )

import_export_extensions/admin/mixins/import_mixin.py

@@ -49,6 +49,7 @@ class CeleryImportAdminMixin(
         with progress bar and import totals.
 
     """
+
     # Import data encoding
     from_encoding = "utf-8"
 
@@ -59,12 +60,18 @@ class CeleryImportAdminMixin(
     celery_import_template = "admin/import_export/import.html"
 
     # Template used to display status of import jobs
-    import_status_template = "admin/import_export_extensions/celery_import_status.html"
+    import_status_template = (
+        "admin/import_export_extensions/celery_import_status.html"
+    )
 
     # template used to display results of import jobs
-    import_result_template_name = "admin/import_export_extensions/celery_import_results.html"
+    import_result_template_name = (
+        "admin/import_export_extensions/celery_import_results.html"
+    )
 
-    import_export_change_list_template = "admin/import_export/change_list_import.html"
+    import_export_change_list_template = (
+        "admin/import_export/change_list_import.html"
+    )
 
     skip_admin_log = None
     # Copy methods of mixin from original package to reuse it here
@@ -323,7 +330,11 @@ def create_import_job(
             data_file=form.cleaned_data["import_file"],
             resource_kwargs=resource.resource_init_kwargs,
             created_by=request.user,
-            skip_parse_step=getattr(settings, "IMPORT_EXPORT_SKIP_ADMIN_CONFIRM", False),
+            skip_parse_step=getattr(
+                settings,
+                "IMPORT_EXPORT_SKIP_ADMIN_CONFIRM",
+                False,
+            ),
             force_import=form.cleaned_data["force_import"],
         )
 
@@ -334,7 +345,7 @@ def get_import_job(
     ) -> models.ImportJob:
         """Get ImportJob instance.
 
-        Raises:
+        Raises
             Http404
 
         """
@@ -366,7 +377,7 @@ def _redirect_to_results_page(
         url = reverse(url_name, kwargs=dict(job_id=job.id))
         query = request.GET.urlencode()
         url = f"{url}?{query}" if query else url
-        if not job.import_status == models.ImportJob.ImportStatus.PARSED:
+        if job.import_status != models.ImportJob.ImportStatus.PARSED:
             return HttpResponseRedirect(redirect_to=url)
 
         # Redirections add one by one links to `redirect_to`
@@ -388,7 +399,7 @@ def _redirect_to_results_page(
     def changelist_view(
         self,
         request: WSGIRequest,
-        context: typing.Optional[dict[str, typing.Any]] = None,
+        context: dict[str, typing.Any] | None = None,
     ):
         """Add the check for permission to changelist template context."""
         context = context or {}

import_export_extensions/admin/mixins/types.py

@@ -1,18 +1,14 @@
 import dataclasses
-import typing
 
 from django.db.models.options import Options
 
 from import_export.formats import base_formats
 
 from ... import resources
 
-ResourceObj = typing.Union[
-    resources.CeleryResource,
-    resources.CeleryModelResource,
-]
-ResourceType = typing.Type[ResourceObj]
-FormatType = typing.Type[base_formats.Format]
+ResourceObj = resources.CeleryResource | resources.CeleryModelResource
+ResourceType = type[ResourceObj]
+FormatType = type[base_formats.Format]
 
 
 @dataclasses.dataclass

import_export_extensions/admin/model_admins/export_job_admin.py

@@ -1,4 +1,3 @@
-import typing
 
 from django.contrib import admin, messages
 from django.core.handlers.wsgi import WSGIRequest
@@ -150,7 +149,7 @@ def get_readonly_fields(self, request, obj=None):
     def get_fieldsets(
         self,
         request: WSGIRequest,
-        obj: typing.Optional[models.ExportJob] = None,
+        obj: models.ExportJob | None = None,
     ):
         """Get fieldsets depending on object status."""
         status = (

import_export_extensions/admin/model_admins/import_job_admin.py

@@ -1,4 +1,3 @@
-import typing
 
 from django.contrib import admin, messages
 from django.core.handlers.wsgi import WSGIRequest
@@ -118,7 +117,7 @@ def import_job_progress_view(
     def get_readonly_fields(
         self,
         request: WSGIRequest,
-        obj: typing.Optional[models.ImportJob] = None,
+        obj: models.ImportJob | None = None,
     ) -> list[str]:
         """Return readonly fields.
 
@@ -151,7 +150,7 @@ def get_readonly_fields(
 
     def _show_results(
         self,
-        obj: typing.Optional[models.ImportJob] = None,
+        obj: models.ImportJob | None = None,
     ) -> str:
         """Show results totals.
 
@@ -189,7 +188,7 @@ def _input_errors(self, job: models.ImportJob):
     def get_fieldsets(
         self,
         request: WSGIRequest,
-        obj: typing.Optional[models.ImportJob] = None,
+        obj: models.ImportJob | None = None,
     ):
         """Get fieldsets depending on object status."""
         status = (

import_export_extensions/admin/model_admins/mixins.py

@@ -1,4 +1,3 @@
-import typing
 
 from django.contrib.contenttypes.models import ContentType
 from django.core.handlers.wsgi import WSGIRequest
@@ -45,8 +44,8 @@ def _model(self, obj: models.ImportJob) -> str:
 
     def get_from_content_type(
         self,
-        obj: typing.Union[models.ImportJob, models.ExportJob],
-    ) -> typing.Union[ContentType, None]:
+        obj: models.ImportJob | models.ExportJob,
+    ) -> ContentType | None:
         """Shortcut to get object from content_type."""
         content_type = obj.resource_kwargs.get("content_type")
         obj_id = obj.resource_kwargs.get("object_id")

import_export_extensions/api/serializers/export_job.py

@@ -13,8 +13,8 @@ class ExportProgressSerializer(ProgressSerializer):
     """Serializer to show ExportJob progress."""
 
     state = serializers.ChoiceField(
-        choices=models.ExportJob.ExportStatus.values
-        + [
+        choices=[
+            *models.ExportJob.ExportStatus.values,
             states.PENDING,
             states.STARTED,
             states.SUCCESS,
@@ -48,13 +48,13 @@ class CreateExportJob(serializers.Serializer):
 
     """
 
-    resource_class: typing.Type[resources.CeleryModelResource]
+    resource_class: type[resources.CeleryModelResource]
 
     def __init__(
         self,
         *args,
-        filter_kwargs: typing.Optional[dict[str, typing.Any]] = None,
-        resource_kwargs: typing.Optional[dict[str, typing.Any]] = None,
+        filter_kwargs: dict[str, typing.Any] | None = None,
+        resource_kwargs: dict[str, typing.Any] | None = None,
         **kwargs,
     ):
         """Set filter kwargs and current user."""
@@ -99,14 +99,14 @@ def update(self, instance, validated_data):
 
 
 def get_create_export_job_serializer(
-    resource: typing.Type[resources.CeleryModelResource],
-) -> typing.Type:  # type: ignore
+    resource: type[resources.CeleryModelResource],
+) -> type:
     """Create serializer for ExportJobs creation."""
 
     class _CreateExportJob(CreateExportJob):
         """Serializer to start export job."""
 
-        resource_class: typing.Type[resources.CeleryModelResource] = resource
+        resource_class: type[resources.CeleryModelResource] = resource
         file_format = serializers.ChoiceField(
             required=True,
             choices=[