New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix extras_require and environment markers in sdist #2153

Merged
merged 4 commits into from Dec 20, 2014

Conversation

Projects
None yet
4 participants
@xavfernandez
Contributor

xavfernandez commented Dec 7, 2014

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).

@xavfernandez xavfernandez changed the title from WIP: fix extras_require and environment markers in sdist to Fix extras_require and environment markers in sdist Dec 12, 2014

@xavfernandez

This comment has been minimized.

Show comment
Hide comment
@xavfernandez

xavfernandez Dec 12, 2014

Contributor

Fixes issue #2174

Contributor

xavfernandez commented Dec 12, 2014

Fixes issue #2174

@msabramo

This comment has been minimized.

Show comment
Hide comment
@msabramo

msabramo Dec 16, 2014

Contributor

Still "Work In Progress" or ready for review? You removed WIP from title but not from initial comment. Probably an oversight?

Contributor

msabramo commented Dec 16, 2014

Still "Work In Progress" or ready for review? You removed WIP from title but not from initial comment. Probably an oversight?

@xavfernandez

This comment has been minimized.

Show comment
Hide comment
@xavfernandez

xavfernandez Dec 16, 2014

Contributor

Ready for review :)

Contributor

xavfernandez commented Dec 16, 2014

Ready for review :)

@xavfernandez

This comment has been minimized.

Show comment
Hide comment
@xavfernandez

xavfernandez Dec 16, 2014

Contributor

Remove now useless InstallRequirement.requirements method

Contributor

xavfernandez commented Dec 16, 2014

Remove now useless InstallRequirement.requirements method

@dstufft dstufft added this to the 6.0 milestone Dec 17, 2014

Show outdated Hide outdated pip/req/req_set.py Outdated
@dstufft

This comment has been minimized.

Show comment
Hide comment
@dstufft

dstufft Dec 18, 2014

Member

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.

Member

dstufft commented Dec 18, 2014

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.

xavfernandez added some commits Dec 7, 2014

parse_editable: clarify output
extras and editable_options are two different things
Fix environment extras installation for sdist
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 #2174
drop egg_info_lines
and use pkg_resources.Distribution instead
@xavfernandez

This comment has been minimized.

Show comment
Hide comment
@xavfernandez

xavfernandez Dec 19, 2014

Contributor

@dstufft I switched the logging to debug. Did you spot any other issue ?

Contributor

xavfernandez commented Dec 19, 2014

@dstufft I switched the logging to debug. Did you spot any other issue ?

dstufft added a commit that referenced this pull request Dec 20, 2014

Merge pull request #2153 from xavfernandez/xfernandez/extras_fix
Fix extras_require and environment markers in sdist

@dstufft dstufft merged commit 517dbb9 into pypa:develop Dec 20, 2014

1 check passed

continuous-integration/travis-ci The Travis CI build passed
Details

@xavfernandez xavfernandez deleted the xavfernandez:xfernandez/extras_fix branch Dec 21, 2014

@qwcode

This comment has been minimized.

Show comment
Hide comment
@qwcode

qwcode Dec 23, 2014

Contributor

some nice cleanup in here!

Contributor

qwcode commented Dec 23, 2014

some nice cleanup in here!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment