diff options
author | Benoit Pierre <benoit.pierre@gmail.com> | 2017-07-27 01:45:54 +0200 |
---|---|---|
committer | Benoit Pierre <benoit.pierre@gmail.com> | 2017-08-02 00:06:13 +0200 |
commit | 096f3287314549ac423f1c1c443f8aefa0b64b4f (patch) | |
tree | 65d43cd6874815dddd32f89f932963702a21bf33 /setuptools/dist.py | |
parent | 28e2625c12f7115c8bcb8c101327328e5007592f (diff) | |
download | external_python_setuptools-096f3287314549ac423f1c1c443f8aefa0b64b4f.tar.gz external_python_setuptools-096f3287314549ac423f1c1c443f8aefa0b64b4f.tar.bz2 external_python_setuptools-096f3287314549ac423f1c1c443f8aefa0b64b4f.zip |
fix requires handling when using setup.cfg
Diffstat (limited to 'setuptools/dist.py')
-rw-r--r-- | setuptools/dist.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/setuptools/dist.py b/setuptools/dist.py index dfe700bd..21730f22 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -349,14 +349,15 @@ class Distribution(Distribution_parse_config_files, _Distribution): "setuptools, pip, and PyPI. Please see PEP 440 for more " "details." % self.metadata.version ) - if getattr(self, 'python_requires', None): - self.metadata.python_requires = self.python_requires self._finalize_requires() def _finalize_requires(self): """ - Fix environment markers in `install_requires` and `extras_require`. + Set `metadata.python_requires` and fix environment markers + in `install_requires` and `extras_require`. """ + if getattr(self, 'python_requires', None): + self.metadata.python_requires = self.python_requires self._convert_extras_requirements() self._move_install_requirements_markers() @@ -424,8 +425,7 @@ class Distribution(Distribution_parse_config_files, _Distribution): _Distribution.parse_config_files(self, filenames=filenames) parse_configuration(self, self.command_options) - if getattr(self, 'python_requires', None): - self.metadata.python_requires = self.python_requires + self._finalize_requires() def parse_command_line(self): """Process features after parsing command line options""" |