Skip to content

Commit

Permalink
Merge branch 'mr/leger/2-spdx-version-does-not-match-the-description'…
Browse files Browse the repository at this point in the history
… into 'master'

Resolve "SPDX version does not match the description"

Closes #2

See merge request it/e3-core!4
  • Loading branch information
grouigrokon committed Jul 17, 2024
2 parents 3deba8c + 9a0d48e commit eda2043
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/e3/spdx.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
4 changes: 2 additions & 2 deletions tests/tests_e3/spdx_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"",
Expand Down Expand Up @@ -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"],
Expand Down

0 comments on commit eda2043

Please sign in to comment.