Add support for skipping license paths #851
Merged
+141
−39
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
Add support for a new config file with glob like handling of paths as some projects contain license files that are not the license of the project. scan_for_licenses now looks at the configuration and does glob like matching for all the potential license files it tries to add. This change caused a few structural adjustments to the code and a slight style change for importing just the toplevel util submodule that are superficial. Signed-off-by: William Douglas <[email protected]>
bwarden
reviewed
Sep 19, 2024
| file_path = 'a/ab' | ||
| self.assertFalse(util.globlike_match(file_path, match_name)) | ||
|
|
||
| match_name = ['a', 'b*'] |
| @@ -274,3 +274,31 @@ def open_auto(*args, **kwargs): | |||
| assert 'encoding' not in kwargs | |||
| assert 'errors' not in kwargs | |||
| return open(*args, encoding="utf-8", errors="surrogateescape", **kwargs) | |||
|
|
|||
|
|
|||
| def globlike_match(filename, match_name): | |||
There was a problem hiding this comment.
I'm assuming you didn't edit this aside from moving it to util?
There was a problem hiding this comment.
Yep, same function though the signature had to change since it isn't a class method (though it wasn't using any of the object's fields).
| license_skips | ||
| Each line in the file should be a full path, that path is prefixed into a | ||
| tempfile directory + the package tarfile prefix. Requires using '*' to be | ||
| effective (e.g. /tmp/*/pkgname-*/path/to/license). |
There was a problem hiding this comment.
Shouldn't we hide some of this prefix? Especially if it's going to be boilerplate /tmp/*/... we should just prepend it when skip_license calls globlike_match, right?
There was a problem hiding this comment.
Ugh that is nicer, thanks.
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.
Add support for a new config file with glob like handling of paths as some projects contain license files that are not the license of the project.
scan_for_licenses now looks at the configuration and does glob like matching for all the potential license files it tries to add.
This change caused a few structural adjustments to the code and a slight style change for importing just the toplevel util submodule that are superficial.