fixup! WIP: Split out pulp-glue-deb

pulp · Feb 7, 2024 · 2652176 · 2652176
1 parent a1c16ce
commit 2652176
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 33 deletions.
diff --git a/pulpcore/cli/deb/content.py b/pulpcore/cli/deb/content.py
@@ -4,6 +4,19 @@
 from pulp_glue.common.context import PulpEntityContext
 from pulp_glue.common.i18n import get_translation
 from pulp_glue.core.context import PulpArtifactContext
+from pulp_glue.deb.context import (
+    PulpAptRepositoryContext,
+    PulpDebGenericContentContext,
+    PulpDebInstallerFileIndexContext,
+    PulpDebInstallerPackageContext,
+    PulpDebPackageContext,
+    PulpDebPackageIndexContext,
+    PulpDebPackageReleaseComponentContext,
+    PulpDebReleaseArchitectureContext,
+    PulpDebReleaseComponentContext,
+    PulpDebReleaseContext,
+    PulpDebReleaseFileContext,
+)
 from pulpcore.cli.common.generic import (
     PulpCLIContext,
     chunk_size_option,
@@ -21,20 +34,6 @@
     type_option,
 )
 
-from pulp_glue.deb.context import (
-    PulpAptRepositoryContext,
-    PulpDebGenericContentContext,
-    PulpDebInstallerFileIndexContext,
-    PulpDebInstallerPackageContext,
-    PulpDebPackageContext,
-    PulpDebPackageIndexContext,
-    PulpDebPackageReleaseComponentContext,
-    PulpDebReleaseArchitectureContext,
-    PulpDebReleaseComponentContext,
-    PulpDebReleaseContext,
-    PulpDebReleaseFileContext,
-)
-
 translation = get_translation(__name__)
 _ = translation.gettext
 

diff --git a/pulpcore/cli/deb/distribution.py b/pulpcore/cli/deb/distribution.py
@@ -1,6 +1,7 @@
 import gettext
 
 import click
+from pulp_glue.deb.context import PulpAptDistributionContext, PulpAptRepositoryContext
 from pulpcore.cli.common.generic import (
     PulpCLIContext,
     base_path_contains_option,
@@ -18,8 +19,6 @@
     update_command,
 )
 
-from pulp_glue.deb.context import PulpAptDistributionContext, PulpAptRepositoryContext
-
 _ = gettext.gettext
 
 

diff --git a/pulpcore/cli/deb/publication.py b/pulpcore/cli/deb/publication.py
@@ -1,6 +1,12 @@
 import gettext
 
 import click
+from pulp_glue.core.context import PulpSigningServiceContext
+from pulp_glue.deb.context import (
+    PulpAptPublicationContext,
+    PulpAptRepositoryContext,
+    PulpVerbatimPublicationContext,
+)
 from pulpcore.cli.common.generic import (
     PulpCLIContext,
     create_command,
@@ -12,13 +18,6 @@
     resource_option,
     show_command,
 )
-from pulp_glue.core.context import PulpSigningServiceContext
-
-from pulp_glue.deb.context import (
-    PulpAptPublicationContext,
-    PulpAptRepositoryContext,
-    PulpVerbatimPublicationContext,
-)
 
 _ = gettext.gettext
 

diff --git a/pulpcore/cli/deb/remote.py b/pulpcore/cli/deb/remote.py
@@ -1,4 +1,6 @@
 import click
+from pulp_glue.common.i18n import get_translation
+from pulp_glue.deb.context import PulpAptRemoteContext
 from pulpcore.cli.common.generic import (
     PulpCLIContext,
     common_remote_create_options,
@@ -14,9 +16,6 @@
     show_command,
     update_command,
 )
-from pulp_glue.common.i18n import get_translation
-
-from pulp_glue.deb.context import PulpAptRemoteContext
 
 translation = get_translation(__name__)
 _ = translation.gettext

diff --git a/pulpcore/cli/deb/repository.py b/pulpcore/cli/deb/repository.py
@@ -9,6 +9,12 @@
     PulpEntityContext,
     PulpRepositoryContext,
 )
+from pulp_glue.common.i18n import get_translation
+from pulp_glue.deb.context import (
+    PulpAptRemoteContext,
+    PulpAptRepositoryContext,
+    PulpDebPackageContext,
+)
 from pulpcore.cli.common.generic import (
     PulpCLIContext,
     create_command,
@@ -31,15 +37,8 @@
     update_command,
     version_command,
 )
-from pulp_glue.common.i18n import get_translation
 from pulpcore.cli.core.generic import task_command
 
-from pulp_glue.deb.context import (
-    PulpAptRemoteContext,
-    PulpAptRepositoryContext,
-    PulpDebPackageContext,
-)
-
 translation = get_translation(__name__)
 _ = translation.gettext