Skip to content
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.

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

model.base: Rename ModelingKind to ModellingKind #104

Merged
merged 3 commits into from
Aug 24, 2023

Conversation

s-heppner
Copy link
Contributor

In version 3.0 the Enum ModelingKind has been
renamed to ModellingKind.
This commit renames the class definition and all
its occurences in the code.

See also here in the Spec

In version 3.0 the Enum `ModelingKind` has been
renamed to `ModellingKind`.
This commit renames the class definition and all
its occurences in the code.
@s-heppner
Copy link
Contributor Author

s-heppner commented Aug 11, 2023

Note, that the failing CI is due to a mypy error, that seems to have nothing to do with the renaming.
I fixed the error in #105

Copy link
Contributor

@jkhsjdhjs jkhsjdhjs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM other than the three instances of Modeling. Can you check all sources for possible other instances of Modeling so we're consistent in this regard?

basyx/aas/adapter/xml/xml_deserialization.py Outdated Show resolved Hide resolved
@@ -388,15 +388,15 @@ def _child_text_mandatory_mapped(parent: etree.Element, child_tag: str, dct: Dic
return _get_text_mandatory_mapped(_get_child_mandatory(parent, child_tag), dct)


def _get_modeling_kind(element: etree.Element) -> model.ModelingKind:
def _get_kind(element: etree.Element) -> model.ModellingKind:
"""
Returns the modeling kind of an element with the default value INSTANCE, if none specified.

:param element: The xml element.
:return: The modeling kind of the element.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and here another

basyx/aas/model/base.py Outdated Show resolved Hide resolved
@s-heppner s-heppner merged commit 12156ca into eclipse-basyx:improve/V30 Aug 24, 2023
6 checks passed
@s-heppner s-heppner deleted the Rename/ModelingKind branch August 24, 2023 07:31
@s-heppner s-heppner added the v3.0 label Nov 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants