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.

Sign up for GitHub

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 licenseListVersion to 3.20 #492

Merged
merged 2 commits into from
Feb 27, 2023
Merged

Update licenseListVersion to 3.20 #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6802ef6
Update licenseListVersion to 3.20
vargenau Feb 23, 2023
f0b5d3f
Fix tests
vargenau Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
654 changes: 402 additions & 252 deletions spdx/exceptions.json
View file
Open in desktop

Large diffs are not rendered by default.

7,410 changes: 4,590 additions & 2,820 deletions spdx/licenses.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/data/doc_parse/expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"licenseListVersion": {
"major": 3,
"minor": 6
"minor": 20
},
"creators": [
{
Expand Down
2 changes: 1 addition & 1 deletion tests/data/doc_parse/spdx-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"licenseListVersion": {
"major": 3,
"minor": 6
"minor": 20
},
"creators": [
{
Expand Down
2 changes: 1 addition & 1 deletion tests/data/doc_write/json-simple-multi-package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"Tool: ScanCode"
],
"created": "2021-10-21T17:09:37Z",
"licenseListVersion": "3.6"
"licenseListVersion": "3.20"
},
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
Expand Down
2 changes: 1 addition & 1 deletion tests/data/doc_write/json-simple-plus.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"Organization: SPDX"
],
"created": "2021-11-15T00:00:00Z",
"licenseListVersion": "3.6"
"licenseListVersion": "3.20"
},
"documentDescribes": [
"SPDXRef-Package"
Expand Down
2 changes: 1 addition & 1 deletion tests/data/doc_write/json-simple.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"Organization: SPDX"
],
"created": "2021-11-15T00:00:00Z",
"licenseListVersion": "3.6"
"licenseListVersion": "3.20"
},
"documentDescribes": [
"SPDXRef-Package"
Expand Down
2 changes: 1 addition & 1 deletion tests/data/doc_write/tv-mini.tv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Document Information
SPDXVersion: SPDX-2.1
DataLicense: CC0-1.0
LicenseListVersion: 3.6
LicenseListVersion: 3.20
SPDXID: SPDXRef-DOCUMENT
# Creation Info

2 changes: 1 addition & 1 deletion tests/data/doc_write/tv-simple-plus.tv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ SPDXVersion: SPDX-2.1
DataLicense: CC0-1.0
DocumentNamespace: https://spdx.org/spdxdocs/spdx-example-444504E0-4F89-41D3-9A0C-0305E82C3301
DocumentName: Sample_Document-V2.1
LicenseListVersion: 3.6
LicenseListVersion: 3.20
SPDXID: SPDXRef-DOCUMENT
# Creation Info
# Relationships
Expand Down
2 changes: 1 addition & 1 deletion tests/data/doc_write/tv-simple.tv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ SPDXVersion: SPDX-2.1
DataLicense: CC0-1.0
DocumentNamespace: https://spdx.org/spdxdocs/spdx-example-444504E0-4F89-41D3-9A0C-0305E82C3301
DocumentName: Sample_Document-V2.1
LicenseListVersion: 3.6
LicenseListVersion: 3.20
SPDXID: SPDXRef-DOCUMENT
# Creation Info
# Relationships
Expand Down
2 changes: 1 addition & 1 deletion tests/data/doc_write/xml-simple-multi-package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<creationInfo>
<creators>Tool: ScanCode</creators>
<created>2021-10-21T17:02:23Z</created>
<licenseListVersion>3.6</licenseListVersion>
<licenseListVersion>3.20</licenseListVersion>
</creationInfo>
<dataLicense>CC0-1.0</dataLicense>
<SPDXID>SPDXRef-DOCUMENT</SPDXID>
Expand Down
4 changes: 2 additions & 2 deletions tests/data/doc_write/yaml-simple-multi-package.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ creationInfo:
created: '2021-10-21T16:46:56Z'
creators:
- 'Tool: ScanCode'
licenseListVersion: '3.6'
licenseListVersion: '3.20'
dataLicense: CC0-1.0
documentDescribes:
- SPDXRef-Package1
Expand Down Expand Up @@ -51,4 +51,4 @@ files:
licenseConcluded: NOASSERTION
licenseInfoInFiles:
- LGPL-2.1-or-later
fileName: ./some/path/tofile
fileName: ./some/path/tofile
2 changes: 1 addition & 1 deletion tests/data/doc_write/yaml-simple-plus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ creationInfo:
created: '2021-11-15T00:00:00Z'
creators:
- 'Organization: SPDX'
licenseListVersion: '3.6'
licenseListVersion: '3.20'
dataLicense: CC0-1.0
documentDescribes:
- SPDXRef-Package
Expand Down
2 changes: 1 addition & 1 deletion tests/data/doc_write/yaml-simple.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ creationInfo:
created: '2021-11-15T00:00:00Z'
creators:
- 'Organization: SPDX'
licenseListVersion: '3.6'
licenseListVersion: '3.20'
dataLicense: CC0-1.0
documentDescribes:
- SPDXRef-Package
Expand Down
2 changes: 1 addition & 1 deletion tests/data/formats/SPDXJsonExample.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
"Person: Gary O'Neall",
"Organization: Source Auditor Inc."
],
"licenseListVersion": "3.6",
"licenseListVersion": "3.20",
"created": "2010-02-03T00:00:00Z"
},
"externalDocumentRefs": [
Expand Down
2 changes: 1 addition & 1 deletion tests/data/formats/SPDXJsonExampleEmptyArrays.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"Person: Gary O'Neall",
"Organization: Source Auditor Inc."
],
"licenseListVersion": "3.6",
"licenseListVersion": "3.20",
"created": "2010-02-03T00:00:00Z"
},
"documentNamespace": "https://spdx.org/spdxdocs/spdx-example-444504E0-4F89-41D3-9A0C-0305E82C3301",
Expand Down
2 changes: 1 addition & 1 deletion tests/data/formats/SPDXXmlExample.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<creators>Tool: SourceAuditor-V1.2</creators>
<creators>Person: Gary O'Neall</creators>
<creators>Organization: Source Auditor Inc.</creators>
<licenseListVersion>3.6</licenseListVersion>
<licenseListVersion>3.20</licenseListVersion>
<created>2010-02-03T00:00:00Z</created>
</creationInfo>
<externalDocumentRefs>
Expand Down
2 changes: 1 addition & 1 deletion tests/data/formats/SPDXYamlExample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Document:
- 'Tool: SourceAuditor-V1.2'
- 'Organization: Source Auditor Inc.'
- 'Person: Gary O''Neall'
licenseListVersion: '3.6'
licenseListVersion: '3.20'
dataLicense: CC0-1.0
documentDescribes:
- SPDXRef-Package
Expand Down
6 changes: 3 additions & 3 deletions tests/test_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class TestLicenseList(TestCase):

def test_load_license_list(self):
version, licenses_map = config.load_license_list(config._licenses)
assert version == ('3', '6')
assert version == ('3', '20')
# Test some instances in licenses_map
assert licenses_map['MIT License'] == 'MIT'
assert licenses_map['MIT'] == 'MIT License'
Expand All @@ -31,11 +31,11 @@ def test_load_license_list(self):
assert licenses_map['GPL-3.0-only'] == 'GNU General Public License v3.0 only'

def test_config_license_list_version_constant(self):
assert config.LICENSE_LIST_VERSION == Version(major=3, minor=6)
assert config.LICENSE_LIST_VERSION == Version(major=3, minor=20)

def test_load_exception_list(self):
version, exception_map = config.load_exception_list(config._exceptions)
assert version == ('3', '6')
assert version == ('3', '20')
# Test some instances in exception_map
assert exception_map['Bison exception 2.2'] == 'Bison-exception-2.2'
assert exception_map['Bison-exception-2.2'] == 'Bison exception 2.2'
Expand Down