Skip to content

License file fix for #34 #41

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

Merged
merged 5 commits into from
Jul 22, 2017
Merged

License file fix for #34 #41

merged 5 commits into from
Jul 22, 2017

Conversation

glitchassassin
Copy link
Contributor

Moves the license files to package_data instead of data_files

@skvark
Copy link
Member

skvark commented Jul 21, 2017

I think it would be better that the licenses stay in the root of this repository. By moving them to cv2 folder Github can't autodetect the license and it's harder to find them when they are "hidden".

No big changes needed, just copy the licenses to the cv2 folder during build process. This has to be done before setup.py is called.

And don't worry about the broken builds, I'm looking into that issue.

@glitchassassin
Copy link
Contributor Author

Updated the travis yml file to copy those license files as part of the before_install step - does this work?

@skvark
Copy link
Member

skvark commented Jul 21, 2017

Yes, that should do it. Could you also add it to the Windows builds? New xcopy line to appveyor/build.cmd should be enough.

@glitchassassin
Copy link
Contributor Author

Of course, forgot that setup.py needs it there either way. 🙄 My bad.

@skvark
Copy link
Member

skvark commented Jul 21, 2017

No problem and thanks :) I will merge this when I get the builds fixed.

@skvark skvark merged commit 253e052 into opencv:master Jul 22, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants