Skip to content

Commit

Permalink
Fix the import path for pulp-hashlib
Browse files Browse the repository at this point in the history
In this commit, there were also removed redundant #noqa directives that
were used in the plugin API. The flake8 configuration had to be adjusted
accordingly to ignore the import errors.

closes pulp#4006
  • Loading branch information
lubosmj committed Jul 10, 2023
1 parent 70bab01 commit 7e85e61
Show file tree
Hide file tree
Showing 34 changed files with 115 additions and 120 deletions.
2 changes: 2 additions & 0 deletions .flake8
Expand Up @@ -7,6 +7,8 @@
[flake8]
exclude = ./docs/*,*/migrations/*,./pulpcore/app/protobuf/*

per-file-ignores = */__init__.py: F401

ignore = E203,W503,Q000,Q003,D100,D104,D106,D200,D205,D400,D401,D402
max-line-length = 100

Expand Down
1 change: 1 addition & 0 deletions CHANGES/plugin_api/4006.bugfix
@@ -0,0 +1 @@
Fixed the import path for ``pulpcore.plugin.pulp_hashlib``.
40 changes: 16 additions & 24 deletions pulpcore/app/models/__init__.py
@@ -1,23 +1,23 @@
# https://docs.djangoproject.com/en/3.2/topics/db/models/#organizing-models-in-a-package

# Must be imported first as other models depend on it
from .base import ( # noqa
from .base import (
BaseModel,
MasterModel,
pulp_uuid,
)

from .access_policy import ( # noqa
from .access_policy import (
AccessPolicy,
AutoAddObjPermsMixin,
Group,
)

from .domain import Domain # noqa
from .domain import Domain

from .acs import AlternateContentSource, AlternateContentSourcePath # noqa
from .acs import AlternateContentSource, AlternateContentSourcePath

from .content import ( # noqa
from .content import (
Artifact,
AsciiArmoredDetachedSigningService,
Content,
Expand All @@ -29,9 +29,9 @@
UnsupportedDigestValidationError,
)

from .generic import GenericRelationModel # noqa
from .generic import GenericRelationModel

from .exporter import ( # noqa
from .exporter import (
Export,
ExportedResource,
Exporter,
Expand All @@ -41,14 +41,14 @@
PulpExporter,
)

from .importer import ( # noqa
from .importer import (
Import,
Importer,
PulpImport,
PulpImporter,
)

from .publication import ( # noqa
from .publication import (
ContentGuard,
Distribution,
Publication,
Expand All @@ -59,41 +59,33 @@
ArtifactDistribution,
)

from .repository import ( # noqa
from .repository import (
Remote,
Repository,
RepositoryContent,
RepositoryVersion,
RepositoryVersionContentDetails,
)

# This can lead to circular imports with a custom user model depending on this very module
# Moved to plugin/models/role.py to avoid the circular import.
# from .role import ( # noqa
# GroupRole,
# Role,
# UserRole,
# )
from .status import ContentAppStatus

from .status import ContentAppStatus # noqa

from .task import ( # noqa
from .task import (
CreatedResource,
Task,
TaskGroup,
TaskSchedule,
Worker,
)

from .analytics import SystemID # noqa
from .analytics import SystemID

from .upload import ( # noqa
from .upload import (
Upload,
UploadChunk,
)

# Moved here to avoid a circular import with Task
from .progress import GroupProgressReport, ProgressReport # noqa
from .progress import GroupProgressReport, ProgressReport

# Moved here to avoid a circular import with GroupProgressReport
from .replica import UpstreamPulp # noqa
from .replica import UpstreamPulp
38 changes: 19 additions & 19 deletions pulpcore/app/serializers/__init__.py
Expand Up @@ -2,7 +2,7 @@
# - fields can import directly from base if needed
# - all can import directly from base and fields if needed

from .base import ( # noqa
from .base import (
AsyncOperationResponseSerializer,
DetailIdentityField,
DetailRelatedField,
Expand All @@ -19,7 +19,7 @@
validate_unknown_fields,
HiddenFieldsMixin,
)
from .fields import ( # noqa
from .fields import (
BaseURLField,
ExportsIdentityFromExporterField,
ExportRelatedField,
Expand All @@ -36,29 +36,29 @@
TaskGroupStatusCountField,
pulp_labels_validator,
)
from .access_policy import AccessPolicySerializer # noqa
from .acs import ( # noqa
from .access_policy import AccessPolicySerializer
from .acs import (
AlternateContentSourcePathSerializer,
AlternateContentSourceSerializer,
)
from .content import ( # noqa
from .content import (
ArtifactSerializer,
ContentChecksumSerializer,
MultipleArtifactContentSerializer,
NoArtifactContentSerializer,
SigningServiceSerializer,
SingleArtifactContentSerializer,
)
from .domain import DomainSerializer # noqa
from .exporter import ( # noqa
from .domain import DomainSerializer
from .exporter import (
ExporterSerializer,
ExportSerializer,
FilesystemExportSerializer,
FilesystemExporterSerializer,
PulpExporterSerializer,
PulpExportSerializer,
)
from .importer import ( # noqa
from .importer import (
EvaluationSerializer,
ImporterSerializer,
ImportSerializer,
Expand All @@ -67,9 +67,9 @@
PulpImporterSerializer,
PulpImportSerializer,
)
from .orphans import OrphansCleanupSerializer # noqa
from .progress import GroupProgressReportSerializer, ProgressReportSerializer # noqa
from .publication import ( # noqa
from .orphans import OrphansCleanupSerializer
from .progress import GroupProgressReportSerializer, ProgressReportSerializer
from .publication import (
ContentGuardSerializer,
DistributionSerializer,
PublicationSerializer,
Expand All @@ -78,31 +78,31 @@
ContentRedirectContentGuardSerializer,
ArtifactDistributionSerializer,
)
from .purge import PurgeSerializer # noqa
from .repository import ( # noqa
from .purge import PurgeSerializer
from .repository import (
RemoteSerializer,
RepositorySerializer,
RepositorySyncURLSerializer,
RepositoryAddRemoveContentSerializer,
RepositoryVersionSerializer,
)
from .repair import RepairSerializer # noqa
from .reclaim import ReclaimSpaceSerializer # noqa
from .task import ( # noqa
from .repair import RepairSerializer
from .reclaim import ReclaimSpaceSerializer
from .task import (
MinimalTaskSerializer,
TaskCancelSerializer,
TaskScheduleSerializer,
TaskSerializer,
TaskGroupSerializer,
WorkerSerializer,
)
from .upload import ( # noqa
from .upload import (
UploadChunkSerializer,
UploadCommitSerializer,
UploadSerializer,
UploadDetailSerializer,
)
from .user import ( # noqa
from .user import (
GroupRoleSerializer,
GroupSerializer,
GroupUserSerializer,
Expand All @@ -111,4 +111,4 @@
UserRoleSerializer,
UserSerializer,
)
from .replica import UpstreamPulpSerializer # noqa
from .replica import UpstreamPulpSerializer
2 changes: 1 addition & 1 deletion pulpcore/app/serializers/purge.py
Expand Up @@ -3,7 +3,7 @@

from rest_framework import serializers

from pulpcore.app.serializers import ValidateFieldsMixin # noqa
from pulpcore.app.serializers import ValidateFieldsMixin
from pulpcore.constants import TASK_FINAL_STATES


Expand Down
20 changes: 10 additions & 10 deletions pulpcore/app/tasks/__init__.py
@@ -1,25 +1,25 @@
from pulpcore.app.tasks import base, repository, upload # noqa
from pulpcore.app.tasks import base, repository, upload

from .base import ( # noqa
from .base import (
general_create,
general_create_from_temp_file,
general_delete,
general_multi_delete,
general_update,
)

from .export import fs_publication_export, fs_repo_version_export # noqa
from .export import fs_publication_export, fs_repo_version_export

from .importer import pulp_import # noqa
from .importer import pulp_import

from .orphan import orphan_cleanup # noqa
from .orphan import orphan_cleanup

from .purge import purge # noqa
from .purge import purge

from .reclaim_space import reclaim_space # noqa
from .reclaim_space import reclaim_space

from .replica import replicate_distributions # noqa
from .replica import replicate_distributions

from .repository import repair_all_artifacts # noqa
from .repository import repair_all_artifacts

from .analytics import post_analytics # noqa
from .analytics import post_analytics
8 changes: 4 additions & 4 deletions pulpcore/app/views/__init__.py
@@ -1,4 +1,4 @@
from .orphans import OrphansView # noqa
from .status import StatusView # noqa
from .repair import RepairView # noqa
from .importer import PulpImporterImportCheckView # noqa
from .orphans import OrphansView
from .status import StatusView
from .repair import RepairView
from .importer import PulpImporterImportCheckView
32 changes: 16 additions & 16 deletions pulpcore/app/viewsets/__init__.py
@@ -1,4 +1,4 @@
from .base import ( # noqa
from .base import (
AsyncCreateMixin,
AsyncRemoveMixin,
AsyncUpdateMixin,
Expand All @@ -8,11 +8,11 @@
NULLABLE_NUMERIC_FILTER_OPTIONS,
)

from .access_policy import AccessPolicyViewSet # noqa
from .access_policy import AccessPolicyViewSet

from .acs import AlternateContentSourceViewSet # noqa
from .acs import AlternateContentSourceViewSet

from .content import ( # noqa
from .content import (
ArtifactFilter,
ArtifactViewSet,
ContentFilter,
Expand All @@ -21,27 +21,27 @@
ReadOnlyContentViewSet,
SigningServiceViewSet,
)
from .custom_filters import ( # noqa
from .custom_filters import (
RepoVersionHrefFilter,
RepositoryVersionFilter,
)
from .domain import DomainViewSet # noqa
from .exporter import ( # noqa
from .domain import DomainViewSet
from .exporter import (
ExportViewSet,
ExporterViewSet,
FilesystemExporterViewSet,
FilesystemExportViewSet,
PulpExporterViewSet,
PulpExportViewSet,
)
from .importer import ( # noqa
from .importer import (
ImportViewSet,
ImporterViewSet,
PulpImportViewSet,
PulpImporterViewSet,
)
from .orphans import OrphansCleanupViewset # noqa
from .publication import ( # noqa
from .orphans import OrphansCleanupViewset
from .publication import (
ContentGuardFilter,
ContentGuardViewSet,
DistributionFilter,
Expand All @@ -55,8 +55,8 @@
ContentRedirectContentGuardViewSet,
ArtifactDistributionViewSet,
)
from .reclaim import ReclaimSpaceViewSet # noqa
from .repository import ( # noqa
from .reclaim import ReclaimSpaceViewSet
from .repository import (
ImmutableRepositoryViewSet,
ListRepositoryViewSet,
ReadOnlyRepositoryViewSet,
Expand All @@ -67,14 +67,14 @@
RepositoryVersionViewSet,
ListRepositoryVersionViewSet,
)
from .task import TaskViewSet, TaskGroupViewSet, TaskScheduleViewSet, WorkerViewSet # noqa
from .upload import UploadViewSet # noqa
from .user import ( # noqa
from .task import TaskViewSet, TaskGroupViewSet, TaskScheduleViewSet, WorkerViewSet
from .upload import UploadViewSet
from .user import (
GroupViewSet,
GroupRoleViewSet,
GroupUserViewSet,
RoleViewSet,
UserViewSet,
UserRoleViewSet,
)
from .replica import UpstreamPulpViewSet # noqa
from .replica import UpstreamPulpViewSet
2 changes: 1 addition & 1 deletion pulpcore/cache/__init__.py
@@ -1,4 +1,4 @@
from .cache import ( # noqa
from .cache import (
AsyncCache,
AsyncContentCache,
Cache,
Expand Down
8 changes: 4 additions & 4 deletions pulpcore/download/__init__.py
@@ -1,4 +1,4 @@
from .base import BaseDownloader, DownloadResult # noqa
from .factory import DownloaderFactory # noqa
from .file import FileDownloader # noqa
from .http import HttpDownloader # noqa
from .base import BaseDownloader, DownloadResult
from .factory import DownloaderFactory
from .file import FileDownloader
from .http import HttpDownloader
4 changes: 2 additions & 2 deletions pulpcore/exceptions/__init__.py
@@ -1,11 +1,11 @@
from .base import ( # noqa
from .base import (
AdvisoryLockError,
PulpException,
ResourceImmutableError,
TimeoutException,
exception_to_dict,
)
from .validation import ( # noqa
from .validation import (
DigestValidationError,
InvalidSignatureError,
SizeValidationError,
Expand Down

0 comments on commit 7e85e61

Please sign in to comment.