Skip to content

Commit

Permalink
Update to aas-core-meta, codegen 4d7e59e, af4f43a (#15)
Browse files Browse the repository at this point in the history
We update the development requirements to and re-generate everything
with:
* [aas-core-meta 4d7e59e], and
* [aas-core-codegen af4f43a].

Notably, this includes two important fixes from aas-core-meta:

* [V3 Fix AASc-3a-010-for-NAND (#281)], and
* [V3 Fix inclusive OR in AASd-131 (#280)].

[aas-core-meta 4d7e59e]: aas-core-works/aas-core-meta@4d7e59e
[aas-core-codegen af4f43a]: aas-core-works/aas-core-codegen@af4f43a
[V3 Fix AASc-3a-010-for-NAND (#281)]: aas-core-works/aas-core-meta#281
[V3 Fix inclusive OR in AASd-131 (#280)]: aas-core-works/aas-core-meta#280
  • Loading branch information
mristin authored Sep 8, 2023
1 parent bf3720d commit 9b43de2
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 25 deletions.
2 changes: 1 addition & 1 deletion aas_core3/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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: e2b793f
The revision of aas-core-codegen was: af4f43a
"""
30 changes: 8 additions & 22 deletions aas_core3/verification.py
Original file line number Diff line number Diff line change
Expand Up @@ -2461,15 +2461,12 @@ def transform_asset_information(
(
(
(that.global_asset_id is not None)
and (that.specific_asset_ids is None)
or (that.specific_asset_ids is not None)
)
)
or (
(
(that.global_asset_id is None)
and (that.specific_asset_ids is not None)
and len(that.specific_asset_ids) >= 1
)
and (
not (that.specific_asset_ids is not None)
or (len(that.specific_asset_ids) >= 1)
)
)
):
Expand Down Expand Up @@ -8062,21 +8059,10 @@ def transform_data_specification_iec_61360(
that: aas_types.DataSpecificationIEC61360
) -> Iterator[Error]:
if not (
(
(
(
(that.value is not None)
and (that.value_list is None)
)
)
or (
(
(that.value is None)
and (that.value_list is not None)
and len(that.value_list.value_reference_pairs) >= 1
)
)
)
not ((
(that.value is not None)
and (that.value_list is not None)
))
):
yield Error(
'Constraint AASc-3a-010: If value is not empty then value ' +
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"pydocstyle>=2.1.1<3",
"coverage>=6,<7",
"twine",
"aas-core-meta@git+https://github.com/aas-core-works/aas-core-meta@44756fb#egg=aas-core-meta",
"aas-core-codegen@git+https://github.com/aas-core-works/aas-core-codegen@e2b793f#egg=aas-core-codegen",
"aas-core-meta@git+https://github.com/aas-core-works/aas-core-meta@4d7e59e#egg=aas-core-meta",
"aas-core-codegen@git+https://github.com/aas-core-works/aas-core-codegen@af4f43a#egg=aas-core-codegen",
"hypothesis==6.46.3",
"xmlschema==1.10.0",
"jsonschema==4.17.3",
Expand Down

0 comments on commit 9b43de2

Please sign in to comment.