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

Relicense under Apache-2.0. #117

Merged
merged 10 commits into from
Feb 27, 2024
Merged

Relicense under Apache-2.0. #117

merged 10 commits into from
Feb 27, 2024

Conversation

BigBlueHat
Copy link
Contributor

Working to apply the REUSE v3.0 spec correctly.

Also working to make the new licensing approach clear to both bots and humans.

Working to align more closely with the REUSE v3.0 and SPDX v2.3 specifications.
The copyright notice within the license file is confusing as it implies the
copyright of the license itself vs. the covered work.

The text has been replaced with a version statement and a month/year
date of the known change to the current text of this license.
The BSD-3-Clause text is not Markdown...
Removed the copyright claim/range which was confusing bots and humans as
its scope and application was unclear.

Altered the License description text to clarify BSD-3-Clause usage while
noting that some components may differ and use the non-commercial
license.

Individual projects will be updated to reflect the licensing change.
Copy link

codecov bot commented Feb 14, 2024

Codecov Report

Merging #117 (8074c48) into main (4084ac4) will increase coverage by 1.30%.
The diff coverage is 100.00%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #117      +/-   ##
==========================================
+ Coverage   80.23%   81.53%   +1.30%     
==========================================
  Files          10       10              
  Lines        1821     1950     +129     
==========================================
+ Hits         1461     1590     +129     
  Misses        360      360              
Files Coverage Δ
lib/config.js 100.00% <100.00%> (ø)
lib/configUtil.js 100.00% <100.00%> (ø)
lib/events.js 85.36% <100.00%> (+6.79%) ⬆️
lib/helpers.js 75.00% <100.00%> (+3.57%) ⬆️
lib/index.js 69.32% <100.00%> (+0.51%) ⬆️
lib/loggers/WorkerTransport.js 91.80% <100.00%> (+2.21%) ⬆️
lib/loggers/fileLogger.js 82.60% <100.00%> (+2.21%) ⬆️
lib/loggers/formatters.js 69.82% <100.00%> (+3.80%) ⬆️
lib/loggers/index.js 90.04% <100.00%> (+0.62%) ⬆️
lib/util.js 94.82% <100.00%> (+0.65%) ⬆️

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4084ac4...8074c48. Read the comment docs.

@BigBlueHat BigBlueHat changed the title LicenseRef and README changes Relicense under Apache-2.0 Feb 15, 2024
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
@BigBlueHat BigBlueHat requested a review from davidlehn February 15, 2024 21:46
@BigBlueHat BigBlueHat changed the title Relicense under Apache-2.0 Relicense under Apache-2.0. Feb 15, 2024
LICENSES/LicenseRef-Bedrock-NC-1.0.txt Show resolved Hide resolved
LICENSES/Apache-2.0.txt Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
.github/workflows/main.yml Outdated Show resolved Hide resolved
index.js Outdated Show resolved Hide resolved
@@ -1,8 +1,21 @@
/*!
* Copyright (c) 2012-2024 Digital Bazaar, Inc.
* Copyright 2012 - 2024 Digital Bazaar, Inc.
Copy link
Member

Choose a reason for hiding this comment

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

Why add spaces here and elsewhere?

Suggested change
* Copyright 2012 - 2024 Digital Bazaar, Inc.
* Copyright 2012-2024 Digital Bazaar, Inc.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Because the reuse command uses spaces... I find it annoying also, but didn't think it worth fighting the bot about.

If you feel it is...we can fork https://github.com/fsfe/reuse-tool until they make that an option.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ISO 8601 apparently uses a / between dates to specify a range--and thankfully also allows for --.

So if we (and/or the reuse project) wanted to make this super parseable, I'd vote for the -- use.

Per https://en.wikipedia.org/wiki/ISO_8601#Time_intervals

Copy link
Member

@davidlehn davidlehn Feb 15, 2024

Choose a reason for hiding this comment

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

We can't do what we want because the robot is broken?
https://github.com/fsfe/reuse-tool/blob/main/src/reuse/_util.py#L388
Grepping through thousands of installed files, I only find ~4 files (or transformations thereof) with that spaced out pattern. I'd say the robot is wrong in this case. And to be fair, mostly everyone does single years. But a style under 1% use is a strange choice for them to make.

Copy link
Member

Choose a reason for hiding this comment

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

So if we (and/or the reuse project) wanted to make this super parseable, I'd vote for the -- use.

That would be even more of an outlier from common use than -.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Agreed. How would you like to fix this? I don't feel it's worth continuing to drag out the relicensing or avoid the automation. So, if you want to fight the whitespace fight, I'd take it upstream--or propose a cleanup script to make it match your preference: https://github.com/fsfe/reuse-tool/issues

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@davidlehn would you prefer I fork the tool and fix this whitespace? or can you live with the spaces?

index.js Show resolved Hide resolved
README.md Outdated
@@ -801,15 +801,15 @@ See the [AUTHORS][] file for author contact information.
License
-------

Bedrock and all Bedrock modules are:
Bedrock core libraries are licensed under the [Apache-2.0](LICENSE).
Copy link
Member

Choose a reason for hiding this comment

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

This updated text also is not explicit about the license of this project. It can be inferred that this is a "Bedrock core library" but could be direct and say "This library and some other Bedrock core libraries are ..." to make it clear. (I'm not sure we have defined "core" yet so maybe phrase with "some" such that people will check.)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Would prefixing that section with the following do the trick?

Suggested change
Bedrock core libraries are licensed under the [Apache-2.0](LICENSE).
[Apache-2.0](LICENSE) Copyright YYYY-YYYY Digital Bazaar, Inc.
Bedrock core libraries are licensed under the [Apache-2.0](LICENSE).

"Project licensing" is basically an assumption about per-file licensing. Moving to implementing a more verbose description format (in this case REUSE v3.0), we avoid that assumption (with its common misapplications to other people's software) and move to file-by-file copyright and license claims--to avoid confusion.

That said, I agree it's a common signal in the README, so adding that seems reasonable.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@davidlehn would love your thoughts here.

CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
@dlongley dlongley merged commit 22c1643 into main Feb 27, 2024
6 checks passed
@dlongley dlongley deleted the license-ref-change branch February 27, 2024 16:16
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.

3 participants