Make id a full dependency

Author: takluyver

pyproject.toml

@@ -42,6 +42,7 @@ dependencies = [
 	"rfc3986 >= 1.4.0",
 	"rich >= 12.0.0",
 	"packaging",
+	"id",
 ]
 dynamic = ["version"]
 
@@ -62,7 +63,6 @@ register = "twine.commands.register:main"
 
 [project.optional-dependencies]
 keyring = ["keyring >= 15.1"]
-trusted-publishing = ["id"]
 
 [project.scripts]
 twine = "twine.__main__:main"

twine/auth.py

@@ -5,6 +5,7 @@
 from urllib.parse import urlparse
 
 import requests
+from id import detect_credential  # type: ignore
 
 # keyring has an indirect dependency on PyCA cryptography, which has no
 # pre-built wheels for ppc64le and s390x, see #1158.
@@ -16,11 +17,6 @@
     except ModuleNotFoundError:  # pragma: no cover
         keyring = None
 
-try:
-    from id import detect_credential  # type: ignore
-except ModuleNotFoundError:  # pragma: no cover
-    detect_credential = None
-
 from twine import exceptions
 from twine import utils
 
@@ -69,7 +65,6 @@ def password(self) -> Optional[str]:
             self.is_pypi()
             and self.username == "__token__"
             and self.input.password is None
-            and detect_credential is not None
         ):
             logger.info(
                 "Trying to use trusted publishing (no token was explicitly provided)"