Skip to content

SPDX3: rename ProfileIdentifier to ProfileIdentifierType #727

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

Merged
merged 1 commit into from
Jul 12, 2023
Merged

SPDX3: rename ProfileIdentifier to ProfileIdentifierType #727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 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 @@ -7,7 +7,7 @@
from spdx_tools.spdx3.bump_from_spdx2.actor import bump_actor
from spdx_tools.spdx3.bump_from_spdx2.external_document_ref import bump_external_document_ref
from spdx_tools.spdx3.bump_from_spdx2.message import print_missing_conversion
from spdx_tools.spdx3.model import CreationInfo, ProfileIdentifier, SpdxDocument
from spdx_tools.spdx3.model import CreationInfo, ProfileIdentifierType, SpdxDocument
from spdx_tools.spdx3.payload import Payload
from spdx_tools.spdx.model.actor import ActorType
from spdx_tools.spdx.model.document import CreationInfo as Spdx2_CreationInfo
Expand Down Expand Up @@ -40,7 +40,7 @@ def bump_creation_info(spdx2_creation_info: Spdx2_CreationInfo, payload: Payload
spec_version=Version("3.0.0"),
created=spdx2_creation_info.created,
created_by=[],
profile=[ProfileIdentifier.CORE, ProfileIdentifier.SOFTWARE, ProfileIdentifier.LICENSING],
profile=[ProfileIdentifierType.CORE, ProfileIdentifierType.SOFTWARE, ProfileIdentifierType.LICENSING],
data_license="https://spdx.org/licenses/" + spdx2_creation_info.data_license,
)

Expand Down
2 changes: 1 addition & 1 deletion src/spdx_tools/spdx3/model/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: 2023 spdx contributors
#
# SPDX-License-Identifier: Apache-2.0
from spdx_tools.spdx3.model.profile_identifier import ProfileIdentifier
from spdx_tools.spdx3.model.profile_identifier import ProfileIdentifierType
from spdx_tools.spdx3.model.creation_info import CreationInfo
from spdx_tools.spdx3.model.integrity_method import IntegrityMethod
from spdx_tools.spdx3.model.hash import Hash, HashAlgorithm
Expand Down
6 changes: 3 additions & 3 deletions src/spdx_tools/spdx3/model/creation_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@

from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
from spdx_tools.common.typing.type_checks import check_types_and_set_values
from spdx_tools.spdx3.model import ProfileIdentifier
from spdx_tools.spdx3.model import ProfileIdentifierType


@dataclass_with_properties
class CreationInfo:
spec_version: Version
created: datetime
created_by: List[str] # SPDXID of Agents
profile: List[ProfileIdentifier]
profile: List[ProfileIdentifierType]
data_license: Optional[str] = "CC0-1.0"
created_using: List[str] = field(default_factory=list) # SPDXID of Tools
comment: Optional[str] = None
Expand All @@ -27,7 +27,7 @@ def __init__(
spec_version: Version,
created: datetime,
created_by: List[str],
profile: List[ProfileIdentifier],
profile: List[ProfileIdentifierType],
data_license: Optional[str] = "CC0-1.0",
created_using: List[str] = None,
comment: Optional[str] = None,
Expand Down
2 changes: 1 addition & 1 deletion src/spdx_tools/spdx3/model/profile_identifier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from enum import Enum, auto


class ProfileIdentifier(Enum):
class ProfileIdentifierType(Enum):
CORE = auto()
SOFTWARE = auto()
LICENSING = auto()
Expand Down
8 changes: 4 additions & 4 deletions tests/spdx3/bump/test_actor_bump.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
ExternalIdentifierType,
Organization,
Person,
ProfileIdentifier,
ProfileIdentifierType,
Tool,
)
from spdx_tools.spdx3.payload import Payload
Expand All @@ -37,7 +37,7 @@
def test_bump_actor(actor_type, actor_name, actor_mail, element_type, new_spdx_id):
payload = Payload()
document_namespace = "https://doc.namespace"
creation_info = CreationInfo(Version("3.0.0"), datetime(2022, 1, 1), ["Creator"], [ProfileIdentifier.CORE])
creation_info = CreationInfo(Version("3.0.0"), datetime(2022, 1, 1), ["Creator"], [ProfileIdentifierType.CORE])
actor = Actor(actor_type, actor_name, actor_mail)

agent_or_tool_id = bump_actor(actor, payload, document_namespace, creation_info)
Expand All @@ -54,8 +54,8 @@ def test_bump_actor(actor_type, actor_name, actor_mail, element_type, new_spdx_i


def test_bump_actor_that_already_exists():
creation_info_old = CreationInfo(Version("3.0.0"), datetime(2022, 1, 1), ["Creator"], [ProfileIdentifier.CORE])
creation_info_new = CreationInfo(Version("3.0.0"), datetime(2023, 2, 2), ["Creator"], [ProfileIdentifier.CORE])
creation_info_old = CreationInfo(Version("3.0.0"), datetime(2022, 1, 1), ["Creator"], [ProfileIdentifierType.CORE])
creation_info_new = CreationInfo(Version("3.0.0"), datetime(2023, 2, 2), ["Creator"], [ProfileIdentifierType.CORE])

name = "some name"
document_namespace = "https://doc.namespace"
Expand Down
4 changes: 2 additions & 2 deletions tests/spdx3/fixtures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
NamespaceMap,
Organization,
Person,
ProfileIdentifier,
ProfileIdentifierType,
Relationship,
RelationshipCompleteness,
RelationshipType,
Expand Down Expand Up @@ -93,7 +93,7 @@ def creation_info_fixture(
["https://spdx.test/tools-python/creation_info_created_using"] if created_using is None else created_using
)
profile = (
[ProfileIdentifier.CORE, ProfileIdentifier.SOFTWARE, ProfileIdentifier.LICENSING]
[ProfileIdentifierType.CORE, ProfileIdentifierType.SOFTWARE, ProfileIdentifierType.LICENSING]
if profile is None
else profile
)
Expand Down
8 changes: 4 additions & 4 deletions tests/spdx3/model/test_creation_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import pytest
from semantic_version import Version

from spdx_tools.spdx3.model import CreationInfo, ProfileIdentifier
from spdx_tools.spdx3.model import CreationInfo, ProfileIdentifierType
from tests.spdx3.fixtures import creation_info_fixture
from tests.spdx3.model.model_test_utils import get_property_names

Expand All @@ -22,9 +22,9 @@ def test_correct_initialization():
assert creation_info.created_by == ["https://spdx.test/tools-python/creation_info_created_by"]
assert creation_info.created_using == ["https://spdx.test/tools-python/creation_info_created_using"]
assert creation_info.profile == [
ProfileIdentifier.CORE,
ProfileIdentifier.SOFTWARE,
ProfileIdentifier.LICENSING,
ProfileIdentifierType.CORE,
ProfileIdentifierType.SOFTWARE,
ProfileIdentifierType.LICENSING,
]
assert creation_info.data_license == "CC0-1.0"
assert creation_info.comment == "creationInfoComment"
Expand Down