Skip to content

Commit

Permalink
Prefer importlib_metadata for entrypoint parsing. (#728)
Browse files Browse the repository at this point in the history
* Prefer importlib_metadata for entrypoint parsing.

* Prefer dict comprehension for now.

* Workaround "implicit reexport disabled"

* Add changelog.

Co-authored-by: Brian Rutledge <brian@bhrutledge.com>
  • Loading branch information
jaraco and bhrutledge committed Feb 21, 2021
1 parent 5343855 commit 7e95990
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
1 change: 1 addition & 0 deletions changelog/728.feature.rst
@@ -0,0 +1 @@
Prefer importlib.metadata for entry point handling.
4 changes: 3 additions & 1 deletion twine/__init__.py
Expand Up @@ -29,7 +29,9 @@
if sys.version_info[:2] >= (3, 8):
from importlib import metadata as importlib_metadata
else:
import importlib_metadata
# Using `as` to workaround "implicit reexport disabled"
# https://mypy.readthedocs.io/en/stable/config_file.html#confval-implicit_reexport
import importlib_metadata as importlib_metadata


metadata = importlib_metadata.metadata("twine")
Expand Down
9 changes: 5 additions & 4 deletions twine/cli.py
Expand Up @@ -14,7 +14,6 @@
import argparse
from typing import Any, Dict, List, Tuple

import pkg_resources
import pkginfo
import requests
import requests_toolbelt
Expand All @@ -23,15 +22,17 @@

import twine
from twine import _installed
from twine import importlib_metadata

args = argparse.Namespace()


def _registered_commands(
group: str = "twine.registered_commands",
) -> Dict[str, pkg_resources.EntryPoint]:
registered_commands = pkg_resources.iter_entry_points(group=group)
return {c.name: c for c in registered_commands}
) -> Dict[str, importlib_metadata.EntryPoint]:
# todo: with python/importlib_metadata#278:
# return importlib_metadata.entry_points()[group]
return {ep.name: ep for ep in importlib_metadata.entry_points()[group]}


def list_dependencies_and_versions() -> List[Tuple[str, str]]:
Expand Down

0 comments on commit 7e95990

Please sign in to comment.