Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rely on 'selectable' interface for entry points. #2126

Merged
merged 11 commits into from
Jul 9, 2021
Merged

Rely on 'selectable' interface for entry points. #2126

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
65ea175
Rely on 'selectable' interface for entry points. Fixes #2093
jaraco May 29, 2021
3381339
For Python 3.5 and 2.7 compatibility, rely on backports.entry_points_…
jaraco May 29, 2021
62f1854
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 29, 2021
c050710
Lower pin the dependency to the current release.
jaraco May 29, 2021
5e37739
Merge branch 'bugfix/2093-new-api' of https://github.com/pypa/virtual…
jaraco May 29, 2021
f224121
Pass kwargs to entry_points
jaraco May 29, 2021
e294994
Correct usage to load all entry points into the cache and resolve tha…
jaraco May 29, 2021
ae4e131
Restore lower limit on importlib_metadata.
jaraco May 29, 2021
746c8ba
Add changelog.
jaraco May 29, 2021
4489451
Add comment indicating that backports.entry_points_selectable is only…
jaraco Jul 3, 2021
aad8790
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ install_requires =
distlib>=0.3.1,<1
filelock>=3.0.0,<4
six>=1.9.0,<2 # keep it >=1.9.0 as it may cause problems on LTS platforms
importlib-metadata>=0.12;python_version<"3.8"
importlib-metadata>=3.6;python_version<"3.10"
jaraco marked this conversation as resolved.
Show resolved Hide resolved
importlib-resources>=1.0;python_version<"3.7"
pathlib2>=2.3.3,<3;python_version < '3.4' and sys.platform != 'win32'
python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
Expand Down
4 changes: 2 additions & 2 deletions src/virtualenv/run/plugin/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import sys
from collections import OrderedDict

if sys.version_info >= (3, 8):
if sys.version_info >= (3, 10):
from importlib.metadata import entry_points
else:
from importlib_metadata import entry_points
Expand All @@ -15,7 +15,7 @@ class PluginLoader(object):

@classmethod
def entry_points_for(cls, key):
return OrderedDict((e.name, e.load()) for e in cls.entry_points().get(key, {}))
return OrderedDict((e.name, e.load()) for e in cls.entry_points(group=key))

@staticmethod
def entry_points():
Expand Down