Merge branch 'main' into main

.github/workflows/test_and_release.yml

@@ -101,7 +101,7 @@ jobs:
     needs: test
     strategy:
       matrix:
-        python3-version: ['5', '6', '7', '8']
+        python3-version: ['6', '7', '8', '9', '10']
     steps:
     - uses: actions/checkout@v2
       with:

README.rst

@@ -102,7 +102,7 @@ Partial example: generating a C struct
         *
         * Auto-generated, do not edit.
         *
-        * Source file: {{T.source_file_path}}
+        * Source file: {{T.source_file_path | replace("\\", "\\\\")}}
         */
 
         #ifndef {{T.full_name | ln.c.macrofy}}

docs/templates.rst

@@ -397,7 +397,7 @@ given a template ``common_header.j2``::
     *
     * Auto-generated, do not edit.
     *
-    * Source file: {{T.source_file_path}}
+    * Source file: {{T.source_file_path | replace("\\", "\\\\")}}
     * Generated at: {{now_utc}}
     * Template: {{ self._TemplateReference__context.name }}
     * deprecated: {{T.deprecated}}

setup.cfg

@@ -16,11 +16,11 @@ classifiers =
     License :: OSI Approved :: MIT License
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3 :: Only
     Topic :: Scientific/Engineering
     Topic :: Software Development :: Embedded Systems
@@ -42,7 +42,7 @@ install_requires=
 
 zip_safe = False
 
-python_requires = >=3.5
+python_requires = >=3.6
 
 [options.entry_points]
 console_scripts =

src/nunavut/jinja/loaders.py

@@ -165,7 +165,13 @@ def get_templates(self) -> typing.Iterable[pathlib.Path]:
                     files.add(template)
         if self._package_loader is not None and self._templates_package_name is not None:
             templates_module = importlib.import_module(self._templates_package_name)
-            templates_base_path = pathlib.Path(templates_module.__file__).parent
+            spec_perhaps = templates_module.__spec__
+            file_perhaps = None  # type: typing.Optional[str]
+            if spec_perhaps is not None:
+                file_perhaps = spec_perhaps.origin
+            if file_perhaps is None or file_perhaps == "builtin":
+                raise RuntimeError("Unknown template package origin?")
+            templates_base_path = pathlib.Path(file_perhaps).parent
             for t in self._package_loader.list_templates():
                 files.add(templates_base_path / pathlib.Path(t))
         return sorted(files)

src/nunavut/lang/c/templates/base.j2

@@ -16,7 +16,7 @@
 // are named with an underscore at the end, like foo_bar_().
 //
 // Generator:     nunavut-{{ nunavut.version }} (serialization was {{ 'not ' * nunavut.support.omit }}enabled)
-// Source file:   {{ T.source_file_path }}
+// Source file:   {{ T.source_file_path | replace("\\", "\\\\") }}
 // Generated at:  {{ now_utc }} UTC
 // Is deprecated: {{ T.deprecated and 'yes' or 'no' }}
 // Fixed port-ID: {{ T.fixed_port_id }}
@@ -54,7 +54,7 @@
 {% endfor %}
 {% for key, value in options.items() -%}
 static_assert( {{ "NUNAVUT_SUPPORT_LANGUAGE_OPTION_{}".format(key) | ln.c.macrofy }} == {{ value | to_static_assertion_value }},
-              "{{ T.source_file_path }} is trying to use a serialization library that was compiled with "
+              "{{ T.source_file_path | replace("\\", "\\\\") }} is trying to use a serialization library that was compiled with "
               "different language options. This is dangerous and therefore not allowed." );
 {% endfor %}
 #ifdef __cplusplus

src/nunavut/lang/cpp/templates/base.j2

@@ -11,7 +11,7 @@
 // build invocation. TODO: add --reproducible option to prevent any volatile metadata from being generated.
 //
 // Generator:     nunavut-{{ nunavut.version }} (serialization was {{ 'not ' * nunavut.support.omit }}enabled)
-// Source file:   {{ T.source_file_path }}
+// Source file:   {{ T.source_file_path | replace("\\", "\\\\") }}
 // Generated at:  {{ now_utc }} UTC
 // Is deprecated: {{ T.deprecated and 'yes' or 'no' }}
 // Fixed port-ID: {{ T.fixed_port_id }}
@@ -73,7 +73,7 @@
 // +-------------------------------------------------------------------------------------------------------------------+
 {% endif -%}
 static_assert( nunavut::support::options::{{ key | id }} == {{ value | ln.c.to_static_assertion_value }},
-              "{{ T.source_file_path }} "
+              "{{ T.source_file_path | replace("\\", "\\\\") }} "
               "is trying to use a serialization library that was compiled with "
               "different language options. This is dangerous and therefore not "
               "allowed." );

src/nunavut/version.py

@@ -7,7 +7,7 @@
 .. autodata:: __version__
 """
 
-__version__ = "1.6.2"  #: The version number used in the release of nunavut to pypi.
+__version__ = "1.7.3"  #: The version number used in the release of nunavut to pypi.
 
 
 __license__ = "MIT"

test/gentest_json/templates/StructureType.j2

@@ -7,7 +7,7 @@
       {
         "name": "{{ T.short_name }}",
         "type": "{{ T | typename }}",
-        "source" : "{{ T.source_file_path }}",
+        "source" : "{{ T.source_file_path | replace("\\", "\\\\") }}",
         "fixed_port_id": {{ T.fixed_port_id }},
         "deprecated": {{ T.deprecated | ln.js.to_true_or_false }},
         "version":

tox.ini

@@ -1,17 +1,17 @@
 #
-# We test nunavut using python 3.5 - 3.9.
+# We test nunavut using python 3.6 - 3.9.
 #
 # The standard version to develop against is 3.9. We limit mypy checking
 # to 3.9 since typing is still a bit fluid accross versions.
 #
 [tox]
-envlist = {py35,py36,py37,py38,py39}-{test,nnvg,doctest,rstdoctest},lint,report,docs
+envlist = {py36,py37,py38,py39,py310}-{test,nnvg,doctest,rstdoctest},lint,report,docs
 
 
 [base]
 deps =
-    Sybil >= 2.0.1
-    pytest >= 5.4.3
+    Sybil >= 3.0.0
+    pytest >= 5.4.3, < 7.0.0
     pytest-timeout
     coverage
     types-PyYAML