diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-03-21 14:44:34 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-03-21 14:44:34 -0400 |
| commit | bfe4e747bbe1a58459ab481b217bfad79839c01e (patch) | |
| tree | 356478aa72cfce895f7e7323170c4cb6ef7f5eef | |
| parent | e7f29530df7595a876e4995f2011784ac9f43086 (diff) | |
| parent | 1988125e800b3b64f9cf9311fea5525cc81546f9 (diff) | |
| download | python-setuptools-git-bfe4e747bbe1a58459ab481b217bfad79839c01e.tar.gz | |
Merge tag 'v44.1.0'
| -rw-r--r-- | .bumpversion.cfg | 1 | ||||
| -rw-r--r-- | CHANGES.rst | 8 | ||||
| -rw-r--r-- | setuptools/dist.py | 6 |
3 files changed, 11 insertions, 4 deletions
diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 5fabdff0..8f2ef1d8 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -4,4 +4,3 @@ commit = True tag = True [bumpversion:file:setup.cfg] - diff --git a/CHANGES.rst b/CHANGES.rst index 93c1f890..1e8da46e 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,11 @@ +v44.1.0 +------- + +* #1704: Set sys.argv[0] in setup script run by build_meta.__legacy__ +* #1959: Fix for Python 4: replace unsafe six.PY3 with six.PY2 +* #1994: Fixed a bug in the "setuptools.finalize_distribution_options" hook that lead to ignoring the order attribute of entry points managed by this hook. + + v46.0.0 ------- diff --git a/setuptools/dist.py b/setuptools/dist.py index a2f8ea0d..fe64afa9 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -708,13 +708,13 @@ class Distribution(_Distribution): to influence the order of execution. Smaller numbers go first and the default is 0. """ - hook_key = 'setuptools.finalize_distribution_options' + group = 'setuptools.finalize_distribution_options' def by_order(hook): return getattr(hook, 'order', 0) - eps = pkg_resources.iter_entry_points(hook_key) + eps = map(lambda e: e.load(), pkg_resources.iter_entry_points(group)) for ep in sorted(eps, key=by_order): - ep.load()(self) + ep(self) def _finalize_setup_keywords(self): for ep in pkg_resources.iter_entry_points('distutils.setup_keywords'): |
