Fix extras_require and environment markers in sdist #2153
Conversation
xavfernandez
force-pushed
the
xfernandez/extras_fix
branch
2 times, most recently
from
23a5e6d
to
0d150e3
Compare
xavfernandez
changed the title
xavfernandez
force-pushed
the
xfernandez/extras_fix
branch
from
0d150e3
to
daafc2a
Compare
|
Fixes issue #2174 |
xavfernandez
force-pushed
the
xfernandez/extras_fix
branch
from
daafc2a
to
48ceb75
Compare
|
Still "Work In Progress" or ready for review? You removed WIP from title but not from initial comment. Probably an oversight? |
|
Ready for review :) |
xavfernandez
force-pushed
the
xfernandez/extras_fix
branch
from
48ceb75
to
6497dda
Compare
|
Remove now useless InstallRequirement.requirements method |
xavfernandez
force-pushed
the
xfernandez/extras_fix
branch
from
6497dda
to
d61c245
Compare
| @@ -412,67 +412,45 @@ def prepare_files(self, finder): | |||
| # ###################### # | |||
| # # parse dependencies # # | |||
| # ###################### # | |||
| if (req_to_install.extras): | |||
| logger.info( | |||
There was a problem hiding this comment.
I don't think we need this here, at the very least it should be logger.debug not logger.info.
There was a problem hiding this comment.
Well it was there for sdist so I've added it for wheel also.
But I'm ok to switch it to debug or remove it completely since the extras is likely to have been already logged through the req_install before.
|
Overall I think this looks good. I made one comment and I'd like to look at it again tomorrow morning before merging but I think this can land. |
extras and editable_options are two different things
use pkg_resources.Distribution.requires instead of Requirements.requirements to have environment markers parsing for free It also unifies a little the process for wheel and non-wheel installs closes pypa#2174
and use pkg_resources.Distribution instead
xavfernandez
force-pushed
the
xfernandez/extras_fix
branch
from
25e0b1b
to
1921ad1
Compare
|
@dstufft I switched the logging to debug. Did you spot any other issue ? |
Fix extras_require and environment markers in sdist
|
some nice cleanup in here! |
lock
bot
added
the
auto-locked
Currently, environment markers in extras_require (e.g. {':python_version=="2.6"': ['unittest2']}) in sdist do not work.
The plan is to use pkg_resources.Distribution which will give it for free.
First commit is to make sure we do not put editable_options in extras (parse_editable return types are currently merging the two).