Adjust to typing improvements in click

fixes pulp#726

CHANGES/726.misc

@@ -0,0 +1 @@
+Adjusted to typing improvements in click>=8.1.4.

pulpcore/cli/ansible/content.py

@@ -1,4 +1,4 @@
-from typing import IO, Any, Callable, Optional, Union
+from typing import IO, Any, Callable, Optional
 
 import click
 from pulp_glue.ansible.context import (
@@ -218,7 +218,9 @@ def content(ctx: click.Context, pulp_ctx: PulpCLIContext, content_type: str) ->
 content.add_command(show_command(decorators=lookup_options))
 
 
-@content.command()
+# This is a mypy bug getting confused with positional args
+# https://github.com/python/mypy/issues/15037
+@content.command()  # type: ignore [arg-type]
 @click.option("--file", type=click.File("rb"), required=True)
 @repository_option
 @pulp_option(
@@ -253,11 +255,7 @@ def content(ctx: click.Context, pulp_ctx: PulpCLIContext, content_type: str) ->
 @pass_pulp_context
 def upload(
     pulp_ctx: PulpCLIContext,
-    content_ctx: Union[
-        PulpAnsibleRoleContext,
-        PulpAnsibleCollectionVersionContext,
-        PulpAnsibleCollectionVersionSignatureContext,
-    ],
+    content_ctx: PulpEntityContext,
     file: IO[bytes],
     **kwargs: Any,
 ) -> None:

pulpcore/cli/ansible/distribution.py

@@ -7,6 +7,7 @@
     EntityFieldDefinition,
     PluginRequirement,
     PulpContext,
+    PulpEntityContext,
 )
 from pulp_glue.common.i18n import get_translation
 
@@ -104,7 +105,7 @@ def distribution(ctx: click.Context, pulp_ctx: PulpContext, distribution_type: s
 @pulp_labels_option
 @pass_entity_context
 def update(
-    distribution_ctx: PulpAnsibleDistributionContext,
+    distribution_ctx: PulpEntityContext,
     base_path: Optional[str],
     repository: EntityFieldDefinition,
     content_guard: EntityFieldDefinition,
@@ -114,6 +115,8 @@ def update(
     """
     To remove repository or repository_version fields set --repository to ""
     """
+    assert isinstance(distribution_ctx, PulpAnsibleDistributionContext)
+
     dist_body: EntityDefinition = distribution_ctx.entity
     name: str = dist_body["name"]
     body: EntityDefinition = dict()

pulpcore/cli/common/config.py

@@ -143,7 +143,9 @@ def config() -> None:
     pass
 
 
-@config.command(help=_("Create a pulp-cli config settings file"))
+# This is a mypy bug getting confused with positional args
+# https://github.com/python/mypy/issues/15037
+@config.command(help=_("Create a pulp-cli config settings file"))  # type: ignore [arg-type]
 @config_options
 @click.option("--interactive", "-i", is_flag=True)
 @click.option("--editor", "-e", is_flag=True, help=_("Edit the config file in an editor"))