diff --git a/NEWS.md b/NEWS.md index 401faa7b..a0966117 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,5 @@ # Version 22.7.0 (2024-??-??) *NOT RELEASED YET* +* Fix SPDX document version * Take `main.Main` name's argument as the arguments parser's prog name * Add DLL closure check to Anod class * Add git_shallow_fetch_since to checkout.py diff --git a/src/e3/spdx.py b/src/e3/spdx.py index 9ebc50d7..7e1a3072 100644 --- a/src/e3/spdx.py +++ b/src/e3/spdx.py @@ -835,7 +835,7 @@ class DocumentInformation(SPDXSection): document_name: DocumentName document_namespace: DocumentNamespace = field(init=False) - version: SPDXVersion = SPDXVersion("SPDX-1.2") + version: SPDXVersion = SPDXVersion("SPDX-2.3") data_license: DataLicense = DataLicense("CC0-1.0") spdx_id: SPDXID = SPDXID("DOCUMENT") diff --git a/tests/tests_e3/spdx_test.py b/tests/tests_e3/spdx_test.py index 4d48e505..aa2a8271 100644 --- a/tests/tests_e3/spdx_test.py +++ b/tests/tests_e3/spdx_test.py @@ -200,7 +200,7 @@ def test_spdx(): "", "DocumentName: my-spdx-test", f"DocumentNamespace: {document_namespace}", - "SPDXVersion: SPDX-1.2", + "SPDXVersion: SPDX-2.3", "DataLicense: CC0-1.0", "SPDXID: SPDXRef-DOCUMENT", "", @@ -277,7 +277,7 @@ def test_spdx(): assert json_content == { "SPDXID": "SPDXRef-DOCUMENT", - "spdxVersion": "SPDX-1.2", + "spdxVersion": "SPDX-2.3", "dataLicense": "CC0-1.0", "documentNamespace": document_namespace, "documentDescribes": ["SPDXRef-my-spdx-test-main-2.2.2-pkg"],