[Merged by Bors] - Note that changes to licensing are controversial by alice-i-cecile · Pull Request #4975 · bevyengine/bevy

alice-i-cecile · 2022-06-09T15:53:27Z

Objective

In [Merged by Bors] - Let the project page support GitHub's new ability to display open source licenses #4966, @DJMcNab noted that the changes should likely have been flagged as controversial, and blocked on a final pass from @cart.
- I think this is generally reasonable.
- Added as an explicit guideline.
Changes to top-level files are also typically controversial, due to the high visible impact (see gitpod support #4700 for a case of that).
- Added as an explicit guideline.
The licensing information of our included assets is hard to find.
- Call out the existence of CREDITS.md

alice-i-cecile · 2022-06-09T16:08:11Z

If we want to make any follow-up changes to #4966 (or revert it); let me know and I'll do that work myself, either in this PR or another one.

README.md

DJMcNab · 2022-06-09T16:16:52Z

As I aimed to express in #4966, I don't think we need to revert it.

cart

Yup I agree that these changes should be considered controversial. Once we sort out @DJMcNab's "other license files" thread I think this is good to go.

alice-i-cecile · 2022-06-10T02:03:59Z

I've tried to capture the details here in a relatively approachable way; let me know what you think.

I've also split out the section on the contribution agreement into its own subsection for clarity.

DJMcNab

I'm happy we're getting around to updating this. I've got some opinions about the exact details we should include and form this should take, but I think the general direction is good.

README.md

DJMcNab · 2022-06-10T21:40:45Z

README.md

+or will be listed directly in the source as a comment, in the case of small snippets.
+
+The [assets](assets) included in this repository for testing purposes typically fall under different open licenses.
+See [CREDITS.md](CREDITS.md) for the details of the licenses of those files.


We should ensure that this reflects all of the assets licenses.

Agreed. I'd personally prefer just keeping a CSV.

Punting this for future work.

README.md

Co-authored-by: Daniel McNab <36049421+DJMcNab@users.noreply.github.com>

DJMcNab

I'm happy enough with this - I hope that all the claims we make here are true. At the very least, we should record checking that as a follow-up. I want to land the contributing.md changes soon-ish though

DJMcNab · 2022-07-20T16:28:34Z

README.md

+
+### Your contributions
+
+Unless you explicitly state otherwise,


I still think this should stay directly after "at your option", however I don't want to block on that.

I think it's much clearer this way 😄

But it's nonstandard, and it's directly related to the dual MIT/Apache 2.0

Like this "as above" to me reads as all of the 'junk' after the dual MIT/Apache, but it really only means the dual MIT/Apache.

alice-i-cecile · 2022-07-20T17:05:27Z

Created #5399 to capture the "check that everything is kosher" task that got punted. Merging now; feel free to tweak wording further in a follow-up PR.

bors r+

@DJMcNab

# Objective - In #4966, @DJMcNab noted that the changes should likely have been flagged as controversial, and blocked on a final pass from @cart. - I think this is generally reasonable. - Added as an explicit guideline. - Changes to top-level files are also typically controversial, due to the high visible impact (see #4700 for a case of that). - Added as an explicit guideline. - The licensing information of our included assets is hard to find. - Call out the existence of CREDITS.md

bors · 2022-07-20T17:24:27Z

Pull request successfully merged into main.

Build succeeded:

@DJMcNab

# Objective - In bevyengine#4966, @DJMcNab noted that the changes should likely have been flagged as controversial, and blocked on a final pass from @cart. - I think this is generally reasonable. - Added as an explicit guideline. - Changes to top-level files are also typically controversial, due to the high visible impact (see bevyengine#4700 for a case of that). - Added as an explicit guideline. - The licensing information of our included assets is hard to find. - Call out the existence of CREDITS.md

@DJMcNab

# Objective - In bevyengine#4966, @DJMcNab noted that the changes should likely have been flagged as controversial, and blocked on a final pass from @cart. - I think this is generally reasonable. - Added as an explicit guideline. - Changes to top-level files are also typically controversial, due to the high visible impact (see bevyengine#4700 for a case of that). - Added as an explicit guideline. - The licensing information of our included assets is hard to find. - Call out the existence of CREDITS.md

@DJMcNab

# Objective - In bevyengine#4966, @DJMcNab noted that the changes should likely have been flagged as controversial, and blocked on a final pass from @cart. - I think this is generally reasonable. - Added as an explicit guideline. - Changes to top-level files are also typically controversial, due to the high visible impact (see bevyengine#4700 for a case of that). - Added as an explicit guideline. - The licensing information of our included assets is hard to find. - Call out the existence of CREDITS.md

alice-i-cecile added 2 commits June 9, 2022 11:45

Add licensing and root-level files to controversial criteria

9356af4

Add note on the licenses of assets

49bc7ae

alice-i-cecile added C-Docs An addition or correction to our documentation A-Meta About the project itself labels Jun 9, 2022

alice-i-cecile added the X-Needs-SME This type of work requires an SME to approve it. label Jun 9, 2022

alice-i-cecile requested review from DJMcNab and cart June 9, 2022 16:11

DJMcNab reviewed Jun 9, 2022

View reviewed changes

README.md Outdated Show resolved Hide resolved

cart approved these changes Jun 9, 2022

View reviewed changes

Clarify licenses of sub-components

21ffc21

alice-i-cecile requested review from DJMcNab and cart June 10, 2022 02:02

DJMcNab reviewed Jun 10, 2022

View reviewed changes

alice-i-cecile and others added 6 commits June 10, 2022 17:59

Avoid mention of small snippets

3f0c103

Co-authored-by: Daniel McNab <36049421+DJMcNab@users.noreply.github.com>

Clarify README notes

0bb7006

Co-authored-by: Daniel McNab <36049421+DJMcNab@users.noreply.github.com>

Wording tweak

d0d458c

Co-authored-by: Daniel McNab <36049421+DJMcNab@users.noreply.github.com>

Assets are for examples

7647232

Co-authored-by: Daniel McNab <36049421+DJMcNab@users.noreply.github.com>

Remove reference to other dependency's licenses

67a0663

Note presence of other licenses

c537db7

alice-i-cecile requested a review from DJMcNab July 20, 2022 14:42

DJMcNab approved these changes Jul 20, 2022

View reviewed changes

alice-i-cecile mentioned this pull request Jul 20, 2022

Verify that all asset licenses are accounted for in CREDITS.md #5399

Open

alice-i-cecile added the S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it label Jul 20, 2022

bors bot changed the title ~~Note that changes to licensing are controversial~~ [Merged by Bors] - Note that changes to licensing are controversial Jul 20, 2022

bors bot closed this Jul 20, 2022


		### Your contributions

		Unless you explicitly state otherwise,

Uh oh!

Conversation

alice-i-cecile commented Jun 9, 2022

Objective

Uh oh!

alice-i-cecile commented Jun 9, 2022

Uh oh!

Uh oh!

DJMcNab commented Jun 9, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cart left a comment

Choose a reason for hiding this comment

Uh oh!

alice-i-cecile commented Jun 10, 2022

Uh oh!

DJMcNab left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DJMcNab Jun 10, 2022

Choose a reason for hiding this comment

Uh oh!

alice-i-cecile Jun 10, 2022

Choose a reason for hiding this comment

Uh oh!

alice-i-cecile Jul 20, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

DJMcNab left a comment

Choose a reason for hiding this comment

Uh oh!

DJMcNab Jul 20, 2022

Choose a reason for hiding this comment

Uh oh!

alice-i-cecile Jul 20, 2022

Choose a reason for hiding this comment

Uh oh!

DJMcNab Jul 20, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alice-i-cecile commented Jul 20, 2022

Uh oh!

bors bot commented Jul 20, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

DJMcNab commented Jun 9, 2022 •

edited

Loading

DJMcNab left a comment •

edited

Loading

DJMcNab Jul 20, 2022 •

edited

Loading