Skip to content

Commit 0867eb7

Browse files
Switch to the SAMM 2.2.0
1 parent 26171ec commit 0867eb7

File tree

50 files changed

+471
-255
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+471
-255
lines changed

.github/workflows/push_request_check.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ jobs:
3737
poetry run download-samm-release
3838
poetry build
3939
40+
- name: download test aspect models
41+
run: |
42+
cd core/esmf-aspect-meta-model-python
43+
poetry run download-test-models
44+
4045
- name: run tests
4146
run: |
4247
cd core/esmf-aspect-meta-model-python

core/esmf-aspect-meta-model-python/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ SAMMUnitsGraph is a class contains functions for accessing units of measurement.
116116
from esmf_aspect_meta_model_python.samm_meta_model import units
117117

118118
unit_name = "unit:volt"
119-
units.print_description(units.get_info(unit_name))
119+
units.print_info(units.get_info(unit_name))
120120
# preferredName: volt
121121
# commonCode: VLT
122122
# ...
@@ -126,7 +126,7 @@ units.print_description(units.get_info(unit_name))
126126
volt_info = units.get_info("unit:volt")
127127
# {'preferredName': rdflib.term.Literal('volt', lang='en'), 'commonCode': rdflib.term.Literal('VLT'), ... }
128128

129-
units.print_description(volt_info)
129+
units.print_info(volt_info)
130130
# preferredName: volt
131131
# commonCode: VLT
132132
# ...

core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/base/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,13 @@ HasUrn
3838
│ ├── LocaleConstraint
3939
│ ├── RangeConstraint
4040
│ └── RegularExpressionConstraint
41+
├── Namespace
4142
├── Event
4243
├── Operation
4344
├── Property
4445
├── QuantityKind
45-
└── Unit
46+
├── Unit
47+
└── Value
4648
4749
BoundDefiniton
4850
```

core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/base/__init__.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
from .characteristics.state import State
2828
from .characteristics.structured_value import StructuredValue
2929
from .characteristics.trait import Trait
30-
from .contraints.constraint import Constraint
31-
from .contraints.encoding_constraint import EncodingConstraint
32-
from .contraints.fixed_point_constraint import FixedPointConstraint
33-
from .contraints.language_constraint import LanguageConstraint
34-
from .contraints.length_constraint import LengthConstraint
35-
from .contraints.locale_constraint import LocaleConstraint
36-
from .contraints.range_constraint import RangeConstraint
37-
from .contraints.regular_expression_constraint import RegularExpressionConstraint
30+
from .constraints.constraint import Constraint
31+
from .constraints.encoding_constraint import EncodingConstraint
32+
from .constraints.fixed_point_constraint import FixedPointConstraint
33+
from .constraints.language_constraint import LanguageConstraint
34+
from .constraints.length_constraint import LengthConstraint
35+
from .constraints.locale_constraint import LocaleConstraint
36+
from .constraints.range_constraint import RangeConstraint
37+
from .constraints.regular_expression_constraint import RegularExpressionConstraint
3838
from .data_types.abstract_entity import AbstractEntity
3939
from .data_types.complex_type import ComplexType
4040
from .data_types.data_type import DataType

core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/base/characteristics/trait.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
from esmf_aspect_meta_model_python.base.characteristics.characteristic import Characteristic
1616

17-
from ..contraints import constraint
17+
from ..constraints import constraint
1818

1919

2020
class Trait(Characteristic, ABC):

core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/base/contraints/__init__.py renamed to core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/base/constraints/__init__.py

File renamed without changes.

core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/base/contraints/constraint.py renamed to core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/base/constraints/constraint.py

File renamed without changes.

core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/base/contraints/encoding_constraint.py renamed to core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/base/constraints/encoding_constraint.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
from abc import ABC, abstractmethod
1313

14-
from esmf_aspect_meta_model_python.base.contraints.constraint import Constraint
14+
from esmf_aspect_meta_model_python.base.constraints.constraint import Constraint
1515

1616

1717
class EncodingConstraint(Constraint, ABC):

core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/base/contraints/fixed_point_constraint.py renamed to core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/base/constraints/fixed_point_constraint.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
from abc import ABC, abstractmethod
1313

14-
from esmf_aspect_meta_model_python.base.contraints.constraint import Constraint
14+
from esmf_aspect_meta_model_python.base.constraints.constraint import Constraint
1515

1616

1717
class FixedPointConstraint(Constraint, ABC):

core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/base/contraints/language_constraint.py renamed to core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/base/constraints/language_constraint.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
from abc import ABC, abstractmethod
1313

14-
from esmf_aspect_meta_model_python.base.contraints.constraint import Constraint
14+
from esmf_aspect_meta_model_python.base.constraints.constraint import Constraint
1515

1616

1717
class LanguageConstraint(Constraint, ABC):

0 commit comments

Comments
 (0)