pulp-cli-deb 0.0.2__tar.gz → 0.0.5.dev0__tar.gz

{pulp-cli-deb-0.0.2 → pulp-cli-deb-0.0.5.dev0}/PKG-INFO

@@ -1,10 +1,9 @@
 Metadata-Version: 2.1
 Name: pulp-cli-deb
-Version: 0.0.2
+Version: 0.0.5.dev0
 Summary: Command line interface to talk to pulpcore's REST API. (Debian plugin commands)
-Home-page: UNKNOWN
+Home-page: https://github.com/pulp/pulp-cli-deb
 License: GPLv2+
-Platform: UNKNOWN
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: Intended Audience :: System Administrators
@@ -14,6 +13,3 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: System :: Software Distribution
 Classifier: Typing :: Typed
 Requires-Python: >=3.6
-
-UNKNOWN
-

{pulp-cli-deb-0.0.2 → pulp-cli-deb-0.0.5.dev0}/pulp_cli_deb.egg-info/PKG-INFO

@@ -1,10 +1,9 @@
 Metadata-Version: 2.1
 Name: pulp-cli-deb
-Version: 0.0.2
+Version: 0.0.5.dev0
 Summary: Command line interface to talk to pulpcore's REST API. (Debian plugin commands)
-Home-page: UNKNOWN
+Home-page: https://github.com/pulp/pulp-cli-deb
 License: GPLv2+
-Platform: UNKNOWN
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: Intended Audience :: System Administrators
@@ -14,6 +13,3 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: System :: Software Distribution
 Classifier: Typing :: Typed
 Requires-Python: >=3.6
-
-UNKNOWN
-

{pulp-cli-deb-0.0.2 → pulp-cli-deb-0.0.5.dev0}/pulp_cli_deb.egg-info/SOURCES.txt

@@ -12,4 +12,5 @@ pulpcore/cli/deb/distribution.py
 pulpcore/cli/deb/publication.py
 pulpcore/cli/deb/py.typed
 pulpcore/cli/deb/remote.py
-pulpcore/cli/deb/repository.py
+pulpcore/cli/deb/repository.py
+pulpcore/cli/deb/locale/de/LC_MESSAGES/messages.mo

{pulp-cli-deb-0.0.2 → pulp-cli-deb-0.0.5.dev0}/pulp_cli_deb.egg-info/entry_points.txt

@@ -1,3 +1,2 @@
 [pulp_cli.plugins]
 deb = pulpcore.cli.deb
-

pulp-cli-deb-0.0.5.dev0/pulp_cli_deb.egg-info/requires.txt

@@ -0,0 +1 @@
+pulp-cli>=0.15.0

{pulp-cli-deb-0.0.2 → pulp-cli-deb-0.0.5.dev0}/pulpcore/cli/deb/__init__.py

@@ -1,5 +1,6 @@
 from pulpcore.cli.common import main
-from pulpcore.cli.common.context import PluginRequirement, PulpContext, pass_pulp_context
+from pulpcore.cli.common.context import PluginRequirement
+from pulpcore.cli.common.generic import PulpCLIContext, pass_pulp_context
 
 from pulpcore.cli.deb.distribution import distribution
 from pulpcore.cli.deb.publication import publication
@@ -9,7 +10,7 @@ from pulpcore.cli.deb.repository import repository
 
 @main.group()
 @pass_pulp_context
-def deb(pulp_ctx: PulpContext) -> None:
+def deb(pulp_ctx: PulpCLIContext) -> None:
     pulp_ctx.needs_plugin(PluginRequirement("deb"))
 
 

{pulp-cli-deb-0.0.2 → pulp-cli-deb-0.0.5.dev0}/pulpcore/cli/deb/context.py

@@ -1,37 +1,32 @@
-import gettext
 from typing import ClassVar, Set
 
 import click
 from pulpcore.cli.common.context import (
     EntityDefinition,
     PulpEntityContext,
+    PulpException,
     PulpRepositoryContext,
     PulpRepositoryVersionContext,
     registered_repository_contexts,
 )
+from pulpcore.cli.common.i18n import get_translation
 
-_ = gettext.gettext
+translation = get_translation(__name__)
+_ = translation.gettext
 
 
 class PulpAptDistributionContext(PulpEntityContext):
     ENTITY = _("apt distribution")
     ENTITIES = _("apt distributions")
     HREF = "deb_apt_distribution_href"
-    LIST_ID = "distributions_deb_apt_list"
-    READ_ID = "distributions_deb_apt_read"
-    CREATE_ID = "distributions_deb_apt_create"
-    UPDATE_ID = "distributions_deb_apt_partial_update"
-    DELETE_ID = "distributions_deb_apt_delete"
+    ID_PREFIX = "distributions_deb_apt"
 
 
 class PulpAptPublicationContext(PulpEntityContext):
     ENTITY = _("apt publication")
     ENTITIES = _("apt publications")
     HREF = "deb_apt_publication_href"
-    LIST_ID = "publications_deb_apt_list"
-    READ_ID = "publications_deb_apt_read"
-    CREATE_ID = "publications_deb_apt_create"
-    DELETE_ID = "publications_deb_apt_delete"
+    ID_PREFIX = "publications_deb_apt"
 
     def preprocess_body(self, body: EntityDefinition) -> EntityDefinition:
         body = super().preprocess_body(body)
@@ -46,10 +41,7 @@ class PulpVerbatimPublicationContext(PulpEntityContext):
     ENTITY = _("verbatim publication")
     ENTITIES = _("verbatim publications")
     HREF = "deb_verbatim_publication_href"
-    LIST_ID = "publications_deb_verbatim_list"
-    READ_ID = "publications_deb_verbatim_read"
-    CREATE_ID = "publications_deb_verbatim_create"
-    DELETE_ID = "publications_deb_verbatim_delete"
+    ID_PREFIX = "publications_deb_verbatim"
     APT_ONLY: ClassVar[Set[str]] = {"simple", "structured", "signing_service"}
 
     def preprocess_body(self, body: EntityDefinition) -> EntityDefinition:
@@ -70,11 +62,7 @@ class PulpAptRemoteContext(PulpEntityContext):
     ENTITY = _("apt remote")
     ENTITIES = _("apt remotes")
     HREF = "deb_apt_remote_href"
-    LIST_ID = "remotes_deb_apt_list"
-    READ_ID = "remotes_deb_apt_read"
-    CREATE_ID = "remotes_deb_apt_create"
-    UPDATE_ID = "remotes_deb_apt_partial_update"
-    DELETE_ID = "remotes_deb_apt_delete"
+    ID_PREFIX = "remotes_deb_apt"
     NULLABLES = {"architectures", "components"}
 
     @staticmethod
@@ -87,13 +75,15 @@ class PulpAptRemoteContext(PulpEntityContext):
         If body[field_name] does not contain a tuple, the behaviour is undefined.
         """
         field = body.pop(field_name, None)
-        if field is not None and field != ():
+        if field:
             string_field = " ".join(field).strip()
             body[field_name] = string_field if string_field else None
 
     def preprocess_body(self, body: EntityDefinition) -> EntityDefinition:
         body = super().preprocess_body(body)
         self.tuple_to_whitespace_separated_string("distributions", body)
+        if "distributions" in body and body["distributions"] is None:
+            raise PulpException("Must have at least one distribution for remote.")
         self.tuple_to_whitespace_separated_string("components", body)
         self.tuple_to_whitespace_separated_string("architectures", body)
         return body
@@ -102,19 +92,14 @@ class PulpAptRemoteContext(PulpEntityContext):
 class PulpAptRepositoryVersionContext(PulpRepositoryVersionContext):
     HREF = "deb_apt_repository_version_href"
     REPOSITORY_HREF = "deb_apt_repository_href"
-    LIST_ID = "repositories_deb_apt_versions_list"
-    READ_ID = "repositories_deb_apt_versions_read"
-    DELETE_ID = "repositories_deb_apt_versions_delete"
+    ID_PREFIX = "repositories_deb_apt_versions"
 
 
 class PulpAptRepositoryContext(PulpRepositoryContext):
+    ENTITY = _("apt repository")
+    ENTITIES = _("apt repositories")
     HREF = "deb_apt_repository_href"
-    LIST_ID = "repositories_deb_apt_list"
-    READ_ID = "repositories_deb_apt_read"
-    CREATE_ID = "repositories_deb_apt_create"
-    UPDATE_ID = "repositories_deb_apt_partial_update"
-    DELETE_ID = "repositories_deb_apt_delete"
-    SYNC_ID = "repositories_deb_apt_sync"
+    ID_PREFIX = "repositories_deb_apt"
     VERSION_CONTEXT = PulpAptRepositoryVersionContext
 
 

{pulp-cli-deb-0.0.2 → pulp-cli-deb-0.0.5.dev0}/pulpcore/cli/deb/distribution.py

@@ -1,8 +1,8 @@
 import gettext
 
 import click
-from pulpcore.cli.common.context import PulpContext, pass_pulp_context
 from pulpcore.cli.common.generic import (
+    PulpCLIContext,
     base_path_contains_option,
     base_path_option,
     create_command,
@@ -12,6 +12,7 @@ from pulpcore.cli.common.generic import (
     label_select_option,
     list_command,
     name_option,
+    pass_pulp_context,
     resource_option,
     show_command,
     update_command,
@@ -44,7 +45,7 @@ repository_option = resource_option(
 )
 @pass_pulp_context
 @click.pass_context
-def distribution(ctx: click.Context, pulp_ctx: PulpContext, distribution_type: str) -> None:
+def distribution(ctx: click.Context, pulp_ctx: PulpCLIContext, distribution_type: str) -> None:
     if distribution_type == "apt":
         ctx.obj = PulpAptDistributionContext(pulp_ctx)
     else:

{pulp-cli-deb-0.0.2 → pulp-cli-deb-0.0.5.dev0}/pulpcore/cli/deb/publication.py

@@ -1,12 +1,13 @@
 import gettext
 
 import click
-from pulpcore.cli.common.context import PulpContext, pass_pulp_context
 from pulpcore.cli.common.generic import (
+    PulpCLIContext,
     create_command,
     destroy_command,
     href_option,
     list_command,
+    pass_pulp_context,
     publication_filter_options,
     resource_option,
     show_command,
@@ -40,7 +41,7 @@ repository_option = resource_option(
 )
 @pass_pulp_context
 @click.pass_context
-def publication(ctx: click.Context, pulp_ctx: PulpContext, publication_type: str) -> None:
+def publication(ctx: click.Context, pulp_ctx: PulpCLIContext, publication_type: str) -> None:
     if publication_type == "apt":
         ctx.obj = PulpAptPublicationContext(pulp_ctx)
     elif publication_type == "verbatim":
@@ -57,13 +58,13 @@ create_options = [
     ),
     click.option(
         "--simple",
-        type=bool,
+        is_flag=True,
         default=None,
         help=_("Apt only: Activate simple publishing mode"),
     ),
     click.option(
         "--structured",
-        type=bool,
+        is_flag=True,
         default=None,
         help=_("Apt only: Activate structured publishing mode"),
     ),

{pulp-cli-deb-0.0.2 → pulp-cli-deb-0.0.5.dev0}/pulpcore/cli/deb/remote.py

@@ -1,8 +1,6 @@
-import gettext
-
 import click
-from pulpcore.cli.common.context import PulpContext, pass_pulp_context
 from pulpcore.cli.common.generic import (
+    PulpCLIContext,
     common_remote_create_options,
     common_remote_update_options,
     create_command,
@@ -12,13 +10,16 @@ from pulpcore.cli.common.generic import (
     label_select_option,
     list_command,
     name_option,
+    pass_pulp_context,
     show_command,
     update_command,
 )
+from pulpcore.cli.common.i18n import get_translation
 
 from pulpcore.cli.deb.context import PulpAptRemoteContext
 
-_ = gettext.gettext
+translation = get_translation(__name__)
+_ = translation.gettext
 
 
 @click.group()
@@ -31,7 +32,7 @@ _ = gettext.gettext
 )
 @pass_pulp_context
 @click.pass_context
-def remote(ctx: click.Context, pulp_ctx: PulpContext, remote_type: str) -> None:
+def remote(ctx: click.Context, pulp_ctx: PulpCLIContext, remote_type: str) -> None:
     if remote_type == "apt":
         ctx.obj = PulpAptRemoteContext(pulp_ctx)
     else:

{pulp-cli-deb-0.0.2 → pulp-cli-deb-0.0.5.dev0}/pulpcore/cli/deb/repository.py

@@ -1,17 +1,14 @@
-import gettext
 from typing import Any, Dict, Optional
 
 import click
 from pulpcore.cli.common.context import (
     EntityFieldDefinition,
     PluginRequirement,
-    PulpContext,
     PulpEntityContext,
     PulpRepositoryContext,
-    pass_pulp_context,
-    pass_repository_context,
 )
 from pulpcore.cli.common.generic import (
+    PulpCLIContext,
     create_command,
     destroy_command,
     href_option,
@@ -19,6 +16,9 @@ from pulpcore.cli.common.generic import (
     label_select_option,
     list_command,
     name_option,
+    pass_pulp_context,
+    pass_repository_context,
+    pulp_option,
     repository_href_option,
     repository_option,
     resource_option,
@@ -27,11 +27,13 @@ from pulpcore.cli.common.generic import (
     update_command,
     version_command,
 )
+from pulpcore.cli.common.i18n import get_translation
 from pulpcore.cli.core.generic import task_command
 
 from pulpcore.cli.deb.context import PulpAptRemoteContext, PulpAptRepositoryContext
 
-_ = gettext.gettext
+translation = get_translation(__name__)
+_ = translation.gettext
 
 
 remote_option = resource_option(
@@ -53,7 +55,7 @@ remote_option = resource_option(
 )
 @pass_pulp_context
 @click.pass_context
-def repository(ctx: click.Context, pulp_ctx: PulpContext, repo_type: str) -> None:
+def repository(ctx: click.Context, pulp_ctx: PulpCLIContext, repo_type: str) -> None:
     if repo_type == "apt":
         ctx.obj = PulpAptRepositoryContext(pulp_ctx)
     else:
@@ -88,12 +90,30 @@ repository.add_command(label_command(decorators=nested_lookup_options))
 @name_option
 @href_option
 @remote_option
-@click.option("--mirror/--no-mirror", default=None)
+@click.option(
+    "--mirror/--no-mirror",
+    default=None,
+    help=(
+        "Using mirror mode, will remove all content that is not present in the remote repository "
+        "during sync. When disabled, the sync is purely additive."
+    ),
+)
+@pulp_option(
+    "--optimize/--no-optimize",
+    default=None,
+    help=(
+        "Using optimize sync, will skip the processing of metadata if the checksum has not changed "
+        "since the last sync. This greately improves re-sync performance in such cases. Disable if "
+        "the sync result does not match expectations."
+    ),
+    needs_plugins=[PluginRequirement("deb", min="2.20.0.dev")],
+)
 @pass_repository_context
 def sync(
     repository_ctx: PulpRepositoryContext,
     remote: EntityFieldDefinition,
     mirror: Optional[bool],
+    optimize: Optional[bool],
 ) -> None:
     repository = repository_ctx.entity
     repository_href = repository_ctx.pulp_href
@@ -103,6 +123,9 @@ def sync(
     if mirror is not None:
         body["mirror"] = mirror
 
+    if optimize is not None:
+        body["optimize"] = optimize
+
     if isinstance(remote, PulpEntityContext):
         body["remote"] = remote.pulp_href
     elif repository["remote"] is None:

pulp-cli-deb-0.0.5.dev0/pyproject.toml

@@ -0,0 +1,71 @@
+[tool.towncrier]
+package = "pulpcore.cli.deb"
+filename = "CHANGES.md"
+directory = "CHANGES/"
+title_format = "## {version} ({project_date})"
+template = "CHANGES/.TEMPLATE.md"
+issue_format = "[#{issue}](https://github.com/pulp/pulp-cli-deb/issues/{issue})"
+start_string = "[//]: # (towncrier release notes start)\n"
+
+[[tool.towncrier.type]]
+directory = "feature"
+name = "Features"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "bugfix"
+name = "Bugfixes"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "doc"
+name = "Improved Documentation"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "removal"
+name = "Deprecations and Removals"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "translation"
+name = "Translations"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "devel"
+name = "Developer Notes"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "misc"
+name = "Misc"
+showcontent = false
+
+[tool.black]
+line-length = 100
+
+[tool.isort]
+profile = "black"
+line_length = 100
+
+[tool.pytest.ini_options]
+markers = [
+  "script: tests provided as shell scripts",
+  "help_page: tests that render help pages",
+  "pulp_deb: pulp_deb tests",
+]
+
+[tool.mypy]
+strict = true
+show_error_codes = true
+files = "pulpcore/**/*.py"
+namespace_packages = true
+explicit_package_bases = true
+
+[[tool.mypy.overrides]]
+module = [
+  "click_shell.*",
+  "schema.*",
+]
+ignore_missing_imports = true

{pulp-cli-deb-0.0.2 → pulp-cli-deb-0.0.5.dev0}/setup.py

@@ -3,7 +3,9 @@ from setuptools import setup
 try:
     from setuptools import find_namespace_packages
 
-    plugin_packages = find_namespace_packages(include=["pulpcore.cli.*"])
+    plugin_packages = find_namespace_packages(
+        include=["pulpcore.cli.*"], exclude=["pulpcore.cli.*.*"]
+    )
 
 except ImportError:
     # Old versions of setuptools do not provide `find_namespace_packages`
@@ -19,12 +21,13 @@ plugin_entry_points = [(package.rsplit(".", 1)[-1], package) for package in plug
 setup(
     name="pulp-cli-deb",
     description="Command line interface to talk to pulpcore's REST API. (Debian plugin commands)",
-    version="0.0.2",
+    url="https://github.com/pulp/pulp-cli-deb",
+    version="0.0.5.dev",
     packages=plugin_packages,
-    package_data={package: ["py.typed"] for package in plugin_packages},
+    package_data={"": ["py.typed", "locale/*/LC_MESSAGES/*.mo"]},
     python_requires=">=3.6",
     install_requires=[
-        "pulp-cli>=0.12.0",
+        "pulp-cli>=0.15.0",
     ],
     entry_points={
         "pulp_cli.plugins": [f"{name}={module}" for name, module in plugin_entry_points],

pulp-cli-deb-0.0.2/pulp_cli_deb.egg-info/requires.txt

@@ -1 +0,0 @@
-pulp-cli>=0.12.0

pulp-cli-deb-0.0.2/pyproject.toml

@@ -1,37 +0,0 @@
-[tool.towncrier]
-package = "pulpcore.cli.deb"
-filename = "CHANGES.md"
-directory = "CHANGES/"
-title_format = "## {version} ({project_date})"
-template = "CHANGES/.TEMPLATE.md"
-issue_format = "[#{issue}](https://github.com/pulp/pulp-cli-deb/issues/{issue})"
-start_string = "[//]: # (towncrier release notes start)\n"
-
-[tool.black]
-line-length = 100
-
-[tool.isort]
-profile = "black"
-line_length = 100
-
-[tool.pytest.ini_options]
-markers = [
-  "script: Marks tests provided as shell scripts",
-  "pulp_deb: pulp_deb tests",
-]
-
-[tool.mypy]
-strict = true
-show_error_codes = true
-files = "pulpcore/**/*.py"
-namespace_packages = true
-explicit_package_bases = true
-
-[[tool.mypy.overrides]]
-module = [
-  "urllib3.*",
-  "pygments.*",
-  "click_shell.*",
-  "schema.*",
-]
-ignore_missing_imports = true