Exclude requirements with non-matching markers from pip-sync's merge stage #927
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #927 +/- ##
=======================================
Coverage 99.43% 99.44%
=======================================
Files 34 34
Lines 2499 2503 +4
Branches 309 312 +3
=======================================
+ Hits 2485 2489 +4
Misses 8 8
Partials 6 6
Continue to review full report at Codecov.
|
atugushev
added
enhancement
AndydeCleyre
force-pushed
the
bugfix/925
branch
2 times, most recently
from
4ea6f67
to
4bd09a4
Compare
AndydeCleyre
force-pushed
the
bugfix/925
branch
from
4bd09a4
to
338afe7
Compare
AndydeCleyre
force-pushed
the
bugfix/925
branch
from
338afe7
to
29eec0c
Compare
AndydeCleyre
force-pushed
the
bugfix/925
branch
from
29eec0c
to
5bbe61e
Compare
AndydeCleyre
changed the title
atugushev
approved these changes
Apr 13, 2020
|
Thanks, @AndydeCleyre, for the contribution! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #925.
During sync's
mergestage, any requirements with markers which don't match the current environment will be ignored. This allows successful syncing when the requirements.txt contains irrelevant (but properly marked) entries. The merge test has been updated to expect successful syncing in these cases.Changelog-friendly one-liner: Exclude requirements with non-matching markers from sync operations.
Contributor checklist