Skip to content

Commit

Permalink
Update spdx-tools
Browse files Browse the repository at this point in the history
This commit replaces the failing dependabot PR #95 and fixes the test.
According to the SPDX specification tag-value values are case-sensitive, this was not true for the test file, failed the validation and is fixed now.

Signed-off-by: Meret Behrens <[email protected]>
  • Loading branch information
meretp committed Oct 12, 2023
1 parent 2f129df commit a2fd42c
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spdx2opossum = 'opossum_lib.cli:spdx2opossum'

[tool.poetry.dependencies]
python = "^3.8.1"
spdx-tools = "^0.8.1"
spdx-tools = "^0.8.2"
networkx = "^3.0"
click = "^8.1.7"
pre-commit = "^3.4.0"
Expand Down
6 changes: 3 additions & 3 deletions tests/data/SPDX.spdx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Created: 2023-03-14T08:49:00Z
PackageName: Package A
SPDXID: SPDXRef-Package-A
PackageDownloadLocation: https://download.com
FilesAnalyzed: True
FilesAnalyzed: true

## File Information
FileName: File-A
Expand All @@ -29,13 +29,13 @@ FileChecksum: SHA1: d6a770ba38583ed4bb4525bd96e50461655d2759
PackageName: Package B
SPDXID: SPDXRef-Package-B
PackageDownloadLocation: https://download.com
FilesAnalyzed: True
FilesAnalyzed: true

## Package Information
PackageName: Package C
SPDXID: SPDXRef-Package-C
PackageDownloadLocation: https://download.com
FilesAnalyzed: True
FilesAnalyzed: true

## File Information
FileName: File-B
Expand Down
6 changes: 3 additions & 3 deletions tests/data/expected_opossum.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"name":"SPDX-Package",
"documentConfidence":0
},
"comment":"## Package Information\nPackageName: Package A\nSPDXID: SPDXRef-Package-A\nPackageDownloadLocation: https://download.com\nFilesAnalyzed: True\n",
"comment":"## Package Information\nPackageName: Package A\nSPDXID: SPDXRef-Package-A\nPackageDownloadLocation: https://download.com\nFilesAnalyzed: true\n",
"packageName":"Package A",
"copyright":"None",
"licenseName":"None",
Expand All @@ -51,7 +51,7 @@
"name":"SPDX-Package",
"documentConfidence":0
},
"comment":"## Package Information\nPackageName: Package B\nSPDXID: SPDXRef-Package-B\nPackageDownloadLocation: https://download.com\nFilesAnalyzed: True\n",
"comment":"## Package Information\nPackageName: Package B\nSPDXID: SPDXRef-Package-B\nPackageDownloadLocation: https://download.com\nFilesAnalyzed: true\n",
"packageName":"Package B",
"copyright":"None",
"licenseName":"None",
Expand Down Expand Up @@ -82,7 +82,7 @@
"name":"SPDX-Package",
"documentConfidence":0
},
"comment":"## Package Information\nPackageName: Package C\nSPDXID: SPDXRef-Package-C\nPackageDownloadLocation: https://download.com\nFilesAnalyzed: True\n",
"comment":"## Package Information\nPackageName: Package C\nSPDXID: SPDXRef-Package-C\nPackageDownloadLocation: https://download.com\nFilesAnalyzed: true\n",
"packageName":"Package C",
"copyright":"None",
"licenseName":"None",
Expand Down

0 comments on commit a2fd42c

Please sign in to comment.