8000 Update spdx3.model to SPDX v3.0.1 by bact · Pull Request #829 · spdx/tools-python · GitHub
[go: up one dir, main page]
Skip to content

Update spdx3.model to SPDX v3.0.1 #829

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

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
Open

Update spdx3.model to SPDX v3.0.1 #829

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
97af8bf
Rename property and class names ti v3.0.1 ones
bact Oct 8, 2024
c26622b
Update sensitivePeronsalInformation
bact Oct 8, 2024
5359001
Complete SPDX 3 vocab entries; fix 3.0.1 names
bact Oct 9, 2024
f5c497a
imports -> import_
bact Oct 9, 2024
7ceb41e
concludedLicense -> hasConcludedLicense
bact Oct 9, 2024
4ec00b2
Remove temp file
bact Oct 9, 2024
c790b77
Update RelationshipType
bact Oct 9, 2024
0cfd4dc
Fix console.core imports
bact Oct 9, 2024
c8881fa
ExternalReference -> ExternalRef; Simplify imports
bact Oct 9, 2024
4cf5cd1
Revert changes for spdx2
bact Oct 9, 2024
69a7a8a
Update IRI for ProfileIdentifierType
bact Oct 9, 2024
b253cc0
Add notes on context file
bact Oct 10, 2024
6cc2e85
Upload generated context.json and SPDX_OWL.json
bact Oct 10, 2024
5bcf53a
ADLER32 is now supported
bact Oct 10, 2024
147315b
Add __all__ to licensing __init__.py
bact Oct 10, 2024
deb707c
Fix type in relationship_mapping; Simplify bump_from_spdx2 imports
bact Oct 10, 2024
743fe58
Pass all tests
bact Oct 10, 2024
bf38e9e
Remove dummy_path
bact Oct 10, 2024
4ebecf0
Add dummy_path dir from pytest to gitignore
bact Oct 10, 2024
05e7273
Sort imports
bact Oct 10, 2024
f8fecee
Update notes on context file
bact Oct 10, 2024
9cb8b16
Add PresenceType, SupportType, FileKindType
bact Oct 11, 2024
88cb4ed
Add profileConformance
bact Oct 11, 2024
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
Prev Previous commit
Next Next commit
Remove temp file 
Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
  • Loading branch information
@bact
bact committed Oct 9, 2024
commit 4ec00b2af5a47253f2ecdb35f54ffef56effae08
2 changes: 1 addition & 1 deletion src/spdx_tools/spdx3/bump_from_spdx2/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# SPDX-FileCopyrightText: 2024 The SPDX Contributors
# SPDX-License-Identifier: Apache-2.0
# SPDX-FileCopyrightText: 2024 The SPDX Contributors
10 changes: 5 additions & 5 deletions src/spdx_tools/spdx3/bump_from_spdx2/creation_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def bump_creation_info(spdx2_creation_info: Spdx2_CreationInfo, payload: Payload

print_missing_conversion("creation_info.document_namespace", 0, "https://github.com/spdx/spdx-3-model/issues/87")

namespace, import_ = (
namespaces, imports = (
zip(
*[
bump_external_document_ref(external_document_ref)
Expand All @@ -29,8 +29,8 @@ def bump_creation_info(spdx2_creation_info: Spdx2_CreationInfo, payload: Payload
if spdx2_creation_info.external_document_refs
else ([], [])
)
namespace = list(namespace)
import_ = list(import_)
namespaces = list(namespaces) # namespaces from spdx2
imports = list(imports) # imports from spdx2
print_missing_conversion(
"creation_info.license_list_version",
0,
Expand Down Expand Up @@ -74,6 +74,6 @@ def bump_creation_info(spdx2_creation_info: Spdx2_CreationInfo, payload: Payload
comment=spdx2_creation_info.document_comment,
element=[],
root_element=[],
import_=import_,
namespace=namespace,
import_=imports,
namespace=namespaces,
)
Loading
0