diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2017-07-23 13:51:49 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2017-07-23 13:51:49 -0400 |
| commit | 3e6409381946eba193533c9a9a968af9be1231f2 (patch) | |
| tree | a6aba9bba3e1929dc73880f42fb4aa367ae0f19d /setuptools/dist.py | |
| parent | 4d0b492a7958292ed7df0a28b07198a79033e77e (diff) | |
| download | external_python_setuptools-3e6409381946eba193533c9a9a968af9be1231f2.tar.gz external_python_setuptools-3e6409381946eba193533c9a9a968af9be1231f2.tar.bz2 external_python_setuptools-3e6409381946eba193533c9a9a968af9be1231f2.zip | |
Consolidate assignment of extras to the key in extras requirements.
Diffstat (limited to 'setuptools/dist.py')
| -rw-r--r-- | setuptools/dist.py | 8 |
1 files changed, 3 insertions, 5 deletions
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): |