From a1b8e9493e4653a74dac2fc6bf0508b98ec64a58 Mon Sep 17 00:00:00 2001 From: Sergei Date: Tue, 27 Aug 2024 03:14:08 +0300 Subject: [PATCH 1/4] Add `FullNameAndVersion` to c++ --- .github/workflows/release.yml | 2 +- src/nunavut/_version.py | 2 +- src/nunavut/lang/cpp/templates/_composite_type.j2 | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 89f200dc..57f784b9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: - name: version-check # Fails the release if the release-tag doesn't match the Nunavut version at that tag. run: | - $(./.github/verify.py -vv --version-check-only "2.3.4.dev0") + $(./.github/verify.py -vv --version-check-only "2.3.5.dev0") - name: lint run: tox -e lint - name: test-nnvg diff --git a/src/nunavut/_version.py b/src/nunavut/_version.py index 3ea73c91..3182b13c 100644 --- a/src/nunavut/_version.py +++ b/src/nunavut/_version.py @@ -8,7 +8,7 @@ .. autodata:: __version__ """ -__version__ = "2.3.4.dev0" +__version__ = "2.3.5.dev0" __license__ = "MIT" __author__ = "OpenCyphal" __copyright__ = "Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. Copyright (c) 2023 OpenCyphal." diff --git a/src/nunavut/lang/cpp/templates/_composite_type.j2 b/src/nunavut/lang/cpp/templates/_composite_type.j2 index 63fbbe71..db81c16c 100644 --- a/src/nunavut/lang/cpp/templates/_composite_type.j2 +++ b/src/nunavut/lang/cpp/templates/_composite_type.j2 @@ -52,10 +52,11 @@ struct {% if composite_type.deprecated -%} static constexpr bool IsService = false; static constexpr bool IsRequest = {{ (composite_type == T.request_type) | string | lower }}; static constexpr bool IsResponse = {{ (composite_type == T.response_type) | string | lower }}; -{%- else %} +{% else %} static constexpr bool IsServiceType = false; -{% endif -%} - {%- assert composite_type.extent % 8 == 0 %} +{% endif %} + static constexpr char FullNameAndVersion[] = "{{ composite_type }}"; + {% assert composite_type.extent % 8 == 0 %} {%- assert composite_type.inner_type.extent % 8 == 0 %} /// Extent is the minimum amount of memory required to hold any serialized representation of any compatible /// version of the data type; or, on other words, it is the the maximum possible size of received objects of this type. From 3aca5015ef420f163ec5edb21b44b76f56c010ea Mon Sep 17 00:00:00 2001 From: Sergei Shirokov Date: Wed, 28 Aug 2024 10:19:28 +0300 Subject: [PATCH 2/4] try fix build --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 53265bf5..b29ab31f 100644 --- a/tox.ini +++ b/tox.ini @@ -187,7 +187,7 @@ deps = Pygments mypy lxml - types-pkg_resources + types-setuptools types-PyYAML commands = From e63f22ff5c5ef039f673aecb337ccc43154e8965 Mon Sep 17 00:00:00 2001 From: Sergei Shirokov Date: Wed, 28 Aug 2024 10:22:12 +0300 Subject: [PATCH 3/4] try to fix build --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0ff21fcf..09509902 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Python dev environment", - "image": "ghcr.io/opencyphal/toxic:tx22.4.2", + "image": "ghcr.io/opencyphal/toxic:tx22.4.10", "workspaceFolder": "/workspace", "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind,consistency=delegated", "mounts": [ From 0d9621b89077ba6015944fb2dbfe0821dc9a65e6 Mon Sep 17 00:00:00 2001 From: Sergei Shirokov Date: Wed, 28 Aug 2024 10:35:19 +0300 Subject: [PATCH 4/4] revert back to 22.4.2 --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 09509902..0ff21fcf 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Python dev environment", - "image": "ghcr.io/opencyphal/toxic:tx22.4.10", + "image": "ghcr.io/opencyphal/toxic:tx22.4.2", "workspaceFolder": "/workspace", "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind,consistency=delegated", "mounts": [