Fix #3285#124
Merged
sdispater merged 2 commits intopython-poetry:masterfrom Jan 29, 2021
cognitedata:fix-3285
Merged
Conversation
Paths for generated code that's excluded by vcs, but then included explicitly, were wrong because they appared in the exclude list during Builder.find_excluded_files(). I changed find_excluded_files to not exclude files which are explicitly included, by taking a set difference. Added a test for this case.
Closed
3 tasks
Merged
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Resolves: python-poetry#3285
Fix python-poetry#3285 by removing explicitly included files from the set in
poetry.core.masonry.builders.builder.Builder.find_excluded_files. If files are both included and excluded, they are usually excluded because of vcs, so it makes sense to override by explicitly including.Added a test for this case.