powertrain-build 1.4.3.dev9__tar.gz → 1.4.4.dev2__tar.gz

{powertrain_build-1.4.3.dev9 → powertrain_build-1.4.4.dev2}/ChangeLog

@@ -1,12 +1,29 @@
 CHANGES
 =======
 
-1.4.3.dev9
+1.4.4.dev2
 ----------
 
+* generate\_nvm\_init\_stuff
+
+1.4.3
+-----
+
 * New scope on nvm block generated code: type 2 write calls should be written manually, no init calls needed
+
+1.4.2
+-----
+
 * Bug fix for ZC dids
+
+1.4.1
+-----
+
 * Bug fix in composition\_yaml.py
+
+1.4.0
+-----
+
 * Added RTE interface enum doc
 * Adding lsb, offset to curves and maps
 * Fix issue with mapping to Rte enums when enum does not have a key for integer 0

{powertrain_build-1.4.3.dev9 → powertrain_build-1.4.4.dev2}/NOTICE

@@ -12,9 +12,8 @@ Notices Report Content
 
 Components: 
 
-Coverage 7.6.12: http://nedbatchelder.com/code/modules/coverage.html : Apache License 2.0
 exceptiongroup 1.2.2: https://github.com/python-trio/exceptiongroup : MIT License
-flake8 7.1.1: https://gitlab.com/pycqa/flake8 : MIT License
+flake8 7.1.2: 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
 idna 3.10: https://github.com/kjd/idna : BSD 3-clause "New" or "Revised" License
@@ -26,7 +25,7 @@ psf-requests 2.32.3: http://docs.python-requests.org : Apache License 2.0
 pycodestyle 2.12.1: https://pypi.python.org/pypi/pycodestyle : MIT License
 Pyflakes 3.2.0: https://github.com/pyflakes/pyflakes : MIT License
 pypi/setuptools 59.6.0: https://pypi.org/project/setuptools/ : MIT License
-pytest 8.3.4: http://pytest.org : 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
 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
@@ -41,18 +40,13 @@ voluptuous 0.15.2: http://pypi.python.org/pypi/voluptuous : BSD 3-clause "New" o
 
 Copyright Text: 
 
-Coverage 7.6.12 pypi:coverage/7.6.12: http://nedbatchelder.com/code/modules/coverage.html
-	No Copyrights found
 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
 
-flake8 7.1.1 pypi:flake8/7.1.1: https://gitlab.com/pycqa/flake8
-	Copyright (C) 2011-2013 Tarek Ziade <tarek@ziade.org>
-
-	Copyright (C) 2012-2016 Ian Cordasco <graffatcolmingov@gmail.com>
-
+flake8 7.1.2 pypi:flake8/7.1.2: https://gitlab.com/pycqa/flake8
+	No Copyrights found
 gitdb 4.0.12 pypi:gitdb/4.0.12: http://github.com/gitpython-developers/gitdb
 	(c)
     # end handle interpreter
@@ -2601,7 +2595,75 @@ modification, are permitted provided that the following conditions are met:
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
 
 pbr 6.1.1 pypi:pbr/6.1.1: http://openstack.org
-	No Copyrights found
+	Copyright (C) 2005 Association of Universities for Research in Astronomy (AURA)
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+
+	Copyright (c) 2011 OpenStack Foundation
+
+	Copyright (C) 2013 Association of Universities for Research in Astronomy
+#                    (AURA)
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#     1. Redistributions of source code must retain the above copyright
+#        notice, this list of conditions and the following disclaimer.
+#
+#     2. Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials provided
+#        with the distribution.
+#
+
+	Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
+
+	Copyright (c) 2013 New Dream Network, LLC (DreamHost)
+
+	Copyright (c) 2013 Testrepository Contributors
+
+	Copyright (c) 2015 Hewlett-Packard Development Company, L.P. (HP)
+
+	Copyright (C) 2020 Red Hat, Inc.
+
+	Copyright 2010-2011 OpenStack Foundation
+
+	Copyright 2011 OpenStack Foundation
+
+	Copyright 2012 OpenStack Foundation
+
+	Copyright 2012 Red Hat, Inc.
+
+	Copyright 2012-2013 Hewlett-Packard Development Company, L.P.
+
+	Copyright 2013 Hewlett-Packard Development Company, L.P.
+
+	Copyright 2014 Hewlett-Packard Development Company, L.P.
+
+	Copyright 2018 Red Hat, Inc.
+
+	Copyright 2021 Monty Taylor
+
+	copyright = '2013, OpenStack Foundation
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+add_function_parentheses = True
+
+	copyright = u
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+add_function_parentheses = True
+
 psf-requests 2.32.3 pypi:requests/2.32.3: http://docs.python-requests.org
 	(c)
         return c
@@ -2699,39 +2761,8 @@ pypi/setuptools 59.6.0 pypi:setuptools/59.6.0: https://pypi.org/project/setuptoo
 
 	Copyright Jason R. Coombs
 
-pytest 8.3.4 pypi:pytest/8.3.4: http://pytest.org
-	(c)
-
-    # ASCII fast path.
-    if 0x20 <= o < 0x07F:
-
-	(c)
-
-    # Control characters.
-    if category == "Cc":
-
-	(C)
-
-    assert all_marks ==
-
-    assert get_unpacked_marks(C, consider_mro=False) == [xfail("c").mark]
-
-	(c)
-        if wc < 0:
-            return -1
-        width += wc
-
-	(c) in ("F", "W"):
-        return 2
-
-    return 1
-
-	Copyright (c) 2004 Holger Krekel and others
-
-	Copyright (c) 2014, Gregory Boissinot
-
-	Copyright Holger Krekel and others, 2004.
-
+pytest 8.3.5 pypi:pytest/8.3.5: http://pytest.org
+	No Copyrights found
 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
     """
@@ -4981,11 +5012,11 @@ const int always_fail_option = 2;
 #if !defined(BOOST_ASIO_NOEXCEPT_IF)
 # if defined(BOOST_ASIO_HAS_NOEXCEPT)
 
-	(C) C
-
 	(c) c
 
 	(C) C
+
+	(C) C
 
 #endif
 
@@ -7878,10 +7909,10 @@ modification, are permitted provided that the following conditions are met:
 
 	Copyright (C) 2005 Douglas Gregor.
 
-	Copyright (c) 2005 Eric Niebler
-
 	Copyright (C) 2005 Eric Niebler
 
+	Copyright (c) 2005 Eric Niebler
+
 	Copyright (C) 2005 Igor Chesnokov, mailto:ichesnokov@gmail.com (VC 6.5,VC 7.1
 
 	Copyright (c) 2005 Matthew Calabrese
@@ -10511,10 +10542,10 @@ are permitted provided that the following conditions are met:
  *
  * Symbolic solve with triangular matrix
 
-	Copyright (c) 2016-2018 Oracle and/or its affiliates.
-
 	copyright (c) 2016-2018 Oracle and/or its affiliates.
 
+	Copyright (c) 2016-2018 Oracle and/or its affiliates.
+
 	Copyright (C) 2016-2018 T. Zachary Laine
 
 	Copyright (C) 2016-2019  ERGO-Code
@@ -13635,7 +13666,7 @@ modification, are permitted provided that the following conditions are met:
 Licenses: 
 
 Apache License 2.0
-(Coverage 7.6.12, Packaging 24.2, pbr 6.1.1, psf-requests 2.32.3)
+(Packaging 24.2, pbr 6.1.1, psf-requests 2.32.3)
 
 Apache License
 Version 2.0, January 2004
@@ -13939,7 +13970,7 @@ IN THE SOFTWARE
 ---
 
 MIT License
-(exceptiongroup 1.2.2, flake8 7.1.1, pycodestyle 2.12.1, Pyflakes 3.2.0, pytest 8.3.4, python-pluggy 1.5.0, python3-charset-normalizer 3.4.1, RonnyPfannschmidt/iniconfig 2.0.0, ruamel-yaml 0.18.6, ruamel.yaml.clib 0.2.12, tomli 2.2.1, urllib3 2.3.0)
+(exceptiongroup 1.2.2, flake8 7.1.2, pycodestyle 2.12.1, Pyflakes 3.2.0, pytest 8.3.5, python-pluggy 1.5.0, python3-charset-normalizer 3.4.1, RonnyPfannschmidt/iniconfig 2.0.0, ruamel-yaml 0.18.6, ruamel.yaml.clib 0.2.12, tomli 2.2.1, urllib3 2.3.0)
 
 The MIT License
 ===============

{powertrain_build-1.4.3.dev9 → powertrain_build-1.4.4.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: powertrain-build
-Version: 1.4.3.dev9
+Version: 1.4.4.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.4.3.dev9 → powertrain_build-1.4.4.dev2}/powertrain_build/nvm_def.py

@@ -670,10 +670,8 @@ class ZCNVMDef(NVMDef):
             f'#include "{bd.CVC_CODE_ASIL_D_END}"\n',
         ]
 
-        error_status = ""
-        nvsw_init_instructions = False
+        error_status = []
         main_function_lines = []
-        type2_warning = False
 
         for nvm_name, nvm_data in self.valid_nvm_definitions.items():
             if nvm_data["method"] == "DIRECT-CALL":
@@ -682,8 +680,9 @@ class ZCNVMDef(NVMDef):
                 main_function_lines.append(f"  *{pim_call} = {nvm_name.lower()};\n")
                 if nvm_data["type"] == "type1":
                     init_function_lines.append(f"  {function_prefix}_SetRamBlockStatus(TRUE);\n")
+                    init_function_lines.append(f"  {nvm_name.lower()} = *{pim_call};\n")
                 elif nvm_data["type"] == "type2":
-                    error_status = "  UInt8 errorStatus = 0;\n"
+                    error_status = ["  UInt8 errorStatus = 0;\n"]
                     main_function_lines.extend([
                         f"  {function_prefix}_GetErrorStatus(&errorStatus);\n",
                         "  if (errorStatus == 0) {\n",
@@ -694,27 +693,22 @@ class ZCNVMDef(NVMDef):
                     self.critical(f"Unknown NVM type: {nvm_data['type']} for NVM: {nvm_name}")
             elif nvm_data["method"] == "NVSWCOMPONENT":
                 if nvm_data["type"] == "type1":
-                    nvsw_init_instructions = True
+                    init_function_lines.append(
+                        f"  (void)Rte_Read_{nvm_name.upper()}_{nvm_name.upper()}(&{nvm_name.lower()});\n"        
+                    )
                     main_function.append(
                         f"  (void)Rte_Write_{nvm_name.upper()}_{nvm_name.upper()}(&{nvm_name.lower()});\n"
                     )
                 elif nvm_data["type"] == "type2":
-                    type2_warning = True
+                    self.warning(
+                        f'{nvm_name.lower()} is a type2 NVSWCOMPONENT. Due to inherent risk type2 write calls are not '
+                        'generated automatically, they have to be written manually and added to source code.'
+                    )
                     main_function_lines.append(
                         f"  // Nvm {nvm_name.lower()} is type 2, add call in manually written source code.\n"
                     )
-        main_function.append(error_status)
-        if nvsw_init_instructions:
-            init_function_lines.append("  // NVSWCOMPONENTS init calls are scheduled by the arxml.\n")
-        main_function.extend(main_function_lines)
-
-        if type2_warning:
-            self.warning(
-                'NVSWCOMPONENT write calls are not generated automatically for type 2, \
-                they have to be written manually and added to source code.'
-            )
 
-        output = init_function_lines + footer + ["\n"] + main_function + footer
+        output = init_function_lines + footer + ["\n"] + main_function + error_status + main_function_lines + footer
         with open(self._file_name + ".c", mode="a", encoding="utf-8") as cptr:
             cptr.writelines(output)
 

{powertrain_build-1.4.3.dev9 → powertrain_build-1.4.4.dev2}/powertrain_build.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: powertrain-build
-Version: 1.4.3.dev9
+Version: 1.4.4.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.4.4.dev2/powertrain_build.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "a4ed48d", "is_release": true}

powertrain_build-1.4.3.dev9/powertrain_build.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "5a9a5bc", "is_release": true}