Update licenseListVersion to 3.20

Signed-off-by: Marc-Etienne Vargenau <marc-etienne.vargenau@nokia.com>
spdx · Feb 27, 2023 · 49fb24b · 49fb24b
1 parent 58e691e
commit 49fb24b
Show file tree

Hide file tree

Showing 17 changed files with 5,010 additions and 3,090 deletions.
diff --git a/spdx/exceptions.json b/spdx/exceptions.json
diff --git a/spdx/licenses.json b/spdx/licenses.json
diff --git a/tests/data/doc_write/json-simple-multi-package.json b/tests/data/doc_write/json-simple-multi-package.json
@@ -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",

diff --git a/tests/data/doc_write/json-simple-plus.json b/tests/data/doc_write/json-simple-plus.json
@@ -9,7 +9,7 @@
             "Organization: SPDX"
         ],
         "created": "2021-11-15T00:00:00Z",
-        "licenseListVersion": "3.6"
+        "licenseListVersion": "3.20"
     },
     "documentDescribes": [
         "SPDXRef-Package"

diff --git a/tests/data/doc_write/json-simple.json b/tests/data/doc_write/json-simple.json
@@ -9,7 +9,7 @@
             "Organization: SPDX"
         ],
         "created": "2021-11-15T00:00:00Z",
-        "licenseListVersion": "3.6"
+        "licenseListVersion": "3.20"
     },
     "documentDescribes": [
         "SPDXRef-Package"

diff --git a/tests/data/doc_write/tv-mini.tv b/tests/data/doc_write/tv-mini.tv
@@ -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
 
diff --git a/tests/data/doc_write/tv-simple-plus.tv b/tests/data/doc_write/tv-simple-plus.tv
@@ -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

diff --git a/tests/data/doc_write/tv-simple.tv b/tests/data/doc_write/tv-simple.tv
@@ -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

diff --git a/tests/data/doc_write/xml-simple-multi-package.xml b/tests/data/doc_write/xml-simple-multi-package.xml
@@ -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>

diff --git a/tests/data/doc_write/yaml-simple-multi-package.yaml b/tests/data/doc_write/yaml-simple-multi-package.yaml
@@ -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
@@ -51,4 +51,4 @@ files:
     licenseConcluded: NOASSERTION
     licenseInfoInFiles:
       - LGPL-2.1-or-later
-    fileName: ./some/path/tofile
+    fileName: ./some/path/tofile
diff --git a/tests/data/doc_write/yaml-simple-plus.yaml b/tests/data/doc_write/yaml-simple-plus.yaml
@@ -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

diff --git a/tests/data/doc_write/yaml-simple.yaml b/tests/data/doc_write/yaml-simple.yaml
@@ -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

diff --git a/tests/data/formats/SPDXJsonExample.json b/tests/data/formats/SPDXJsonExample.json
@@ -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": [

diff --git a/tests/data/formats/SPDXJsonExampleEmptyArrays.json b/tests/data/formats/SPDXJsonExampleEmptyArrays.json
@@ -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",

diff --git a/tests/data/formats/SPDXXmlExample.xml b/tests/data/formats/SPDXXmlExample.xml
@@ -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>

diff --git a/tests/data/formats/SPDXYamlExample.yaml b/tests/data/formats/SPDXYamlExample.yaml
@@ -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

diff --git a/tests/test_config.py b/tests/test_config.py
@@ -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'
@@ -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'