powertrain-build 1.5.2.dev1__tar.gz → 1.5.3.dev2__tar.gz

{powertrain_build-1.5.2.dev1 → powertrain_build-1.5.3.dev2}/ChangeLog

@@ -1,7 +1,13 @@
 CHANGES
 =======
 
-* Add ports to runnables/reads and writes key
+* Continuation of new RTE checkpoint interface
+* New RTE checkpoint interface
+
+1.5.2
+-----
+
+* Revert "Set error\_handling true for e2eStatus signals"
 
 1.5.1
 -----

{powertrain_build-1.5.2.dev1 → powertrain_build-1.5.3.dev2}/NOTICE

@@ -13,7 +13,7 @@ Notices Report Content
 Components: 
 
 Coverage 7.8.0: http://nedbatchelder.com/code/modules/coverage.html : Apache License 2.0
-exceptiongroup 1.2.2: https://github.com/python-trio/exceptiongroup : MIT License
+exceptiongroup 1.3.0: https://github.com/python-trio/exceptiongroup : MIT License
 flake8 7.2.0: https://gitlab.com/pycqa/flake8 : MIT License
 gitdb 4.0.12: http://github.com/gitpython-developers/gitdb : BSD 3-clause "New" or "Revised" License
 GitPython 3.1.44: https://github.com/gitpython-developers/GitPython : BSD 3-clause "New" or "Revised" License
@@ -28,9 +28,10 @@ pycodestyle 2.13.0: https://pypi.python.org/pypi/pycodestyle : MIT License
 Pyflakes 3.3.2: https://github.com/pyflakes/pyflakes : MIT License
 pypi/setuptools 59.6.0: https://pypi.org/project/setuptools/ : MIT License
 pytest 8.3.5: http://pytest.org : MIT License
-python3-charset-normalizer 3.4.1: https://github.com/ousret/charset_normalizer : MIT License
+python3-charset-normalizer 3.4.2: https://github.com/ousret/charset_normalizer : MIT License
 python-certifi 2024.7.4: https://certifiio.readthedocs.io/en/latest/ : Mozilla Public License 2.0
-python-pluggy 1.5.0: https://pypi.python.org/pypi/pluggy : MIT License
+python-pluggy 1.6.0: https://pypi.python.org/pypi/pluggy : MIT License
+python-typing-extensions 4.13.2 : Python Software Foundation License 2.0
 RonnyPfannschmidt/iniconfig 2.1.0: https://github.com/RonnyPfannschmidt/iniconfig : MIT License
 ruamel-yaml 0.18.6: https://pypi.org/project/ruamel.yaml/ : MIT License
 ruamel.yaml.clib 0.2.12: https://sourceforge.net/p/ruamel-yaml-clib/code/ci/default/tree/ : MIT License
@@ -105,11 +106,8 @@ def human_sorted(strings: Iterable[str]) -> list[str]:
 
 	©�*��{ǰ(���2
 
-exceptiongroup 1.2.2 pypi:exceptiongroup/1.2.2: https://github.com/python-trio/exceptiongroup
-	Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-
-	Copyright (c) 2022 Alex Gr
-
+exceptiongroup 1.3.0 pypi:exceptiongroup/1.3.0: https://github.com/python-trio/exceptiongroup
+	No Copyrights found
 flake8 7.2.0 pypi:flake8/7.2.0: https://gitlab.com/pycqa/flake8
 	Copyright (C) 2011-2013 Tarek Ziade <tarek@ziade.org>
 
@@ -2844,45 +2842,55 @@ pytest 8.3.5 pypi:pytest/8.3.5: http://pytest.org
 
 	Copyright Holger Krekel and others, 2004.
 
-python3-charset-normalizer 3.4.1 pypi:charset-normalizer/3.4.1: https://github.com/ousret/charset_normalizer
-	(c) https://stackoverflow.com/questions/3041986/apt-command-line-interface-like-yes-no-input
-    """
-    valid = {"yes": True, "y": True, "ye": True, "no": False, "n": False}
-    if default is None:
-
-	(c) https://stackoverflow.com/questions/3041986/apt-command-line-interface-like-yes-no-input
-    """
-    valid = {"yes": True, "y": True, "ye": True, "no": False, "n": False}
-    if default is None:
-
-	Copyright (c) 2025 TAHRI Ahmed R.
-
-	Copyright (c) 2025 TAHRI Ahmed R.
-
-	copyright = '2023, Ahmed TAHRI
-author = 'Ahmed TAHRI'
+python3-charset-normalizer 3.4.2 pypi:charset-normalizer/3.4.2: https://github.com/ousret/charset_normalizer
+	No Copyrights found
+python-certifi 2024.7.4 pypi:certifi/2024.7.4: https://certifiio.readthedocs.io/en/latest/
+	No Copyrights found
+python-pluggy 1.6.0 pypi:pluggy/1.6.0: https://pypi.python.org/pypi/pluggy
+	No Copyrights found
+python-typing-extensions 4.13.2 pypi:typing-extensions/4.13.2
+	(C)
+
+        with self.assertRaisesRegex(TypeError, non_callable_members_illegal):
+            issubclass(C, PNonCall)
 
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
+        self.assertIsInstance(C(), PNonCall)
 
-	copyright: (c) 2021 by Ahmed TAHRI
+	(C)
+        P.register(C)
+        self.assertIsInstance(C(), P)
+        self.assertIsInstance(C(), D)
+
+    def test_none_on_non_callable_doesnt_block_implementation(self):
 
-	copyright: (c) 2021 by Ahmed TAHRI
+	(C)
+        self.assertIsSubclass(C, A)
+        self.assertNotIsSubclass(C, B)
+
+        class D: ...
+        B.register(D)
+        self.assertIsSubclass(D, A)
+        self.assertIsSubclass(D, B)
 
-	© 2012
+	(C)
+        self.assertIsSubclass(C, D)
+        self.assertIsInstance(C(), D)
 
-## 💼 For Enterprise
+        with self.assertRaisesRegex(TypeError, non_callable_members_illegal):
 
-	© [Ahmed TAHRI @Ousret
+	Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
+The Netherlands.  All rights reserved.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Stichting Mathematisch
+Centrum or CWI not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.
 
-	©����-�52
-�C�Ufw
-p�� �G���Ei���6엽�\�X�y�1�i��
-python-certifi 2024.7.4 pypi:certifi/2024.7.4: https://certifiio.readthedocs.io/en/latest/
-	No Copyrights found
-python-pluggy 1.5.0 pypi:pluggy/1.5.0: https://pypi.python.org/pypi/pluggy
-	Copyright (c) 2015 holger krekel (rather uses bitbucket/hpk42)
+�u*gG@"��4�TW�]愅�$Q����aRL
+	Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 
 RonnyPfannschmidt/iniconfig 2.1.0 pypi:iniconfig/2.1.0: https://github.com/RonnyPfannschmidt/iniconfig
 	(C) Ronny Pfannschmidt, Holger Krekel -- MIT licensed
@@ -2905,7 +2913,7 @@ from typing import (
 	Copyright (c) 2010 - 2023 Holger Krekel and others
 
 ruamel-yaml 0.18.6 pypi:ruamel.yaml/0.18.6: https://pypi.org/project/ruamel.yaml/
-	No Copyrights found
+	N/A
 ruamel.yaml.clib 0.2.12 pypi:ruamel.yaml.clib/0.2.12: https://sourceforge.net/p/ruamel-yaml-clib/code/ci/default/tree/
 	(c) ((unsigned char)c)
 #define __Pyx_long_cast(x) ((long)x)
@@ -14024,7 +14032,7 @@ IN THE SOFTWARE
 ---
 
 MIT License
-(exceptiongroup 1.2.2, flake8 7.2.0, pycodestyle 2.13.0, Pyflakes 3.3.2, pytest 8.3.5, python-pluggy 1.5.0, python3-charset-normalizer 3.4.1, RonnyPfannschmidt/iniconfig 2.1.0, ruamel-yaml 0.18.6, ruamel.yaml.clib 0.2.12, tomli 2.2.1, urllib3 2.4.0)
+(exceptiongroup 1.3.0, flake8 7.2.0, pycodestyle 2.13.0, Pyflakes 3.3.2, pytest 8.3.5, python-pluggy 1.6.0, python3-charset-normalizer 3.4.2, RonnyPfannschmidt/iniconfig 2.1.0, ruamel-yaml 0.18.6, ruamel.yaml.clib 0.2.12, tomli 2.2.1, urllib3 2.4.0)
 
 The MIT License
 ===============
@@ -14464,3 +14472,61 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
 
 ---
 
+Python Software Foundation License 2.0
+(python-typing-extensions 4.13.2)
+
+This license was approved as the official PSF License Version 2 on October 22,
+2004. The only differences between this and version 1 of the PSF license consist
+of removing Python version numbers (like 2.1.1 or 2.3).
+
+
+
+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+============================================
+
+--------------------------------------------
+
+  1.  This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"),
+    and the Individual or Organization ("Licensee") accessing and otherwise using
+    this software ("Python") in source or binary form and its associated
+    documentation.
+
+  2.  Subject to the terms and conditions of this License Agreement, PSF hereby
+    grants Licensee a nonexclusive, royalty-free, world-wide license to
+    reproduce, analyze, test, perform and/or display publicly, prepare derivative
+    works, distribute, and otherwise use Python alone or in any derivative
+    version, provided, however, that PSF's License Agreement and PSF's notice of
+    copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004 Python Software
+    Foundation; All Rights Reserved" are retained in Python alone or in any
+    derivative version prepared by Licensee.
+
+  3. In the event Licensee prepares a derivative work that is based on or
+    incorporates Python or any part thereof, and wants to make the derivative
+    work available to others as provided herein, then Licensee hereby agrees to
+    include in any such work a brief summary of the changes made to Python.
+
+  4.  PSF is making Python available to Licensee on an "AS IS" basis. PSF MAKES
+    NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT
+    NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF
+    MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF
+    PYTHON WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
+
+  5.  PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON FOR ANY
+    INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
+    MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY DERIVATIVE
+    THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+  6.  This License Agreement will automatically terminate upon a material breach
+    of its terms and conditions.
+
+  7.  Nothing in this License Agreement shall be deemed to create any
+    relationship of agency, partnership, or joint venture between PSF and
+    Licensee. This License Agreement does not grant permission to use PSF
+    trademarks or trade name in a trademark sense to endorse or promote products
+    or services of Licensee, or any third party.
+
+  8.  By copying, installing or otherwise using Python, Licensee agrees to be
+    bound by the terms and conditions of this License Agreement.
+
+---
+

{powertrain_build-1.5.2.dev1 → powertrain_build-1.5.3.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.5.2.dev1
+Version: 1.5.3.dev2
 Summary: A Continuous Integration (CI) build system testing all configurations where a Simulink model is used.
 Home-page: https://opendev.org/volvocars/powertrain-build
 Download-URL: https://pypi.org/project/powertrain-build/

{powertrain_build-1.5.2.dev1 → powertrain_build-1.5.3.dev2}/powertrain_build/build_proj_config.py

@@ -72,6 +72,7 @@ class BuildProjConfig:
             'generateDummyVar': False,
             'generateInterfaceHeaders': False,
             'generateRteCheckpointIds': False,
+            'rteCheckpointIdSize': None,
             'generateYamlInterfaceFile': False,
             'includeAllEnums': False,
             'mapToRteEnums': False,

{powertrain_build-1.5.2.dev1 → powertrain_build-1.5.3.dev2}/powertrain_build/interface/zone_controller.py

@@ -3,10 +3,8 @@
 
 """Python module used for handling zone controller specifications"""
 from ruamel.yaml import YAML
-
-from powertrain_build.interface.base import BaseApplication
 from powertrain_build.lib import logger
-from powertrain_build.lib.helper_functions import deep_dict_update
+from powertrain_build.interface.base import BaseApplication
 
 LOGGER = logger.create_logger("base")
 
@@ -154,7 +152,7 @@ class ZCAL(BaseApplication):
                 for element_name, element_data in signal_struct.items():
                     self.populate_signal_translations(port_name, element_name, element_data)
                 # Loop inside function to make sure direction is consistent
-                deep_dict_update(ports_info[port_name], self.get_port_info(port_name, direction, signal_struct))
+                ports_info[port_name].update(self.get_port_info(port_name, direction, signal_struct))
         self.composition_spec["ports"] = ports_info
 
     @staticmethod
@@ -167,42 +165,36 @@ class ZCAL(BaseApplication):
             direction (str): Direction of the port.
             signal_struct (dict): Signal dict containing list of signal elements.
         Returns:
-            port_info (dict): Dict containing port information.
+            port_info (dict): Dict containing information if any elements
+            should have an update bit associated with them.
         """
         if direction is None:
             raise BadYamlFormat(f'Port {port_name} is missing required property "direction".')
 
-        port_info = {}
         supported_directions = {
             "IN": "IN",
             "OUT": "OUT",
             "CLIENT": "IN",
             "SERVER": "OUT",
         }
-        supported_direction = supported_directions[direction]
-        api_options = {}
+        direction = supported_directions[direction]
         update_elements = set()
         for element_name, element_data in signal_struct.items():
             for element in element_data:
                 if "insignal" in element:
-                    tmp_direction = "IN"
+                    temp_dir = "IN"
                 elif "outsignal" in element:
-                    tmp_direction = "OUT"
+                    temp_dir = "OUT"
                 else:
                     raise BadYamlFormat(f"in-/out-signal for element in { element_name } is missing.")
-                if supported_direction != tmp_direction:
+                if direction != temp_dir:
                     raise BadYamlFormat(f"Signal { element_name } has both in and out elements.")
                 if element.get("updateBit", False):
                     update_elements.add(element_name)
-                if element.get("e2eStatus", False):
-                    api_options["error_handling"] = True
 
         if update_elements:
-            port_info["enable_update"] = list(update_elements)
-        if api_options:
-            port_info["api_options"] = api_options
-
-        return port_info
+            return {"enable_update": list(update_elements)}
+        return {}
 
     def populate_signal_translations(self, port_name, element_name, element_data):
         """Populate class translations data.

{powertrain_build-1.5.2.dev1 → powertrain_build-1.5.3.dev2}/powertrain_build/sched_funcs.py

@@ -57,19 +57,25 @@ class SchedFuncs(ProblemLogger):
         Args:
             generate_rte_checkpoint_calls (bool): Generate RTE function checkpoint calls.
         """
+        dst_dir = self._prj_cfg.get_src_code_dst_dir()
+        unit_raster_cfg = self._prj_cfg.get_units_raster_cfg()
+        per_unit_cfg = self._unit_cfg.get_per_unit_cfg()
+        prefix = self._prj_cfg.get_scheduler_prefix()
+        unit_counter = 1
         generate_rte_checkpoint_ids = self._prj_cfg.get_code_generation_config("generateRteCheckpointIds")
+        rte_checkpoint_id_size = self._prj_cfg.get_code_generation_config("rteCheckpointIdSize")
+        if rte_checkpoint_id_size is None:
+            if generate_rte_checkpoint_calls:
+                self.warning("RTE checkpoint ID size not set, assuming size is the same as the number of units.")
+            rte_checkpoint_id_size = len(per_unit_cfg)
         include_name = self._prj_cfg.get_composition_config("softwareComponentName")
         function_name = self._prj_cfg.get_composition_config("compositionName")
         if function_name is None:
             function_name = include_name
-        dst_dir = self._prj_cfg.get_src_code_dst_dir()
-        unit_raster_cfg = self._prj_cfg.get_units_raster_cfg()
-        per_unit_cfg = self._unit_cfg.get_per_unit_cfg()
-        prefix = self._prj_cfg.get_scheduler_prefix()
+
         init_ext_def_s = ""
         init_call_s = f'#include "{build_defs.CVC_CODE_START}"\n\n'
         init_call_s += f'void {prefix}VcExtINI(void)\n{{\n'
-
         for raster in unit_raster_cfg['SampleTimes']:
             if raster == "init":
                 for unit in unit_raster_cfg['Rasters'][raster]:
@@ -101,6 +107,8 @@ class SchedFuncs(ProblemLogger):
                 call_str = f'#include "{build_defs.CVC_CODE_START}"\n'
                 call_str += f'void {prefix}{raster}(void)\n{{\n'
                 for unit in unit_raster_cfg['Rasters'][raster]:
+                    if unit_counter > rte_checkpoint_id_size:
+                        self.critical('RTE checkpoint ID size %d is smaller than the number of units.', rte_checkpoint_id_size)
                     if unit not in SchedFuncs.RESTART_FNC_EXCLUDE and 'code_generator' in per_unit_cfg[unit]:
                         code_generator = per_unit_cfg[unit]['code_generator']
                     else:
@@ -116,15 +124,30 @@ class SchedFuncs(ProblemLogger):
                     else:
                         ext_def_str += f'extern void {unit_name}(void);\n'
                         if generate_rte_checkpoint_calls:
+                            # Add both calls during transition period
+                            # old
                             call_str += (
                                 f'  Rte_Call_{function_name}_'
                                 f'{function_name}LogicalCheckpointReached_CddPFMC_ASILD_'
                                 f'{function_name}_LogicalCheckpointReached(ID_{unit_name});\n'
-                                )
+                            )
+                            # new
+                            call_str += (
+                                '  Rte_Call_alive_WdgMSupervisedEntity_'
+                                f'AR_{raster}_CheckpointReached({unit_counter});\n'
+                            )
                         call_str += f'  {unit_name}();\n'
                         if unit_name not in SchedFuncs.RESTART_FNC_EXCLUDE:
                             init_ext_def_s += f'extern void RESTART_{unit_name}(void);\n'
                             init_call_s += f'  RESTART_{unit_name}();\n'
+                    unit_counter += 1
+                if generate_rte_checkpoint_calls:
+                    # Also call remaining dummy IDs, "new way" only
+                    for i in range(unit_counter, rte_checkpoint_id_size + 1):
+                        call_str += (
+                            '  Rte_Call_alive_WdgMSupervisedEntity_'
+                            f'AR_{raster}_CheckpointReached({i});\n'
+                        )
                 ext_def_str += '\n'
                 call_str += '}\n'
                 call_str += f'#include "{build_defs.CVC_CODE_END}"\n\n'

{powertrain_build-1.5.2.dev1 → powertrain_build-1.5.3.dev2}/powertrain_build/zone_controller/composition_yaml.py

@@ -449,33 +449,25 @@ class CompositionYaml(ProblemLogger):
         Returns:
             dict: Dict containing runnables information.
         """
+        swc_name = self.build_cfg.get_composition_config("softwareComponentName")
         autosar_prefix = "AR_"
         swc_prefix = self.build_cfg.get_scheduler_prefix()
         custom_step_function = self.build_cfg.get_composition_config("customYamlStepFunctionName")
         custom_init_function = self.build_cfg.get_composition_config("customYamlInitFunctionName")
         standard_init_function = autosar_prefix + swc_prefix + "VcExtINI"
         init_function = custom_init_function if custom_init_function is not None else standard_init_function
+        call_dict = self._get_runnable_calls_info()
+        mode_switch_points_dict = self.composition_spec.get("mode_switch_points", {})
+        runnables = self.build_cfg.get_units_raster_cfg()["SampleTimes"]
         calibration_variables = list(self.cal_class_info["autosar"]["class_info"].keys())
         swc_content = {init_function: {"type": "INIT", "accesses": calibration_variables}}
 
         if self.include_calibration_interface_files:
-            swc_name = self.build_cfg.get_composition_config("softwareComponentName")
             cal_init_function = autosar_prefix + ZCC.calibration_function_init_template.format(swc_name=swc_name)
             cal_step_function = autosar_prefix + ZCC.calibration_function_step_template.format(swc_name=swc_name)
             swc_content[cal_init_function] = {"type": "INIT", "accesses": calibration_variables}
             swc_content[cal_step_function] = {"type": "PERIODIC", "period": 0.1, "accesses": calibration_variables}
 
-        call_dict = self._get_runnable_calls_info()
-        mode_switch_points_dict = self.composition_spec.get("mode_switch_points", {})
-        reads = []
-        writes = []
-        for port, port_data in self._get_ports_info().items():
-            if port_data["direction"] in ["IN", "CLIENT"]:
-                reads.append(port)
-            else:
-                writes.append(port)
-        runnables = self.build_cfg.get_units_raster_cfg()["SampleTimes"]
-
         if len(runnables) == 1 and custom_step_function is not None:
             swc_content[custom_step_function] = {
                 "type": "PERIODIC",
@@ -486,10 +478,6 @@ class CompositionYaml(ProblemLogger):
                 swc_content[custom_step_function]["calls"] = call_dict
             if mode_switch_points_dict:
                 swc_content[custom_step_function]["mode_switch_points"] = mode_switch_points_dict
-            if reads:
-                swc_content[custom_step_function]["reads"] = reads
-            if writes:
-                swc_content[custom_step_function]["writes"] = writes
             return swc_content
 
         if custom_step_function is not None:
@@ -508,10 +496,6 @@ class CompositionYaml(ProblemLogger):
                 swc_content[key]["calls"] = call_dict
             if mode_switch_points_dict:
                 swc_content[key]["mode_switch_points"] = mode_switch_points_dict
-            if reads:
-                swc_content[key]["reads"] = reads
-            if writes:
-                swc_content[key]["writes"] = writes
 
         return swc_content
 

{powertrain_build-1.5.2.dev1 → powertrain_build-1.5.3.dev2}/powertrain_build.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.5.2.dev1
+Version: 1.5.3.dev2
 Summary: A Continuous Integration (CI) build system testing all configurations where a Simulink model is used.
 Home-page: https://opendev.org/volvocars/powertrain-build
 Download-URL: https://pypi.org/project/powertrain-build/

powertrain_build-1.5.3.dev2/powertrain_build.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "da8cd01", "is_release": false}

powertrain_build-1.5.2.dev1/powertrain_build.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "8783e08", "is_release": false}