From 00b48e97a5cc58613dd125aeb47c42c9a14871d0 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Sat, 26 Feb 2022 23:03:57 -0400 Subject: [PATCH] Explicitly select packages for User-Agent inclusion Revert back to a manual list of packages reported in the User-Agent string and --version. Reverting the part of #858 that switched to parsing twine's requires. See: #870 --- twine/cli.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/twine/cli.py b/twine/cli.py index d137e850..9aed13f8 100644 --- a/twine/cli.py +++ b/twine/cli.py @@ -20,7 +20,6 @@ import rich.highlighter import rich.logging import rich.theme -from packaging import requirements import twine @@ -71,8 +70,13 @@ def configure_output() -> None: def list_dependencies_and_versions() -> List[Tuple[str, str]]: - requires = importlib_metadata.requires("twine") # type: ignore[no-untyped-call] # python/importlib_metadata#288 # noqa: E501 - deps = [requirements.Requirement(r).name for r in requires] + deps = ( + "importlib-metadata", + "pkginfo", + "requests", + "requests-toolbelt", + "tqdm", + ) return [(dep, importlib_metadata.version(dep)) for dep in deps] # type: ignore[no-untyped-call] # python/importlib_metadata#288 # noqa: E501