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

Update to aas-core-meta, codegen, testgen cb28d18, c414f32, 6ff39c260 #23

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions aas_core3/verification.py
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ def _construct_matches_rfc_8089_path() -> Pattern[str]:
dec_octet = "([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])"
ipv4address = f"{dec_octet}\\.{dec_octet}\\.{dec_octet}\\.{dec_octet}"
ls32 = f"({h16}:{h16}|{ipv4address})"
ipv6address = f"(({h16}:){{6}}{ls32}|::({h16}:){{5}}{ls32}|({h16})?::({h16}:){{4}}{ls32}|(({h16}:)?{h16})?::({h16}:){{3}}{ls32}|(({h16}:){{2}}{h16})?::({h16}:){{2}}{ls32}|(({h16}:){{3}}{h16})?::{h16}:{ls32}|(({h16}:){{4}}{h16})?::{ls32}|(({h16}:){{5}}{h16})?::{h16}|(({h16}:){{6}}{h16})?::)"
ipv6address = f"(({h16}:){{6}}{ls32}|::({h16}:){{5}}{ls32}|({h16})?::({h16}:){{4}}{ls32}|(({h16}:)?{h16})?::({h16}:){{3}}{ls32}|(({h16}:){{0,2}}{h16})?::({h16}:){{2}}{ls32}|(({h16}:){{0,3}}{h16})?::{h16}:{ls32}|(({h16}:){{0,4}}{h16})?::{ls32}|(({h16}:){{0,5}}{h16})?::{h16}|(({h16}:){{0,6}}{h16})?::)"
unreserved = "[a-zA-Z0-9\\-._~]"
sub_delims = "[!$&'()*+,;=]"
ipvfuture = f"[vV][0-9A-Fa-f]+\\.({unreserved}|{sub_delims}|:)+"
Expand Down Expand Up @@ -307,7 +307,7 @@ def _construct_matches_bcp_47() -> Pattern[str]:
alphanum = "[a-zA-Z0-9]"
singleton = "[0-9A-WY-Za-wy-z]"
extension = f"{singleton}(-({alphanum}){{2,8}})+"
extlang = "[a-zA-Z]{3}(-[a-zA-Z]{3}){2}"
extlang = "[a-zA-Z]{3}(-[a-zA-Z]{3}){0,2}"
irregular = "(en-GB-oed|i-ami|i-bnn|i-default|i-enochian|i-hak|i-klingon|i-lux|i-mingo|i-navajo|i-pwn|i-tao|i-tay|i-tsu|sgn-BE-FR|sgn-BE-NL|sgn-CH-DE)"
regular = "(art-lojban|cel-gaulish|no-bok|no-nyn|zh-guoyu|zh-hakka|zh-min|zh-min-nan|zh-xiang)"
grandfathered = f"({irregular}|{regular})"
Expand Down Expand Up @@ -404,7 +404,7 @@ def _construct_matches_xs_any_uri() -> Pattern[str]:
dec_octet = "([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])"
ipv4address = f"{dec_octet}\\.{dec_octet}\\.{dec_octet}\\.{dec_octet}"
ls32 = f"({h16}:{h16}|{ipv4address})"
ipv6address = f"(({h16}:){{6}}{ls32}|::({h16}:){{5}}{ls32}|({h16})?::({h16}:){{4}}{ls32}|(({h16}:)?{h16})?::({h16}:){{3}}{ls32}|(({h16}:){{2}}{h16})?::({h16}:){{2}}{ls32}|(({h16}:){{3}}{h16})?::{h16}:{ls32}|(({h16}:){{4}}{h16})?::{ls32}|(({h16}:){{5}}{h16})?::{h16}|(({h16}:){{6}}{h16})?::)"
ipv6address = f"(({h16}:){{6}}{ls32}|::({h16}:){{5}}{ls32}|({h16})?::({h16}:){{4}}{ls32}|(({h16}:)?{h16})?::({h16}:){{3}}{ls32}|(({h16}:){{0,2}}{h16})?::({h16}:){{2}}{ls32}|(({h16}:){{0,3}}{h16})?::{h16}:{ls32}|(({h16}:){{0,4}}{h16})?::{ls32}|(({h16}:){{0,5}}{h16})?::{h16}|(({h16}:){{0,6}}{h16})?::)"
unreserved = "[a-zA-Z0-9\\-._~]"
ipvfuture = f"[vV][0-9A-Fa-f]+\\.({unreserved}|{sub_delims}|:)+"
ip_literal = f"\\[({ipv6address}|{ipvfuture})\\]"
Expand Down
4 changes: 2 additions & 2 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ pylint==2.15.4
coverage>=6.5.0,<7
pyinstaller>=5<6
twine
aas-core-meta@git+https://github.com/aas-core-works/aas-core-meta@79314c6#egg=aas-core-meta
aas-core-codegen@git+https://github.com/aas-core-works/aas-core-codegen@94399e1#egg=aas-core-codegen
aas-core-meta@git+https://github.com/aas-core-works/aas-core-meta@cb28d18#egg=aas-core-meta
aas-core-codegen@git+https://github.com/aas-core-works/aas-core-codegen@c414f32#egg=aas-core-codegen
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "x-Sw4u3ZDO-nJLabnE",
"language": "sr-Latn",
"text": "something_7282cc23"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "x-Sw4u3ZDO-nJLabnE",
"language": "sr-Latn",
"text": "something_7282cc23"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "x-Sw4u3ZDO-nJLabnE",
"language": "sr-Latn",
"text": "something_7282cc23"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "x-Sw4u3ZDO-nJLabnE",
"language": "sr-Latn",
"text": "something_7282cc23"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "x-Sw4u3ZDO-nJLabnE",
"language": "sr-Latn",
"text": "something_7282cc23"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "x-Sw4u3ZDO-nJLabnE",
"language": "sr-Latn",
"text": "something_7282cc23"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "x-Sw4u3ZDO-nJLabnE",
"language": "sr-Latn",
"text": "something_7282cc23"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "x-Sw4u3ZDO-nJLabnE",
"language": "sr-Latn",
"text": "something_7282cc23"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "x-Sw4u3ZDO-nJLabnE",
"language": "sr-Latn",
"text": "something_7282cc23"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "x-Sw4u3ZDO-nJLabnE",
"language": "sr-Latn",
"text": "something_7282cc23"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "x-Sw4u3ZDO-nJLabnE",
"language": "sr-Latn",
"text": "something_7282cc23"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "x-Sw4u3ZDO-nJLabnE",
"language": "sr-Latn",
"text": "something_7282cc23"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "x-Sw4u3ZDO-nJLabnE",
"language": "sr-Latn",
"text": "something_7282cc23"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "x-Sw4u3ZDO-nJLabnE",
"language": "sr-Latn",
"text": "something_7282cc23"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "x-Sw4u3ZDO-nJLabnE",
"language": "sr-Latn",
"text": "something_7282cc23"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "x-Sw4u3ZDO-nJLabnE",
"language": "sr-Latn",
"text": "something_7282cc23"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "x-Sw4u3ZDO-nJLabnE",
"language": "sr-Latn",
"text": "something_7282cc23"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "x-Sw4u3ZDO-nJLabnE",
"language": "sr-Latn",
"text": "something_7282cc23"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "x-Sw4u3ZDO-nJLabnE",
"language": "sr-Latn",
"text": "something_7282cc23"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
"category": "something_d7cf2dff",
"description": [
{
"language": "en",
"language": "es-419",
"text": "something_be9deae0"
}
],
"displayName": [
{
"language": "Tvwqa-500-8EQd-y-8f5-k-vqdMn7-Ohw9-CcA628-DHKP-hPAjUZ-cnr1REUf-S8-p-9X0r-wtCI-KunG3uzI-7dGUsrTu-fY7-C3-hFN-Y-ML69DgnJ-0-Y0H-TLACBVB-Z0HRibbz-yzSf8dvR-zAn-B-6h8VjcKX-jnwR-0Z8l-ghRIZ7mo-wZG7-zXHdSIV-Oy-8dH00A6L-nJY2dA1-57o8dQ-RpxkBTbE-qBJR-M-DyGDA3U-aguRfIhj-x-XmO-1u",
"language": "zh-CN-a-myext-x-private",
"text": "something_535aeb51"
}
],
Expand All @@ -39,7 +39,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "X-33DQI-g",
"language": "sl-rozaj-biske",
"text": "something_7e795ee2"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
"category": "something_d7cf2dff",
"description": [
{
"language": "en",
"language": "es-419",
"text": "something_be9deae0"
}
],
"displayName": [
{
"language": "Tvwqa-500-8EQd-y-8f5-k-vqdMn7-Ohw9-CcA628-DHKP-hPAjUZ-cnr1REUf-S8-p-9X0r-wtCI-KunG3uzI-7dGUsrTu-fY7-C3-hFN-Y-ML69DgnJ-0-Y0H-TLACBVB-Z0HRibbz-yzSf8dvR-zAn-B-6h8VjcKX-jnwR-0Z8l-ghRIZ7mo-wZG7-zXHdSIV-Oy-8dH00A6L-nJY2dA1-57o8dQ-RpxkBTbE-qBJR-M-DyGDA3U-aguRfIhj-x-XmO-1u",
"language": "zh-CN-a-myext-x-private",
"text": "something_535aeb51"
}
],
Expand All @@ -39,7 +39,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "X-33DQI-g",
"language": "sl-rozaj-biske",
"text": "something_7e795ee2"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
"category": "something_d7cf2dff",
"description": [
{
"language": "en",
"language": "es-419",
"text": "something_be9deae0"
}
],
"displayName": [
{
"language": "Tvwqa-500-8EQd-y-8f5-k-vqdMn7-Ohw9-CcA628-DHKP-hPAjUZ-cnr1REUf-S8-p-9X0r-wtCI-KunG3uzI-7dGUsrTu-fY7-C3-hFN-Y-ML69DgnJ-0-Y0H-TLACBVB-Z0HRibbz-yzSf8dvR-zAn-B-6h8VjcKX-jnwR-0Z8l-ghRIZ7mo-wZG7-zXHdSIV-Oy-8dH00A6L-nJY2dA1-57o8dQ-RpxkBTbE-qBJR-M-DyGDA3U-aguRfIhj-x-XmO-1u",
"language": "zh-CN-a-myext-x-private",
"text": "something_535aeb51"
}
],
Expand All @@ -39,7 +39,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "X-33DQI-g",
"language": "sl-rozaj-biske",
"text": "something_7e795ee2"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
"category": "something_d7cf2dff",
"description": [
{
"language": "en",
"language": "es-419",
"text": "something_be9deae0"
}
],
"displayName": [
{
"language": "Tvwqa-500-8EQd-y-8f5-k-vqdMn7-Ohw9-CcA628-DHKP-hPAjUZ-cnr1REUf-S8-p-9X0r-wtCI-KunG3uzI-7dGUsrTu-fY7-C3-hFN-Y-ML69DgnJ-0-Y0H-TLACBVB-Z0HRibbz-yzSf8dvR-zAn-B-6h8VjcKX-jnwR-0Z8l-ghRIZ7mo-wZG7-zXHdSIV-Oy-8dH00A6L-nJY2dA1-57o8dQ-RpxkBTbE-qBJR-M-DyGDA3U-aguRfIhj-x-XmO-1u",
"language": "zh-CN-a-myext-x-private",
"text": "something_535aeb51"
}
],
Expand All @@ -39,7 +39,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "X-33DQI-g",
"language": "sl-rozaj-biske",
"text": "something_7e795ee2"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
"category": "something_d7cf2dff",
"description": [
{
"language": "en",
"language": "es-419",
"text": "something_be9deae0"
}
],
"displayName": [
{
"language": "Tvwqa-500-8EQd-y-8f5-k-vqdMn7-Ohw9-CcA628-DHKP-hPAjUZ-cnr1REUf-S8-p-9X0r-wtCI-KunG3uzI-7dGUsrTu-fY7-C3-hFN-Y-ML69DgnJ-0-Y0H-TLACBVB-Z0HRibbz-yzSf8dvR-zAn-B-6h8VjcKX-jnwR-0Z8l-ghRIZ7mo-wZG7-zXHdSIV-Oy-8dH00A6L-nJY2dA1-57o8dQ-RpxkBTbE-qBJR-M-DyGDA3U-aguRfIhj-x-XmO-1u",
"language": "zh-CN-a-myext-x-private",
"text": "something_535aeb51"
}
],
Expand All @@ -39,7 +39,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "X-33DQI-g",
"language": "sl-rozaj-biske",
"text": "something_7e795ee2"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
"category": "something_d7cf2dff",
"description": [
{
"language": "en",
"language": "es-419",
"text": "something_be9deae0"
}
],
"displayName": [
{
"language": "Tvwqa-500-8EQd-y-8f5-k-vqdMn7-Ohw9-CcA628-DHKP-hPAjUZ-cnr1REUf-S8-p-9X0r-wtCI-KunG3uzI-7dGUsrTu-fY7-C3-hFN-Y-ML69DgnJ-0-Y0H-TLACBVB-Z0HRibbz-yzSf8dvR-zAn-B-6h8VjcKX-jnwR-0Z8l-ghRIZ7mo-wZG7-zXHdSIV-Oy-8dH00A6L-nJY2dA1-57o8dQ-RpxkBTbE-qBJR-M-DyGDA3U-aguRfIhj-x-XmO-1u",
"language": "zh-CN-a-myext-x-private",
"text": "something_535aeb51"
}
],
Expand All @@ -39,7 +39,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "X-33DQI-g",
"language": "sl-rozaj-biske",
"text": "something_7e795ee2"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
"category": "something_d7cf2dff",
"description": [
{
"language": "en",
"language": "es-419",
"text": "something_be9deae0"
}
],
"displayName": [
{
"language": "Tvwqa-500-8EQd-y-8f5-k-vqdMn7-Ohw9-CcA628-DHKP-hPAjUZ-cnr1REUf-S8-p-9X0r-wtCI-KunG3uzI-7dGUsrTu-fY7-C3-hFN-Y-ML69DgnJ-0-Y0H-TLACBVB-Z0HRibbz-yzSf8dvR-zAn-B-6h8VjcKX-jnwR-0Z8l-ghRIZ7mo-wZG7-zXHdSIV-Oy-8dH00A6L-nJY2dA1-57o8dQ-RpxkBTbE-qBJR-M-DyGDA3U-aguRfIhj-x-XmO-1u",
"language": "zh-CN-a-myext-x-private",
"text": "something_535aeb51"
}
],
Expand All @@ -39,7 +39,7 @@
"modelType": "DataSpecificationIec61360",
"preferredName": [
{
"language": "X-33DQI-g",
"language": "sl-rozaj-biske",
"text": "something_7e795ee2"
},
{
Expand Down
Loading
Loading