Skip to content
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

Filter top-level requirements against env markers. #592

Merged
merged 2 commits into from
Oct 10, 2018

Conversation

jsirois
Copy link
Member

@jsirois jsirois commented Oct 9, 2018

Previously, only transitive requirements were filtered.

Fixes #456
Fixes #122

Previously, only transitive requirements were filtered.

Fixes pex-tool#456
@jsirois
Copy link
Member Author

jsirois commented Oct 10, 2018

FYI: The miss this fixes was discovered upgrading pants to pex 1.5.0 and killing blacklists here: pantsbuild/pants#6613

@jsirois jsirois mentioned this pull request Oct 10, 2018
pex/resolver.py Outdated Show resolved Hide resolved
pex/resolver.py Show resolved Hide resolved
@jsirois jsirois merged commit 884b459 into pex-tool:master Oct 10, 2018
@jsirois jsirois deleted the issues/456/complete branch October 10, 2018 20:31
jsirois added a commit to jsirois/pex that referenced this pull request Nov 3, 2018
In pex-tool#582 and pex-tool#592 support for environment markers was added to the pex
runtime. In so doing, the resolver was fixed to record full requirement
strings into PEX-INFO. Since part of those full requirement strings
could now include environment markers that selected for active extras,
a bug was introduced since we did not also add the active extras to the
environment marker evaluation environment.

This change adds a failing test that is fixed by properly setting up the
environment marker environment to include active extras.

Fixes pex-tool#615.
jsirois added a commit to jsirois/pex that referenced this pull request Nov 3, 2018
In pex-tool#582 and pex-tool#592 support for environment markers was added to the pex
runtime. In so doing, the resolver was fixed to record full requirement
strings into PEX-INFO. Since part of those full requirement strings
could now include environment markers that selected for active extras,
a bug was introduced since we did not also add the active extras to the
environment marker evaluation environment.

This change adds a failing test that is fixed by properly setting up the
environment marker environment to include active extras.

Fixes pex-tool#615.
jsirois added a commit that referenced this pull request Nov 4, 2018
In #582 and #592 support for environment markers was added to the pex
runtime. In so doing, the resolver was fixed to record full requirement
strings into PEX-INFO. Since part of those full requirement strings
could now include environment markers that selected for active extras,
a bug was introduced since we did not also add the active extras to the
environment marker evaluation environment.

This change adds a failing test that is fixed by properly setting up the
environment marker environment to include active extras.

Fixes #615.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants