Resolve ruff check warnings

Author: dralley

pulpcore/app/management/commands/handle-artifact-checksums.py

@@ -135,7 +135,7 @@ def _download_artifact(self, artifact, checksum, file_path):
                                 restored = True
                                 break
                 if not restored:
-                    self.stdout.write(_("Deleting unrepairable file {}".format(file_path)))
+                    self.stdout.write(_("Deleting unrepairable file {}").format(file_path))
                     artifact.file.delete(save=False)
             else:
                 break

pulpcore/app/models/__init__.py

@@ -1,30 +1,38 @@
+# ruff: noqa: F401
+# isort: skip_file
 # 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 (
+    BaseModel,
+    MasterModel,
+    pulp_uuid,
+)
+
 from .access_policy import (
     AccessPolicy,
     AutoAddObjPermsMixin,
     Group,
 )
+
+from .domain import Domain
+
 from .acs import AlternateContentSource, AlternateContentSourcePath
-from .analytics import SystemID
-from .base import (
-    BaseModel,
-    MasterModel,
-    pulp_uuid,
-)
+
 from .content import (
     Artifact,
     AsciiArmoredDetachedSigningService,
     Content,
-    ContentArtifact,
     ContentManager,
+    ContentArtifact,
     PulpTemporaryFile,
     RemoteArtifact,
     SigningService,
     UnsupportedDigestValidationError,
 )
-from .domain import Domain
+
+from .generic import GenericRelationModel
+
 from .exporter import (
     Export,
     ExportedResource,
@@ -34,62 +42,71 @@
     PulpExport,
     PulpExporter,
 )
-from .generic import GenericRelationModel
+
 from .importer import (
     Import,
     Importer,
     PulpImport,
     PulpImporter,
 )
-from .openpgp import (
-    OpenPGPDistribution,
-    OpenPGPKeyring,
-    OpenPGPPublicKey,
-    OpenPGPPublicSubkey,
-    OpenPGPSignature,
-    OpenPGPUserAttribute,
-    OpenPGPUserID,
-)
 
-# Moved here to avoid a circular import with Task
-from .progress import GroupProgressReport, ProgressReport
 from .publication import (
-    ArtifactDistribution,
-    CompositeContentGuard,
     ContentGuard,
-    ContentRedirectContentGuard,
-    DistributedPublication,
     Distribution,
-    HeaderContentGuard,
+    DistributedPublication,
     Publication,
     PublishedArtifact,
     PublishedMetadata,
     RBACContentGuard,
+    CompositeContentGuard,
+    ContentRedirectContentGuard,
+    HeaderContentGuard,
+    ArtifactDistribution,
 )
 
-# Moved here to avoid a circular import with GroupProgressReport
-from .replica import UpstreamPulp
 from .repository import (
     Remote,
     Repository,
     RepositoryContent,
     RepositoryVersion,
     RepositoryVersionContentDetails,
 )
+
 from .status import AppStatus
+
 from .task import (
     CreatedResource,
     ProfileArtifact,
     Task,
     TaskGroup,
     TaskSchedule,
 )
+
+from .analytics import SystemID
+
 from .upload import (
     Upload,
     UploadChunk,
 )
+
 from .vulnerability_report import VulnerabilityReport
 
+# Moved here to avoid a circular import with Task
+from .progress import GroupProgressReport, ProgressReport
+
+# Moved here to avoid a circular import with GroupProgressReport
+from .replica import UpstreamPulp
+
+from .openpgp import (
+    OpenPGPDistribution,
+    OpenPGPKeyring,
+    OpenPGPPublicKey,
+    OpenPGPPublicSubkey,
+    OpenPGPSignature,
+    OpenPGPUserAttribute,
+    OpenPGPUserID,
+)
+
 __all__ = [
     "AppStatus",
     "BaseModel",

pulpcore/app/serializers/__init__.py

@@ -1,12 +1,9 @@
+# ruff: noqa: F401
+# isort: skip_file
 # Load order: base, fields, all others.
 # - fields can import directly from base if needed
 # - all can import directly from base and fields if needed
 
-from .access_policy import AccessPolicySerializer
-from .acs import (
-    AlternateContentSourcePathSerializer,
-    AlternateContentSourceSerializer,
-)
 from .base import (
     AsyncOperationResponseSerializer,
     DetailIdentityField,
@@ -27,6 +24,32 @@
     ValidateFieldsMixin,
     validate_unknown_fields,
 )
+from .fields import (
+    BaseURLField,
+    ExportsIdentityFromExporterField,
+    ExportRelatedField,
+    ExportIdentityField,
+    ImportsIdentityFromImporterField,
+    ImportRelatedField,
+    ImportIdentityField,
+    JSONDictField,
+    JSONListField,
+    LatestVersionField,
+    PgpKeyFingerprintField,
+    PulpLabelsField,
+    SingleContentArtifactField,
+    RepositoryVersionsIdentityFromRepositoryField,
+    RepositoryVersionRelatedField,
+    RepositoryVersionIdentityField,
+    relative_path_validator,
+    TaskGroupStatusCountField,
+    pulp_labels_validator,
+)
+from .access_policy import AccessPolicySerializer
+from .acs import (
+    AlternateContentSourcePathSerializer,
+    AlternateContentSourceSerializer,
+)
 from .content import (
     ArtifactSerializer,
     ContentChecksumSerializer,
@@ -35,36 +58,15 @@
     SigningServiceSerializer,
     SingleArtifactContentSerializer,
 )
-from .domain import DomainBackendMigratorSerializer, DomainSerializer
+from .domain import DomainSerializer, DomainBackendMigratorSerializer
 from .exporter import (
     ExporterSerializer,
     ExportSerializer,
-    FilesystemExporterSerializer,
     FilesystemExportSerializer,
+    FilesystemExporterSerializer,
     PulpExporterSerializer,
     PulpExportSerializer,
 )
-from .fields import (
-    BaseURLField,
-    ExportIdentityField,
-    ExportRelatedField,
-    ExportsIdentityFromExporterField,
-    ImportIdentityField,
-    ImportRelatedField,
-    ImportsIdentityFromImporterField,
-    JSONDictField,
-    JSONListField,
-    LatestVersionField,
-    PgpKeyFingerprintField,
-    PulpLabelsField,
-    RepositoryVersionIdentityField,
-    RepositoryVersionRelatedField,
-    RepositoryVersionsIdentityFromRepositoryField,
-    SingleContentArtifactField,
-    TaskGroupStatusCountField,
-    pulp_labels_validator,
-    relative_path_validator,
-)
 from .importer import (
     EvaluationSerializer,
     ImporterSerializer,
@@ -74,49 +76,43 @@
     PulpImporterSerializer,
     PulpImportSerializer,
 )
-from .openpgp import (
-    OpenPGPDistributionSerializer,
-    OpenPGPKeyringSerializer,
-    OpenPGPPublicKeySerializer,
-)
 from .orphans import OrphansCleanupSerializer
 from .progress import GroupProgressReportSerializer, ProgressReportSerializer
 from .publication import (
-    ArtifactDistributionSerializer,
-    CompositeContentGuardSerializer,
     ContentGuardSerializer,
-    ContentRedirectContentGuardSerializer,
     DistributionSerializer,
-    HeaderContentGuardSerializer,
     PublicationSerializer,
-    RBACContentGuardPermissionSerializer,
     RBACContentGuardSerializer,
+    RBACContentGuardPermissionSerializer,
+    CompositeContentGuardSerializer,
+    ContentRedirectContentGuardSerializer,
+    HeaderContentGuardSerializer,
+    ArtifactDistributionSerializer,
 )
 from .purge import PurgeSerializer
-from .reclaim import ReclaimSpaceSerializer
-from .repair import DataRepair7272Serializer, DataRepair7465Serializer, RepairSerializer
-from .replica import UpstreamPulpSerializer
 from .repository import (
     GenericRemoteSerializer,
     RemoteSerializer,
-    RepositoryAddRemoveContentSerializer,
     RepositorySerializer,
     RepositorySyncURLSerializer,
+    RepositoryAddRemoveContentSerializer,
     RepositoryVersionSerializer,
 )
+from .repair import RepairSerializer, DataRepair7272Serializer, DataRepair7465Serializer
+from .reclaim import ReclaimSpaceSerializer
 from .task import (
     MinimalTaskSerializer,
     TaskCancelSerializer,
-    TaskGroupSerializer,
     TaskScheduleSerializer,
     TaskSerializer,
+    TaskGroupSerializer,
     WorkerSerializer,
 )
 from .upload import (
     UploadChunkSerializer,
     UploadCommitSerializer,
-    UploadDetailSerializer,
     UploadSerializer,
+    UploadDetailSerializer,
 )
 from .user import (
     GroupRoleSerializer,
@@ -129,4 +125,10 @@
     UserRoleSerializer,
     UserSerializer,
 )
+from .replica import UpstreamPulpSerializer
 from .vulnerability_report import VulnerabilityReportSerializer
+from .openpgp import (
+    OpenPGPDistributionSerializer,
+    OpenPGPKeyringSerializer,
+    OpenPGPPublicKeySerializer,
+)

pulpcore/app/serializers/domain.py

@@ -418,7 +418,7 @@ def _validate_storage_backend(storage_class, storage_settings):
         except ImproperlyConfigured as e:
             raise serializers.ValidationError(
                 detail={
-                    "storage_settings": _("Backend settings contain incorrect values: {}".format(e))
+                    "storage_settings": _("Backend settings contain incorrect values: {}").format(e)
                 }
             )
 

pulpcore/app/tasks/__init__.py

@@ -1,20 +1,33 @@
+# ruff: noqa: F401
+# isort: skip_file
 from pulpcore.app.tasks import base, repository, upload
 
-from .analytics import post_analytics
 from .base import (
     ageneral_update,
     general_create,
     general_create_from_temp_file,
     general_delete,
     general_multi_delete,
 )
-from .datarepair import repair_7272
+
 from .export import fs_publication_export, fs_repo_version_export
+
 from .importer import pulp_import
+
 from .migrate import migrate_backend
+
 from .orphan import orphan_cleanup
+
 from .purge import purge
+
 from .reclaim_space import reclaim_space
+
 from .replica import replicate_distributions
+
 from .repository import repair_all_artifacts
+
+from .analytics import post_analytics
+
 from .vulnerability_report import check_content
+
+from .datarepair import repair_7272

pulpcore/app/tasks/importer.py

@@ -164,10 +164,8 @@ def validate_chunks(self):
                 missing_files.append(chunk_path)
         if missing_files:
             raise ValidationError(
-                _(
-                    "Missing import-chunks named in table-of-contents: {}.".format(
-                        str(missing_files)
-                    )
+                _("Missing import-chunks named in table-of-contents: {}.").format(
+                    str(missing_files)
                 )
             )
 

pulpcore/app/tasks/purge.py

@@ -48,7 +48,7 @@ def _details_reporting(current_reports, current_details, totals_pb):
             current_reports[key].increase_by(curr_detail)
         else:
             pb = ProgressReport(
-                message=_("Purged task-objects of type {}".format(key)),
+                message=_("Purged task-objects of type {}").format(key),
                 code="purge.tasks.key.{}".format(key),
                 total=None,
                 done=curr_detail,
@@ -127,7 +127,7 @@ def purge(finished_before=None, states=None, **kwargs):
     expected_total = candidate_qs.count()
     # Build and save a progress-report for that detail
     pb = ProgressReport(
-        message=_("Purged task-objects of type {}".format(TASK_KEY)),
+        message=_("Purged task-objects of type {}").format(TASK_KEY),
         total=expected_total,
         code="purge.tasks.key.{}".format(TASK_KEY),
         done=0,

pulpcore/app/views/__init__.py

@@ -1,5 +1,7 @@
+# ruff: noqa: F401
+# isort: skip_file
 from .datarepair import DataRepair7272View, DataRepair7465View
-from .importer import PulpImporterImportCheckView
 from .orphans import OrphansView
-from .repair import RepairView
 from .status import LivezView, StatusView
+from .repair import RepairView
+from .importer import PulpImporterImportCheckView