Update to aas-core-meta, codegen, testgen f9cbdb3, b14237b2, 5a705a0b1 (

#42) We update the development requirements to and re-generate everything with: * [aas-core-meta f9cbdb3], * [aas-core-codegen b14237b2] and * [aas-core3.0-testgen 5a705a0b1]. Notably, we propagate the fix for AASd-109 where we change the invariant such that it checks for the consistency among properties even when a ``value`` property is missing. [aas-core-meta f9cbdb3]: aas-core-works/aas-core-meta@f9cbdb3 [aas-core-codegen b14237b2]: aas-core-works/aas-core-codegen@b14237b2 [aas-core3.0-testgen 5a705a0b1]: aas-core-works/aas-core3.0-testgen@5a705a0b1
aas-core-works · Aug 31, 2024 · 6e224b9 · 6e224b9
1 parent 00528ed
commit 6e224b9
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/dev_scripts/aas_core3/__init__.py b/dev_scripts/aas_core3/__init__.py
@@ -3,5 +3,5 @@
 
 This copy is necessary so that we can decouple from ``aas-core*-python`` repository.
 
-The revision of aas-core-codegen was: 0f7345e1
+The revision of aas-core-codegen was: b14237b2
 """
diff --git a/dev_scripts/aas_core3/verification.py b/dev_scripts/aas_core3/verification.py
@@ -3426,21 +3426,21 @@ def transform_submodel_element_list(
         if not (
             not (
                 (
-                    (that.value is not None)
-                    and (
-                        (
-                            that.type_value_list_element == aas_types.AASSubmodelElements.PROPERTY
-                            or that.type_value_list_element == aas_types.AASSubmodelElements.RANGE
-                        )
-                    )
+                    that.type_value_list_element == aas_types.AASSubmodelElements.PROPERTY
+                    or that.type_value_list_element == aas_types.AASSubmodelElements.RANGE
                 )
             )
             or (
                 (
                     (that.value_type_list_element is not None)
-                    and properties_or_ranges_have_value_type(
-                        that.value,
-                        that.value_type_list_element
+                    and (
+                        (
+                            (that.value is None)
+                            or properties_or_ranges_have_value_type(
+                                that.value,
+                                that.value_type_list_element
+                            )
+                        )
                     )
                 )
             )

diff --git a/dev_scripts/setup.py b/dev_scripts/setup.py
@@ -28,8 +28,8 @@
     keywords="asset administration shell code generation industry 4.0 industrie i4.0",
     packages=find_packages(exclude=["tests", "continuous_integration", "dev_scripts"]),
     install_requires=[
-        "aas-core-meta@git+https://github.com/aas-core-works/aas-core-meta@31d6afd#egg=aas-core-meta",
-        "aas-core-codegen@git+https://github.com/aas-core-works/aas-core-codegen@0f7345e1#egg=aas-core-codegen",
+        "aas-core-meta@git+https://github.com/aas-core-works/aas-core-meta@f9cbdb3#egg=aas-core-meta",
+        "aas-core-codegen@git+https://github.com/aas-core-works/aas-core-codegen@b14237b2#egg=aas-core-codegen",
     ],
     py_modules=["test_codegen"],
 )
diff --git a/src/AasCore.Aas3_0/verification.cs b/src/AasCore.Aas3_0/verification.cs
@@ -4295,15 +4295,15 @@ Aas.ISubmodelElementList that
 
                 if (!(
                     !(
-                        (that.Value != null)
-                        && (
-                            that.TypeValueListElement == AasSubmodelElements.Property
-                            || that.TypeValueListElement == AasSubmodelElements.Range
-                        )
+                        that.TypeValueListElement == AasSubmodelElements.Property
+                        || that.TypeValueListElement == AasSubmodelElements.Range
                     )
                     || (
                         (that.ValueTypeListElement != null)
-                        && Verification.PropertiesOrRangesHaveValueType(that.Value, that.ValueTypeListElement)
+                        && (
+                            (that.Value == null)
+                            || Verification.PropertiesOrRangesHaveValueType(that.Value, that.ValueTypeListElement)
+                        )
                     )))
                 {
                     yield return new Reporting.Error(