Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
setuptools
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
setuptools
Commits
096f3287
Commit
096f3287
authored
Jul 27, 2017
by
Benoit Pierre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix requires handling when using setup.cfg
parent
28e2625c
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
201 additions
and
149 deletions
+201
-149
setuptools/dist.py
setuptools/dist.py
+5
-5
setuptools/tests/test_config.py
setuptools/tests/test_config.py
+3
-3
setuptools/tests/test_egg_info.py
setuptools/tests/test_egg_info.py
+193
-141
No files found.
setuptools/dist.py
View file @
096f3287
...
...
@@ -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"""
...
...
setuptools/tests/test_config.py
View file @
096f3287
...
...
@@ -333,7 +333,7 @@ class TestOptions:
])
assert
dist
.
install_requires
==
([
'docutils>=0.3'
,
'pack
==1.1,
==1.3'
,
'pack
==1.1,
==1.3'
,
'hey'
])
assert
dist
.
setup_requires
==
([
...
...
@@ -403,7 +403,7 @@ class TestOptions:
])
assert
dist
.
install_requires
==
([
'docutils>=0.3'
,
'pack
==1.1,
==1.3'
,
'pack
==1.1,
==1.3'
,
'hey'
])
assert
dist
.
setup_requires
==
([
...
...
@@ -508,7 +508,7 @@ class TestOptions:
with
get_dist
(
tmpdir
)
as
dist
:
assert
dist
.
extras_require
==
{
'pdf'
:
[
'ReportLab>=1.2'
,
'RXP'
],
'rest'
:
[
'docutils>=0.3'
,
'pack
==1.1,
==1.3'
]
'rest'
:
[
'docutils>=0.3'
,
'pack
==1.1,
==1.3'
]
}
def
test_entry_points
(
self
,
tmpdir
):
...
...
setuptools/tests/test_egg_info.py
View file @
096f3287
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment