From 3e6409381946eba193533c9a9a968af9be1231f2 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sun, 23 Jul 2017 13:51:49 -0400 Subject: Consolidate assignment of extras to the key in extras requirements. --- setuptools/dist.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'setuptools') diff --git a/setuptools/dist.py b/setuptools/dist.py index 602ba500..2b720b53 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -367,12 +367,10 @@ class Distribution(Distribution_parse_config_files, _Distribution): spec_ext_reqs = getattr(self, 'extras_require', None) or {} for k, v in spec_ext_reqs.items(): for r in pkg_resources.parse_requirements(v): - marker = r.marker - if marker: + if r.marker: + k += ':' + str(r.marker) r.marker = None - extras_require[k + ':' + str(marker)].append(r) - else: - extras_require[k].append(r) + extras_require[k].append(r) install_requires = [] spec_inst_reqs = getattr(self, 'install_requires', None) or () for r in pkg_resources.parse_requirements(spec_inst_reqs): -- cgit v1.2.3