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

Update to SPDX license list 3.0 #2152

Merged
merged 2 commits into from
Jan 20, 2018

Conversation

mlinksva
Copy link
Contributor

Description:

Update to SPDX license list 3.0 simply by running

ruby util/generate_spdx_license_list.rb

3.0 was released 2017-12-28 https://spdx.org/news/news/2018/01/license-list-30-released

It includes some new license identifiers that rubygems should be aware of.

Tasks:

  • Describe the problem / feature
  • Write tests
  • Write code to solve the problem
  • Get code review from coworkers / friends

Yes, I will abide by the code of conduct.

simply by running

  ruby util/generate_spdx_license_list.rb

3.0 was released 2017-12-28 https://spdx.org/news/news/2018/01/license-list-30-released
-or-later being most prominent addition to SPDX license list 3.0

Note + still is present in list, thus left that test intact.
@hsbt
Copy link
Member

hsbt commented Jan 20, 2018

@bundlerbot r+

@bundlerbot
Copy link
Collaborator

📌 Commit 4106874 has been approved by hsbt

@bundlerbot
Copy link
Collaborator

⌛ Testing commit 4106874 with merge 948d61b...

bundlerbot added a commit that referenced this pull request Jan 20, 2018
Update to SPDX license list 3.0

# Description:

Update to SPDX license list 3.0 simply by running

  ruby util/generate_spdx_license_list.rb

3.0 was released 2017-12-28 https://spdx.org/news/news/2018/01/license-list-30-released

It includes some new license identifiers that rubygems should be aware of.

# Tasks:

- [x] Describe the problem / feature
- [x] Write tests
- [x] Write code to solve the problem
- [ ] Get code review from coworkers / friends

Yes, I will abide by the [code of conduct](https://github.com/rubygems/rubygems/blob/master/CODE_OF_CONDUCT.md).
@colby-swandale
Copy link
Member

uhh is this going to break Gem::Specification for anyone that's using the WXwindows license?

@bundlerbot
Copy link
Collaborator

💔 Test failed - status-travis

@hsbt
Copy link
Member

hsbt commented Jan 20, 2018

@colby-swandale Noone use WXwindows with Gem::Specification

blackboard-3.1.9/lib/site_template/node_modules/spdx-license-ids/spdx-license-ids.json:  "WXwindows"
foodcritic-12.2.2/lib/foodcritic/rules/fc069.rb:      WXwindows
foodcritic-12.2.2/lib/foodcritic/rules/fc078.rb:        WXwindows
gemterms-0.1.0/compatability.yml:  "WXwindows":
gemterms-0.1.0/compatability.yml:    uri: "http://opensource.org/licenses/WXwindows"
inspec-1.49.2/lib/utils/spdx.txt:WXwindows
license_matcher-0.3.2/lib/license_matcher/rule_matcher.rb:        "WXwindows"     => [/\bwxWINDOWS\s+LIBRARY\sLICEN[C|S]E\b/i, /\AWXwindows\s*\z/i],
maven-tools-1.1.6/lib/maven/tools/licenses.rb:    LICENSES[ "wxwindows" ] = OpenStruct.new :short => "WXwindows", :name => "wxWindows Library License", :url => "http://opensource.org/licenses/WXwindows"
node-compiler-0.9.1/vendor/node/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/node_modules/spdx-license-ids/spdx-license-ids.json:  "WXwindows"
node-compiler-0.9.1/vendor/node/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-license-ids/spdx-license-ids.json:  "WXwindows"
omnibus-5.6.1/lib/omnibus/licensing.rb:      "WXwindows",     # wxWindows Library License
rip-package-0.1.1/source/osi_licenses.txt:WXwindows
rubygems-update-2.7.4/lib/rubygems/util/licenses.rb:      WXwindows
spdx-licenses-1.1.0/licenses.json:      "licenseId": "WXwindows",
spdx-licenses-1.1.0/licenses.json:      "detailsUrl": "http://spdx.org/licenses/WXwindows.json",
spdx-licenses-1.1.0/licenses.json:        "http://www.opensource.org/licenses/WXwindows"
spdx-licenses-1.1.0/licenses.json:      "reference": "./WXwindows.html"

@hsbt
Copy link
Member

hsbt commented Jan 20, 2018

@bundlerbot retry

@bundlerbot
Copy link
Collaborator

⌛ Testing commit 4106874 with merge 1b9de2f...

bundlerbot added a commit that referenced this pull request Jan 20, 2018
Update to SPDX license list 3.0

# Description:

Update to SPDX license list 3.0 simply by running

  ruby util/generate_spdx_license_list.rb

3.0 was released 2017-12-28 https://spdx.org/news/news/2018/01/license-list-30-released

It includes some new license identifiers that rubygems should be aware of.

# Tasks:

- [x] Describe the problem / feature
- [x] Write tests
- [x] Write code to solve the problem
- [ ] Get code review from coworkers / friends

Yes, I will abide by the [code of conduct](https://github.com/rubygems/rubygems/blob/master/CODE_OF_CONDUCT.md).
@bundlerbot
Copy link
Collaborator

☀️ Test successful - status-travis
Approved by: hsbt
Pushing 1b9de2f to master...

@bundlerbot bundlerbot merged commit 4106874 into rubygems:master Jan 20, 2018
@mlinksva mlinksva deleted the spdx-license-list-3.0 branch January 20, 2018 07:07
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.

5 participants