diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2021-09-06 12:03:38 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2021-09-06 12:07:25 -0400 |
| commit | 60413539ba0556b960d37a7979ca9f9a915581c2 (patch) | |
| tree | 8cf02c025a1cbbac8ee2906bdb6c8c192abfa907 /setuptools | |
| parent | 2a5fa490ddf541c0d25bade7bb5e8de3e6d6f981 (diff) | |
| download | python-setuptools-git-60413539ba0556b960d37a7979ca9f9a915581c2.tar.gz | |
Remove time-based horizon.
Diffstat (limited to 'setuptools')
| -rw-r--r-- | setuptools/dist.py | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/setuptools/dist.py b/setuptools/dist.py index f20ba912..02ebd635 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -5,7 +5,6 @@ import io import sys import re import os -import datetime import warnings import numbers import distutils.log @@ -819,30 +818,24 @@ class Distribution(_Distribution): return getattr(hook, 'order', 0) defined = pkg_resources.iter_entry_points(group) - filtered = self._suppress_removed_finalization_eps(defined) + filtered = itertools.filterfalse(self._removed, defined) loaded = map(lambda e: e.load(), filtered) for ep in sorted(loaded, key=by_order): ep(self) @staticmethod - def _suppress_removed_finalization_eps(defined): + def _removed(ep): """ When removing an entry point, if metadata is loaded from an older version of Setuptools, that removed entry point will attempt to be loaded and will fail. - See #2765 for more details. Remove these known - removed entry points for a year to limit the - disruption. + See #2765 for more details. """ removed = { - '2to3_doctests': datetime.date(2021, 9, 5), + # removed 2021-09-05 + '2to3_doctests', } - duration = datetime.timedelta(days=365) - today = datetime.date.today() - - def suppress(ep): - return ep.name in removed and today - removed[ep.name] < duration - return itertools.filterfalse(suppress, defined) + return ep.name in removed def _finalize_setup_keywords(self): for ep in pkg_resources.iter_entry_points('distutils.setup_keywords'): |
