Conceptual fix for issue #3589 #126
Draft
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
This makes is_excluded work with symlinks.
Note that this behavior was different for files in dirs; see "if file.is_dir():" block a bit higher in the code. Related: python-poetry/poetry#1336
Note that this makes a list of all files in .git directories and is thus very slow.
brechtm
commented
Jan 21, 2021
| if self.is_excluded( | ||
| include_file.relative_to_project_root() | ||
| ) and isinstance(include, PackageInclude): | ||
| if self.is_excluded(file.relative_to(source_root)): |
There was a problem hiding this comment.
This changes include/exclude behavior, breaking three tests. Currently, include always trumps exclude (see also python-poetry/poetry#1336 and python-poetry/poetry#1750), which is too limiting for some use cases.
One solution, without introducing order-dependent include/exclude rules as in a a MANIFEST.in, is to give globbed paths a lower priority than fully-qualified paths. I feel this offers more flexibility while being intuitive at the same time. This would work for the examples given in python-poetry/poetry#1336, such as:
exclude = [
"assets/sample/**/*"
]
include = [
"assets/sample/subdir/one.yaml",
"assets/sample/subdir/two.yaml"
]But the following would now also work:
include = [
"**/*"
]
exclude = [
".travis.yml"
]It might be worth looking into assigning different priorities to glob patterns based on how specific they are.
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.
This makes just enough changes to the code to make python-poetry/poetry#3589 work. This is mostly intended to start discussion and collect feedback.
There are (at least) two outstanding issues:
from = "src"packages setup, this adds the files in src twice. The resulting tar.gz does seem to be fine, however.include = [{ path = "**/*", format = "sdist" }]in a sizeable project. I believe this is because poetry checks for excluded files on a file-per-file bases and doesn't take shortcuts when entire directories are excluded.Summary of commits:
Partly resolves: python-poetry/poetry#3589