From 9c0d0496369828c8fad882d5d676978fb76105f8 Mon Sep 17 00:00:00 2001
From: Antoine Lambert <anlambert@softwareheritage.org>
Date: Mon, 4 Dec 2023 17:33:30 +0100
Subject: [PATCH] python: Restore previous isort ordering
As the known_first_party isort option was not set yet, previous
imports ordering got broken so restore it.
---
swh/deposit/api/common.py | 28 +++++++++----------
swh/deposit/api/edit.py | 2 +-
swh/deposit/api/private/deposit_check.py | 2 +-
swh/deposit/api/private/deposit_list.py | 2 +-
swh/deposit/api/private/deposit_read.py | 8 +++---
.../api/private/deposit_update_status.py | 4 +--
swh/deposit/api/sword_edit.py | 4 +--
swh/deposit/auth.py | 2 +-
swh/deposit/cli/__init__.py | 1 +
swh/deposit/models.py | 1 -
swh/deposit/settings/production.py | 2 +-
swh/deposit/tests/cli/test_client.py | 2 +-
12 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/swh/deposit/api/common.py b/swh/deposit/api/common.py
index c24d925c..adb478f7 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 9ab05453..0462d35a 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 bfd12eee..5f41bc52 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 63c58112..a1d2bdc6 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 c8d8370c..e469b394 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 52ebf896..34dea3fa 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 da7c2d05..b6267098 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 fac0dbdf..525e8677 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 0a775427..94c2c759 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 f3ddd64d..20689599 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 11941b09..bf6a5782 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 a30c3c54..9c4baed2 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:
--
GitLab