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
1bbb027f
Commit
1bbb027f
authored
Jul 13, 2017
by
Jason R. Coombs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use filter and next to directly extract a single failure.
parent
dfe339ec
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
8 deletions
+12
-8
setuptools/dist.py
setuptools/dist.py
+12
-8
No files found.
setuptools/dist.py
View file @
1bbb027f
...
...
@@ -9,13 +9,14 @@ import distutils.core
import
distutils.cmd
import
distutils.dist
import
itertools
import
operator
from
collections
import
defaultdict
from
distutils.errors
import
(
DistutilsOptionError
,
DistutilsPlatformError
,
DistutilsSetupError
)
from
distutils.util
import
rfc822_escape
from
setuptools.extern
import
six
from
setuptools.extern.six.moves
import
map
from
setuptools.extern.six.moves
import
map
,
filter
from
pkg_resources.extern
import
packaging
__import__
(
'pkg_resources.extern.packaging.specifiers'
)
...
...
@@ -145,13 +146,16 @@ def _check_extra(extra, reqs):
if
marker
and
pkg_resources
.
invalid_marker
(
marker
):
raise
DistutilsSetupError
(
"Invalid environment marker: "
+
marker
)
for
r
in
pkg_resources
.
parse_requirements
(
reqs
):
if
r
.
marker
:
tmpl
=
(
"'extras_require' requirements cannot include "
"environment markers, in {section!r}: '{req!s}'"
)
raise
DistutilsSetupError
(
tmpl
.
format
(
section
=
name
,
req
=
r
))
# extras requirements cannot themselves have markers
parsed
=
pkg_resources
.
parse_requirements
(
reqs
)
marked_reqs
=
filter
(
operator
.
attrgetter
(
'marker'
),
parsed
)
bad_req
=
next
(
marked_reqs
,
None
)
if
bad_req
:
tmpl
=
(
"'extras_require' requirements cannot include "
"environment markers, in {name!r}: '{bad_req!s}'"
)
raise
DistutilsSetupError
(
tmpl
.
format
(
**
locals
()))
def
assert_bool
(
dist
,
attr
,
value
):
...
...
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