Adjust positional only arguments for new mypy

Author: mdellweg

pulp_cli/config.py

@@ -218,6 +218,7 @@ def config() -> None:
 @click.pass_context
 def create(
     ctx: click.Context,
+    /,
     interactive: bool,
     editor: bool,
     overwrite: bool,

pulpcore/cli/ansible/content.py

@@ -17,7 +17,7 @@
     href_option,
     list_command,
     parse_size_callback,
-    pass_entity_context,
+    pass_content_context,
     pass_pulp_context,
     pulp_group,
     pulp_option,
@@ -68,7 +68,7 @@ def _content_callback(ctx: click.Context, param: click.Parameter, value: t.Any)
 )
 @pass_pulp_context
 @click.pass_context
-def content(ctx: click.Context, pulp_ctx: PulpCLIContext, content_type: str) -> None:
+def content(ctx: click.Context, pulp_ctx: PulpCLIContext, /, content_type: str) -> None:
     if content_type == "collection-version":
         ctx.obj = PulpAnsibleCollectionVersionContext(pulp_ctx)
     elif content_type == "role":
@@ -200,11 +200,12 @@ def content(ctx: click.Context, pulp_ctx: PulpCLIContext, content_type: str) ->
     allowed_with_contexts=signature_context,
     required=True,
 )
-@pass_entity_context
+@pass_content_context
 @pass_pulp_context
 def upload(
     pulp_ctx: PulpCLIContext,
     content_ctx: PulpContentContext,
+    /,
     file: t.IO[bytes],
     **kwargs: t.Any,
 ) -> None:

pulpcore/cli/ansible/distribution.py

@@ -52,7 +52,7 @@
 )
 @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: PulpContext, /, distribution_type: str) -> None:
     if distribution_type == "ansible":
         ctx.obj = PulpAnsibleDistributionContext(pulp_ctx)
     else:
@@ -106,6 +106,7 @@ def distribution(ctx: click.Context, pulp_ctx: PulpContext, distribution_type: s
 @pass_entity_context
 def update(
     distribution_ctx: PulpEntityContext,
+    /,
     base_path: t.Optional[str],
     repository: EntityFieldDefinition,
     content_guard: EntityFieldDefinition,

pulpcore/cli/ansible/remote.py

@@ -54,7 +54,7 @@ def yaml_callback(
 )
 @pass_pulp_context
 @click.pass_context
-def remote(ctx: click.Context, pulp_ctx: PulpCLIContext, remote_type: str) -> None:
+def remote(ctx: click.Context, pulp_ctx: PulpCLIContext, /, remote_type: str) -> None:
     if remote_type == "role":
         ctx.obj = PulpAnsibleRoleRemoteContext(pulp_ctx)
     elif remote_type == "collection":

pulpcore/cli/ansible/repository.py

@@ -95,7 +95,7 @@ def _signing_service_callback(ctx: click.Context, param: click.Parameter, value:
 )
 @pass_pulp_context
 @click.pass_context
-def repository(ctx: click.Context, pulp_ctx: PulpCLIContext, repo_type: str) -> None:
+def repository(ctx: click.Context, pulp_ctx: PulpCLIContext, /, repo_type: str) -> None:
     if repo_type == "ansible":
         ctx.obj = PulpAnsibleRepositoryContext(pulp_ctx)
     else:
@@ -197,6 +197,7 @@ def repository(ctx: click.Context, pulp_ctx: PulpCLIContext, repo_type: str) ->
 @pass_repository_context
 def sync(
     repository_ctx: PulpRepositoryContext,
+    /,
     remote: EntityFieldDefinition,
 ) -> None:
     """
@@ -230,6 +231,7 @@ def sync(
 @pass_repository_context
 def sign(
     repository_ctx: PulpRepositoryContext,
+    /,
     signing_service: PulpSigningServiceContext,
     content_units: t.Optional[t.List[str]],
 ) -> None:

pulpcore/cli/common/acs.py

@@ -53,7 +53,7 @@ def path() -> None:
     @acs_lookup_option
     @path_option
     @pass_acs_context
-    def add(acs_ctx: PulpACSContext, paths: t.Iterable[str]) -> None:
+    def add(acs_ctx: PulpACSContext, /, paths: t.Iterable[str]) -> None:
         """Add path(s) to an existing ACS."""
         paths = set(paths)
         existing_paths = set(acs_ctx.entity["paths"])
@@ -72,7 +72,7 @@ def add(acs_ctx: PulpACSContext, paths: t.Iterable[str]) -> None:
     @acs_lookup_option
     @path_option
     @pass_acs_context
-    def remove(acs_ctx: PulpACSContext, paths: t.Iterable[str]) -> None:
+    def remove(acs_ctx: PulpACSContext, /, paths: t.Iterable[str]) -> None:
         """Remove path(s) from an existing ACS."""
         paths = set(paths)
         existing_paths = set(acs_ctx.entity["paths"])
@@ -111,7 +111,7 @@ def remove(acs_ctx: PulpACSContext, paths: t.Iterable[str]) -> None:
     @name_option
     @pass_acs_context
     @pass_pulp_context
-    def refresh(pulp_ctx: PulpCLIContext, acs_ctx: PulpACSContext) -> None:
+    def refresh(pulp_ctx: PulpCLIContext, acs_ctx: PulpACSContext, /) -> None:
         acs_ctx.refresh()
 
     return acs

pulpcore/cli/common/debug.py

@@ -36,10 +36,7 @@ def debug() -> None:
     @debug.command()
     @pass_pulp_context
     @click.pass_context
-    def ipython(
-        ctx: click.Context,
-        pulp_ctx: PulpCLIContext,
-    ) -> None:
+    def ipython(ctx: click.Context, pulp_ctx: PulpCLIContext, /) -> None:
         """
         Drop into an interactive python shell.
         Prepopulated symbols:
@@ -68,6 +65,7 @@ def ipython(
 def has_cli_plugin(
     ctx: click.Context,
     pulp_ctx: PulpCLIContext,
+    /,
     name: str,
     specifier: t.Optional[str],
 ) -> None:
@@ -99,6 +97,7 @@ def has_cli_plugin(
 def has_plugin(
     ctx: click.Context,
     pulp_ctx: PulpCLIContext,
+    /,
     name: str,
     specifier: t.Optional[str],
 ) -> None:
@@ -117,7 +116,7 @@ def openapi_group() -> None:
 
 @openapi_group.command()
 @pass_pulp_context
-def spec(pulp_ctx: PulpCLIContext) -> None:
+def spec(pulp_ctx: PulpCLIContext, /) -> None:
     """
     Print the openapi schema of the server.
     """
@@ -126,7 +125,7 @@ def spec(pulp_ctx: PulpCLIContext) -> None:
 
 @openapi_group.command()
 @pass_pulp_context
-def info(pulp_ctx: PulpCLIContext) -> None:
+def info(pulp_ctx: PulpCLIContext, /) -> None:
     """
     Print info block.
     """
@@ -135,7 +134,7 @@ def info(pulp_ctx: PulpCLIContext) -> None:
 
 @openapi_group.command()
 @pass_pulp_context
-def security_schemes(pulp_ctx: PulpCLIContext) -> None:
+def security_schemes(pulp_ctx: PulpCLIContext, /) -> None:
     """
     Print info block.
     """
@@ -145,7 +144,7 @@ def security_schemes(pulp_ctx: PulpCLIContext) -> None:
 @openapi_group.command()
 @click.option("--id", "operation_id", required=True, help=_("Operation ID in openapi schema"))
 @pass_pulp_context
-def operation(pulp_ctx: PulpCLIContext, operation_id: str) -> None:
+def operation(pulp_ctx: PulpCLIContext, /, operation_id: str) -> None:
     """
     Print the spec of the operation.
     """
@@ -167,7 +166,7 @@ def operation(pulp_ctx: PulpCLIContext, operation_id: str) -> None:
 
 @openapi_group.command()
 @pass_pulp_context
-def operation_ids(pulp_ctx: PulpCLIContext) -> None:
+def operation_ids(pulp_ctx: PulpCLIContext, /) -> None:
     """
     Print a list of available operation-ids.
     """
@@ -182,6 +181,7 @@ def operation_ids(pulp_ctx: PulpCLIContext) -> None:
 @pass_pulp_context
 def call(
     pulp_ctx: PulpCLIContext,
+    /,
     operation_id: str,
     parameters: t.Iterable[str],
     body: t.Any,
@@ -208,7 +208,7 @@ def call(
     "--name", "schema_name", required=True, help=_("Component schema name in openapi schema")
 )
 @pass_pulp_context
-def schema(pulp_ctx: PulpCLIContext, schema_name: str) -> None:
+def schema(pulp_ctx: PulpCLIContext, /, schema_name: str) -> None:
     """
     Print the spec of the schema component.
     """
@@ -223,7 +223,7 @@ def schema(pulp_ctx: PulpCLIContext, schema_name: str) -> None:
 
 @openapi_group.command()
 @pass_pulp_context
-def schema_names(pulp_ctx: PulpCLIContext) -> None:
+def schema_names(pulp_ctx: PulpCLIContext, /) -> None:
     """
     Print a list of available schema component names.
     """

pulpcore/cli/common/generic.py

@@ -1310,6 +1310,7 @@ def list_command(**kwargs: t.Any) -> click.Command:
     def callback(
         pulp_ctx: PulpCLIContext,
         entity_ctx: PulpEntityContext,
+        /,
         limit: int,
         offset: int,
         **kwargs: t.Any,
@@ -1342,7 +1343,7 @@ def show_command(**kwargs: t.Any) -> click.Command:
     @pulp_command(**kwargs)
     @pass_entity_context
     @pass_pulp_context
-    def callback(pulp_ctx: PulpCLIContext, entity_ctx: PulpEntityContext) -> None:
+    def callback(pulp_ctx: PulpCLIContext, entity_ctx: PulpEntityContext, /) -> None:
         """
         Show details of a {entity}.
         """
@@ -1368,7 +1369,9 @@ def create_command(**kwargs: t.Any) -> click.Command:
     @pulp_command(**kwargs)  # type: ignore [arg-type]
     @pass_entity_context
     @pass_pulp_context
-    def callback(pulp_ctx: PulpCLIContext, entity_ctx: PulpEntityContext, **kwargs: t.Any) -> None:
+    def callback(
+        pulp_ctx: PulpCLIContext, entity_ctx: PulpEntityContext, /, **kwargs: t.Any
+    ) -> None:
         """
         Create a {entity}.
         """
@@ -1398,7 +1401,9 @@ def update_command(**kwargs: t.Any) -> click.Command:
     @pulp_command(**kwargs)  # type: ignore [arg-type]
     @pass_entity_context
     @pass_pulp_context
-    def callback(pulp_ctx: PulpCLIContext, entity_ctx: PulpEntityContext, **kwargs: t.Any) -> None:
+    def callback(
+        pulp_ctx: PulpCLIContext, entity_ctx: PulpEntityContext, /, **kwargs: t.Any
+    ) -> None:
         """
         Update a {entity}.
         """
@@ -1419,7 +1424,7 @@ def destroy_command(**kwargs: t.Any) -> click.Command:
 
     @pulp_command(**kwargs)
     @pass_entity_context
-    def callback(entity_ctx: PulpEntityContext) -> None:
+    def callback(entity_ctx: PulpEntityContext, /) -> None:
         """
         Destroy a {entity}.
         """
@@ -1447,10 +1452,7 @@ def version_command(**kwargs: t.Any) -> click.Command:
     @pulp_group(**kwargs)
     @pass_repository_context
     @click.pass_context
-    def callback(
-        ctx: click.Context,
-        repository_ctx: PulpRepositoryContext,
-    ) -> None:
+    def callback(ctx: click.Context, repository_ctx: PulpRepositoryContext, /) -> None:
         ctx.obj = repository_ctx.get_version_context()
 
     callback.add_command(list_command(decorators=decorators + [content_in_option]))
@@ -1467,6 +1469,7 @@ def callback(
         def repair(
             pulp_ctx: PulpCLIContext,
             repository_version_ctx: PulpRepositoryVersionContext,
+            /,
         ) -> None:
             result = repository_version_ctx.repair()
             pulp_ctx.output_result(result)
@@ -1488,29 +1491,29 @@ def label_command(**kwargs: t.Any) -> click.Command:
 
     @pulp_group(**kwargs)
     @pass_pulp_context
-    def label_group(pulp_ctx: PulpCLIContext) -> None:
+    def label_group(pulp_ctx: PulpCLIContext, /) -> None:
         for item in need_plugins:
             pulp_ctx.needs_plugin(item)
 
     @pulp_command(name="set", help=_("Add or update a label"))
     @click.option("--key", required=True, help=_("Key of the label"))
     @click.option("--value", required=True, help=_("Value of the label"))
     @pass_entity_context
-    def label_set(entity_ctx: PulpEntityContext, key: str, value: str) -> None:
+    def label_set(entity_ctx: PulpEntityContext, /, key: str, value: str) -> None:
         """Add or update a label"""
         entity_ctx.set_label(key, value)
 
     @pulp_command(name="unset", help=_("Remove a label with a given key"))
     @click.option("--key", required=True, help=_("Key of the label"))
     @pass_entity_context
-    def label_unset(entity_ctx: PulpEntityContext, key: str) -> None:
+    def label_unset(entity_ctx: PulpEntityContext, /, key: str) -> None:
         """Remove a label with a given key"""
         entity_ctx.unset_label(key)
 
     @pulp_command(name="show", help=_("Show the value for a particular label key"))
     @click.option("--key", required=True, help=_("Key of the label"))
     @pass_entity_context
-    def label_show(entity_ctx: PulpEntityContext, key: str) -> None:
+    def label_show(entity_ctx: PulpEntityContext, /, key: str) -> None:
         """Show the value for a particular label key"""
         click.echo(entity_ctx.show_label(key))
 
@@ -1541,14 +1544,14 @@ def role_group() -> None:
     @pulp_command(help=_("List my permissions on this object."))
     @pass_entity_context
     @pass_pulp_context
-    def my_permissions(pulp_ctx: PulpCLIContext, entity_ctx: PulpEntityContext) -> None:
+    def my_permissions(pulp_ctx: PulpCLIContext, entity_ctx: PulpEntityContext, /) -> None:
         result = entity_ctx.my_permissions()
         pulp_ctx.output_result(result)
 
     @pulp_command(name="list", help=_("List assigned object roles."))
     @pass_entity_context
     @pass_pulp_context
-    def role_list(pulp_ctx: PulpCLIContext, entity_ctx: PulpEntityContext) -> None:
+    def role_list(pulp_ctx: PulpCLIContext, entity_ctx: PulpEntityContext, /) -> None:
         result = entity_ctx.list_roles()
         pulp_ctx.output_result(result)
 
@@ -1561,6 +1564,7 @@ def role_list(pulp_ctx: PulpCLIContext, entity_ctx: PulpEntityContext) -> None:
     def role_add(
         pulp_ctx: PulpCLIContext,
         entity_ctx: PulpEntityContext,
+        /,
         role: str,
         users: t.List[str],
         groups: t.List[str],
@@ -1577,6 +1581,7 @@ def role_add(
     def role_remove(
         pulp_ctx: PulpCLIContext,
         entity_ctx: PulpEntityContext,
+        /,
         role: str,
         users: t.List[str],
         groups: t.List[str],
@@ -1617,6 +1622,7 @@ def version_callback(
     def content_list(
         content_ctx: PulpContentContext,
         pulp_ctx: PulpCLIContext,
+        /,
         version: PulpRepositoryVersionContext,
         offset: int,
         limit: int,
@@ -1635,6 +1641,7 @@ def content_list(
     @pass_content_context
     def content_add(
         content_ctx: PulpContentContext,
+        /,
         base_version: PulpRepositoryVersionContext,
     ) -> None:
         repo_ctx = base_version.repository_ctx
@@ -1647,6 +1654,7 @@ def content_add(
     @pass_content_context
     def content_remove(
         content_ctx: PulpContentContext,
+        /,
         base_version: PulpRepositoryVersionContext,
         all: bool,
     ) -> None:

pulpcore/cli/container/content.py

@@ -43,7 +43,7 @@ def _content_callback(ctx: click.Context, param: click.Parameter, value: t.Any)
 )
 @pass_pulp_context
 @click.pass_context
-def content(ctx: click.Context, pulp_ctx: PulpCLIContext, content_type: str) -> None:
+def content(ctx: click.Context, pulp_ctx: PulpCLIContext, /, content_type: str) -> None:
     if content_type == "manifest":
         ctx.obj = PulpContainerManifestContext(pulp_ctx)
     elif content_type == "tag":