diff --git a/swh/deposit/api/common.py b/swh/deposit/api/common.py
index c24d925ce49019085bc014ba822ac6f1a406f04c..adb478f71185f882045513adf26ac949477c583f 100644
--- a/swh/deposit/api/common.py
+++ b/swh/deposit/api/common.py
@@ -23,20 +23,6 @@ from rest_framework.authentication import BaseAuthentication, BasicAuthenticatio
 from rest_framework.permissions import BasePermission, IsAuthenticated
 from rest_framework.request import Request
 from rest_framework.views import APIView
-from swh.model import hashutil
-from swh.model.model import (
-    MetadataAuthority,
-    MetadataAuthorityType,
-    Origin,
-    RawExtrinsicMetadata,
-)
-from swh.model.swhids import (
-    ExtendedObjectType,
-    ExtendedSWHID,
-    QualifiedSWHID,
-    ValidationError,
-)
-from swh.scheduler.utils import create_oneshot_task_dict
 
 from swh.deposit.api.checks import check_metadata, check_url_match_provider
 from swh.deposit.api.converters import convert_status_detail
@@ -84,6 +70,20 @@ from swh.deposit.utils import (
     parse_swh_metadata_provenance,
     parse_swh_reference,
 )
+from swh.model import hashutil
+from swh.model.model import (
+    MetadataAuthority,
+    MetadataAuthorityType,
+    Origin,
+    RawExtrinsicMetadata,
+)
+from swh.model.swhids import (
+    ExtendedObjectType,
+    ExtendedSWHID,
+    QualifiedSWHID,
+    ValidationError,
+)
+from swh.scheduler.utils import create_oneshot_task_dict
 
 ACCEPT_PACKAGINGS = ["http://purl.org/net/sword/package/SimpleZip"]
 ACCEPT_ARCHIVE_CONTENT_TYPES = ["application/zip", "application/x-tar"]
diff --git a/swh/deposit/api/edit.py b/swh/deposit/api/edit.py
index 9ab054535ce1172a19706fe2c93ef39e7c237730..0462d35a612f4040d9a4effa2a7e9a6a6698e598 100644
--- a/swh/deposit/api/edit.py
+++ b/swh/deposit/api/edit.py
@@ -4,13 +4,13 @@
 # See top-level LICENSE file for more information
 
 from rest_framework.request import Request
-from swh.model.swhids import QualifiedSWHID
 
 from swh.deposit.api.common import APIDelete, APIPut, ParsedRequestHeaders
 from swh.deposit.config import DEPOSIT_STATUS_LOAD_SUCCESS
 from swh.deposit.errors import BAD_REQUEST, DepositError, ParserError
 from swh.deposit.models import Deposit
 from swh.deposit.parsers import SWHAtomEntryParser, SWHMultiPartParser
+from swh.model.swhids import QualifiedSWHID
 
 
 class EditAPI(APIPut, APIDelete):
diff --git a/swh/deposit/api/private/deposit_check.py b/swh/deposit/api/private/deposit_check.py
index bfd12eee083f77d721b20327c60b5fb12d44abf5..5f41bc5299eea2f5c2649bf1ee9cb636482ac99f 100644
--- a/swh/deposit/api/private/deposit_check.py
+++ b/swh/deposit/api/private/deposit_check.py
@@ -14,7 +14,6 @@ import zipfile
 
 from rest_framework import status
 from rest_framework.request import Request
-from swh.scheduler.utils import create_oneshot_task_dict
 
 from swh.deposit.api.checks import check_metadata
 from swh.deposit.api.common import APIGet
@@ -25,6 +24,7 @@ from swh.deposit.config import (
     DEPOSIT_STATUS_VERIFIED,
 )
 from swh.deposit.models import Deposit, DepositRequest
+from swh.scheduler.utils import create_oneshot_task_dict
 
 MANDATORY_ARCHIVE_UNREADABLE = (
     "At least one of its associated archives is not readable"  # noqa
diff --git a/swh/deposit/api/private/deposit_list.py b/swh/deposit/api/private/deposit_list.py
index 63c58112f3d104460d2f2c01238d1ca702203c67..a1d2bdc6b597c3a48cea5455c7f88962fae9f153 100644
--- a/swh/deposit/api/private/deposit_list.py
+++ b/swh/deposit/api/private/deposit_list.py
@@ -19,12 +19,12 @@ from rest_framework.generics import ListAPIView
 from rest_framework.permissions import AllowAny
 from rest_framework.request import Request
 import sentry_sdk
-from swh.model.swhids import QualifiedSWHID
 
 from swh.deposit.api.private import APIPrivateView
 from swh.deposit.api.utils import DefaultPagination, DepositSerializer
 from swh.deposit.models import Deposit
 from swh.deposit.utils import parse_swh_deposit_origin, parse_swh_metadata_provenance
+from swh.model.swhids import QualifiedSWHID
 
 
 def _enrich_deposit_with_metadata(deposit: Deposit) -> Deposit:
diff --git a/swh/deposit/api/private/deposit_read.py b/swh/deposit/api/private/deposit_read.py
index c8d8370cb6b028d00064e0e9b374b416ff8ad33b..e469b3944b31f8ec5ed48f5569abb6a78a68ae8e 100644
--- a/swh/deposit/api/private/deposit_read.py
+++ b/swh/deposit/api/private/deposit_read.py
@@ -12,16 +12,16 @@ from typing import Any, Dict, Iterator, List, Optional, Tuple
 from xml.etree import ElementTree
 
 from rest_framework import status
-from swh.core import tarball
-from swh.model.hashutil import hash_to_hex
-from swh.model.model import MetadataAuthorityType
-from swh.model.swhids import CoreSWHID
 
+from swh.core import tarball
 from swh.deposit.api.common import APIGet
 from swh.deposit.api.private import APIPrivateView, DepositReadMixin
 from swh.deposit.config import ARCHIVE_TYPE, SWH_PERSON
 from swh.deposit.models import Deposit
 from swh.deposit.utils import NAMESPACES, normalize_date
+from swh.model.hashutil import hash_to_hex
+from swh.model.model import MetadataAuthorityType
+from swh.model.swhids import CoreSWHID
 
 
 @contextmanager
diff --git a/swh/deposit/api/private/deposit_update_status.py b/swh/deposit/api/private/deposit_update_status.py
index 52ebf896a28edd6492ca831232b22ba6613dc973..34dea3fafd7c3ae4abff908ce5b7fb43ff91a62d 100644
--- a/swh/deposit/api/private/deposit_update_status.py
+++ b/swh/deposit/api/private/deposit_update_status.py
@@ -4,8 +4,6 @@
 # See top-level LICENSE file for more information
 
 from rest_framework.parsers import JSONParser
-from swh.model.hashutil import hash_to_bytes
-from swh.model.swhids import CoreSWHID, ObjectType, QualifiedSWHID
 
 from swh.deposit.api.common import APIPut, ParsedRequestHeaders
 from swh.deposit.api.private import APIPrivateView
@@ -15,6 +13,8 @@ from swh.deposit.models import (
     DEPOSIT_STATUS_LOAD_SUCCESS,
     Deposit,
 )
+from swh.model.hashutil import hash_to_bytes
+from swh.model.swhids import CoreSWHID, ObjectType, QualifiedSWHID
 
 MANDATORY_KEYS = ["origin_url", "release_id", "directory_id", "snapshot_id"]
 
diff --git a/swh/deposit/api/sword_edit.py b/swh/deposit/api/sword_edit.py
index da7c2d056322f6fcf5e1ce6bd5c62bae5a066409..b6267098df3acea420345e7f0250a5b61afce719 100644
--- a/swh/deposit/api/sword_edit.py
+++ b/swh/deposit/api/sword_edit.py
@@ -6,13 +6,13 @@
 from typing import Optional, Tuple
 
 from rest_framework import status
-from swh.storage import get_storage
-from swh.storage.interface import StorageInterface
 
 from swh.deposit.api.common import APIPost, ParsedRequestHeaders, Receipt
 from swh.deposit.config import EDIT_IRI, EM_IRI
 from swh.deposit.models import Deposit
 from swh.deposit.parsers import SWHAtomEntryParser, SWHMultiPartParser
+from swh.storage import get_storage
+from swh.storage.interface import StorageInterface
 
 
 class SwordEditAPI(APIPost):
diff --git a/swh/deposit/auth.py b/swh/deposit/auth.py
index fac0dbdf51a43287a414607c12f2b2e8b77a8dc2..525e8677d3df0a7194be71034a9e703e84d21d43 100644
--- a/swh/deposit/auth.py
+++ b/swh/deposit/auth.py
@@ -13,6 +13,7 @@ from rest_framework.authentication import BasicAuthentication
 from rest_framework.exceptions import AuthenticationFailed
 from rest_framework.permissions import BasePermission
 from sentry_sdk import capture_exception
+
 from swh.auth.django.models import OIDCUser
 from swh.auth.django.utils import oidc_user_from_profile
 from swh.auth.keycloak import (
@@ -20,7 +21,6 @@ from swh.auth.keycloak import (
     KeycloakOpenIDConnect,
     keycloak_error_message,
 )
-
 from swh.deposit.errors import UNAUTHORIZED, make_error_response
 from swh.deposit.models import DepositClient
 
diff --git a/swh/deposit/cli/__init__.py b/swh/deposit/cli/__init__.py
index 0a77542734eeb124dca8aac7654608f0250bb617..94c2c7599ca1e68874d613ca03ba1f4944ad2e8b 100644
--- a/swh/deposit/cli/__init__.py
+++ b/swh/deposit/cli/__init__.py
@@ -8,6 +8,7 @@ import logging
 # WARNING: do not import unnecessary things here to keep cli startup time under
 # control
 import click
+
 from swh.core.cli import CONTEXT_SETTINGS
 from swh.core.cli import swh as swh_cli_group
 
diff --git a/swh/deposit/models.py b/swh/deposit/models.py
index f3ddd64de7da51ef9679969d782e053e2cd37a05..20689599186e582488dfd283bbc92c91992c192f 100644
--- a/swh/deposit/models.py
+++ b/swh/deposit/models.py
@@ -21,7 +21,6 @@ except ImportError:
     from django.contrib.postgres.fields import JSONField as OrigJSONField
 
 from swh.auth.django.models import OIDCUser
-
 from swh.deposit.config import (
     ARCHIVE_TYPE,
     DEPOSIT_STATUS_DEPOSITED,
diff --git a/swh/deposit/settings/production.py b/swh/deposit/settings/production.py
index 11941b0946f6653a0b439eab463ceb5e1acd9ae9..bf6a578285455bcc8c28e7c7a531f09f9a7a2d17 100644
--- a/swh/deposit/settings/production.py
+++ b/swh/deposit/settings/production.py
@@ -6,8 +6,8 @@
 import os
 
 import django
-from swh.core import config
 
+from swh.core import config
 from swh.deposit.settings.common import *  # noqa
 from swh.deposit.settings.common import ALLOWED_HOSTS, CACHES
 
diff --git a/swh/deposit/tests/cli/test_client.py b/swh/deposit/tests/cli/test_client.py
index a30c3c5429b3b49eabcf0f262391714e39d39629..9c4baed2d12874d69a521187e89381263ae56a3f 100644
--- a/swh/deposit/tests/cli/test_client.py
+++ b/swh/deposit/tests/cli/test_client.py
@@ -13,7 +13,6 @@ from unittest.mock import MagicMock
 from xml.etree import ElementTree
 
 import pytest
-from swh.model.exceptions import ValidationError
 import yaml
 
 from swh.deposit.api.checks import (
@@ -32,6 +31,7 @@ from swh.deposit.client import (
 from swh.deposit.parsers import parse_xml
 from swh.deposit.tests.conftest import TEST_USER
 from swh.deposit.utils import NAMESPACES
+from swh.model.exceptions import ValidationError
 
 
 def generate_slug() -> str: