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

Allow directories as license_file source #4153

Merged
merged 4 commits into from
Dec 14, 2020

Conversation

mbargull
Copy link
Member

Resolves #4121.

@anaconda-issue-bot anaconda-issue-bot added the cla-signed [bot] added once the contributor has signed the CLA label Dec 12, 2020
Comment on lines +773 to +779
if os.path.isdir(src_file) and not src_file.endswith("/"):
raise ValueError(
"License entry in about/license_file ({}) points to a directory but does not "
"end with a '/'. Make sure the directory only contains license files and "
"append a '/' to include the folder and all of its content as license "
"information.".format(src_file)
)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This restriction can be removed whenever needed. I added it for now because it's easier to lift restrictions than to add them afterwards.

@mbargull
Copy link
Member Author

@mingwandroid, if you deem this change as not very controversial, it would be nice to slip it into the next release.
It would allow me to replace copies of https://github.com/conda-forge/podman-feedstock/blob/48f1c466949e6631146a357e78166c3af342b60e/recipe/build.sh#L18-L56 I have in several recipes by a one-liner :).

@mingwandroid
Copy link
Contributor

I am fine with trying to get this into the next release. What do you think about the test failures? Not all are 404 errors, some look license related.

@mbargull
Copy link
Member Author

The CI failures seem unrelated, though I'm working on fixes some at gh-4154

@mbargull
Copy link
Member Author

If CI from gh-4154 runs through successfully and it's merged, we can rebase this commit.

@mbargull
Copy link
Member Author

I am fine with trying to get this into the next release.

Thanks!

If CI from gh-4154 runs through successfully and it's merged, we can rebase this commit.

Done and all green; ready to go :).

@mingwandroid mingwandroid merged commit 5f79a53 into conda:master Dec 14, 2020
@mingwandroid
Copy link
Contributor

Thanks again @mbargull

@github-actions
Copy link

github-actions bot commented Mar 6, 2022

Hi there, thank you for your contribution!

This pull request has been automatically locked because it has not had recent activity after being closed.

Please open a new issue or pull request if needed.

Thanks!

@github-actions github-actions bot added the locked [bot] locked due to inactivity label Mar 6, 2022
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 6, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
cla-signed [bot] added once the contributor has signed the CLA locked [bot] locked due to inactivity
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support for (collected) license files via directories, globs, list files
3 participants