Merge branch '3.0.preview' into sshirokov/3.0.preview_cpp20_pmr

OpenCyphal · Oct 14, 2024 · 85e2c0a · 85e2c0a
2 parents 5a84a8e + 3dfb17e
commit 85e2c0a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -99,11 +99,11 @@ jobs:
           -Dsonar.python.coverage.reportPaths=.tox/report/tmp/coverage.xml
           -Dsonar.python.xunit.reportPath=.tox/py310-test/tmp/xunit-result.xml
 
-  compat-test-python3-windows-and-mac:
+  compat-test-python3-mac:
     strategy:
       matrix:
         python3-version: ['11','12']
-        python3-platform: ['windows-latest', 'macos-latest']
+        python3-platform: ['macos-latest']
     runs-on: ${{ matrix.python3-platform }}
     needs: test
     steps:
@@ -273,3 +273,4 @@ jobs:
         nox
       env:
         FORCE_COLOR: 1
+      continue-on-error: true
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,7 +2,7 @@
     "python.testing.cwd": "${workspaceFolder}",
     "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true,
-    "python.testing.pytestArgs": ["-vv"],
+    "python.testing.pytestArgs": ["-v"],
     "pylint.args": [
         "--rcfile=${workspaceFolder}/tox.ini"
     ],

diff --git a/src/nunavut/cli/parsers.py b/src/nunavut/cli/parsers.py
@@ -208,7 +208,7 @@ def _parse_target_paths(
                     "/two/to/file.dsdl",
                     "three/path/four:to/file.dsdl",
                     "/five/path/six:to/file.dsdl",
-                    "seven/path/eight\\:to/file.dsdl",
+                    "seven/path/eight\\\\:to/file.dsdl",
                     "/nine/path/ten/:to/file.dsdl",
                 ],
                 False,
@@ -225,7 +225,7 @@ def _parse_target_paths(
             assert Path("/two/to/file.dsdl") in target_files
             assert Path("four/to/file.dsdl") in target_files
             assert Path("six/to/file.dsdl") in target_files
-            assert Path("seven/path/eight\\:to/file.dsdl") in target_files
+            assert Path("seven/path/eight\\\\:to/file.dsdl") in target_files
             assert Path("ten/to/file.dsdl") in target_files
 
             # Happy path: default root path, no dependencies

diff --git a/src/nunavut/jinja/environment.py b/src/nunavut/jinja/environment.py
@@ -478,7 +478,7 @@ def set_language_context(self, lctx: LanguageContext) -> None:
             {
                 "omit": omit_serialization,  # deprecated. Use "options.omit_serialization_support".
                 "namespace": ".".join(support_namespace),
-                "version": f"{support_version[0]}.{support_version[1]}.{support_version[2]}",
+                "version": (support_version[0], support_version[1], support_version[2]),
             },
         )
 

diff --git a/src/nunavut/lang/_common.py b/src/nunavut/lang/_common.py
@@ -212,7 +212,7 @@ class TokenEncoder:
             token_encoding_rules_by_identifier_type = {
                 'all':
                     [
-                        '(^\\d{1})|([^a-zA-Z0-9_]+)'
+                        '(^\\\\d{1})|([^a-zA-Z0-9_]+)'
                     ]
             }
             whitespace_encoding_char = '_'
@@ -272,7 +272,7 @@ class TokenEncoder:
         token_encoding_rules_by_identifier_type = {
             'all':
                 [
-                    '(^\\d{1})|([^a-zA-Z0-9_]+)',
+                    '(^\\\\d{1})|([^a-zA-Z0-9_]+)',
                     '^(__)|(^(_)[A-Z])'
                 ]
         }