Rename oidc -> trusted_publishing

pyproject.toml

@@ -62,7 +62,7 @@ register = "twine.commands.register:main"
 
 [project.optional-dependencies]
 keyring = ["keyring >= 15.1"]
-oidc = ["id"]
+trusted-publishing = ["id"]
 
 [project.scripts]
 twine = "twine.__main__:main"

twine/auth.py

@@ -32,11 +32,14 @@ def __init__(
 
 class Resolver:
     def __init__(
-        self, config: utils.RepositoryConfig, input: CredentialInput, oidc: bool = False
+        self,
+        config: utils.RepositoryConfig,
+        input: CredentialInput,
+        trusted_publishing: bool = False,
     ) -> None:
         self.config = config
         self.input = input
-        self.oidc = oidc
+        self.trusted_publishing = trusted_publishing
 
     @classmethod
     def choose(cls, interactive: bool) -> Type["Resolver"]:
@@ -59,7 +62,7 @@ def username(self) -> Optional[str]:
     @property
     @functools.lru_cache()
     def password(self) -> Optional[str]:
-        if self.oidc:
+        if self.trusted_publishing:
             # Trusted publishing (OpenID Connect): get one token from the CI
             # system, and exchange that for a PyPI token.
             from id import detect_credential  # type: ignore

twine/settings.py

@@ -129,7 +129,7 @@ def __init__(
         self.auth = auth.Resolver.choose(not non_interactive)(
             self.repository_config,
             auth.CredentialInput(username, password),
-            oidc=trusted_publish,
+            trusted_publishing=trusted_publish,
         )
 
     @property
@@ -231,7 +231,7 @@ def register_argparse_arguments(parser: argparse.ArgumentParser) -> None:
             action="store_true",
             help="Upload from CI using trusted publishing. Use this without "
             "specifying username & password. Requires an optional extra "
-            "dependency (install twine[oidc]).",
+            "dependency (install twine[trusted-publishing]).",
         )
         parser.add_argument(
             "--non-interactive",