Clean out remains of useSwcNameAsPrefix

Wasn't properly removed in b93719754e841df2c83d24363e2cf0f64e02e809

Change-Id: Id83922d2da84c80e772773ffd283dd9cee4b027c
This commit is contained in:
Henrik Wahlqvist 2025-01-08 11:47:02 +01:00
parent 380b8b978e
commit cee323b493
4 changed files with 60 additions and 121 deletions

169
NOTICE

@ -1,4 +1,4 @@
Copyright 2024
Copyright 2025
[powertrain-build : ci]
@ -12,11 +12,11 @@ Notices Report Content
Components:
Coverage 7.6.9: http://nedbatchelder.com/code/modules/coverage.html : Apache License 2.0
Coverage 7.6.10: http://nedbatchelder.com/code/modules/coverage.html :
exceptiongroup 1.2.2: https://github.com/python-trio/exceptiongroup : MIT License
flake8 7.1.1: https://gitlab.com/pycqa/flake8 : MIT License
gitdb 4.0.11: http://github.com/gitpython-developers/gitdb : BSD 3-clause "New" or "Revised" License
GitPython 3.1.43: https://github.com/gitpython-developers/GitPython : BSD 3-clause "New" or "Revised" 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 :
idna 3.10: https://github.com/kjd/idna : BSD 3-clause "New" or "Revised" License
mccabe 0.7.0: http://pypi.python.org/pypi/mccabe : Expat License
NumPy 1.24.4: https://numpy.org/ : BSD 3-clause "New" or "Revised" License
@ -26,21 +26,21 @@ 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
pytest 8.3.4: http://pytest.org : MIT License
python3-charset-normalizer 3.4.0: https://github.com/ousret/charset_normalizer : 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
RonnyPfannschmidt/iniconfig 2.0.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
SciPy 1.9.1: http://www.scipy.org : BSD 3-clause "New" or "Revised" License
smmap 5.0.1: https://github.com/gitpython-developers/smmap : BSD 3-clause "New" or "Revised" License
smmap 5.0.2: https://github.com/gitpython-developers/smmap :
tomli 2.2.1: https://github.com/hukkin/tomli : MIT License
urllib3 2.2.3: https://urllib3.readthedocs.io/en/stable : MIT License
urllib3 2.3.0: https://urllib3.readthedocs.io/en/stable : MIT License
voluptuous 0.15.2: http://pypi.python.org/pypi/voluptuous : BSD 3-clause "New" or "Revised" License
Copyright Text:
Coverage 7.6.9 pypi:coverage/7.6.9: http://nedbatchelder.com/code/modules/coverage.html
Coverage 7.6.10 pypi:coverage/7.6.10: 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,
@ -52,70 +52,10 @@ flake8 7.1.1 pypi:flake8/7.1.1: https://gitlab.com/pycqa/flake8
Copyright (C) 2012-2016 Ian Cordasco <graffatcolmingov@gmail.com>
gitdb 4.0.11 pypi:gitdb/4.0.11: http://github.com/gitpython-developers/gitdb
(c)
# end handle interpreter
return hdr
Copyright (C) 2010, 2011 Sebastian Thiel (byronimo@gmail.com) and contributors
Copyright (C) 2010, 2011 Sebastian Thiel (byronimo@gmail.com) and contributors
#
# This module is part of GitDB and is released under
Copyright (C) 2010, 2011 Sebastian Thiel and contributors
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* 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.
* Neither the name of the GitDB project nor the names of
its contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
GitPython 3.1.43 pypi:GitPython/3.1.43: https://github.com/gitpython-developers/GitPython
(c) < 32 or ord(c) == 127:
raise ValueError(f"Invalid reference '{ref_path}': references cannot contain ASCII control characters")
one_before_previous = previous
previous = c
Copyright (C) 2008, 2009 Michael Trier (mtrier@gmail.com) and contributors
Copyright (C) 2008, 2009 Michael Trier and contributors
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* 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.
* Neither the name of the GitPython project nor the names of
its contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
Copyright (C) 2008, 2009 Michael Trier and contributors, 2010-2015 Sebastian Thiel"
# 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.
gitdb 4.0.12 pypi:gitdb/4.0.12: http://github.com/gitpython-developers/gitdb
No Copyrights found
GitPython 3.1.44 pypi:GitPython/3.1.44: https://github.com/gitpython-developers/GitPython
No Copyrights found
idna 3.10 pypi:idna/3.10: https://github.com/kjd/idna
Copyright (c) 2013-2024, Kim Davies and contributors.
All rights reserved.
@ -2693,13 +2633,44 @@ try:
Copyright 2013-2014 Florent Xicluna
pytest 8.3.4 pypi:pytest/8.3.4: http://pytest.org
No Copyrights found
(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.
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)
python3-charset-normalizer 3.4.0 pypi:charset-normalizer/3.4.0: https://github.com/ousret/charset_normalizer
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}
@ -2710,9 +2681,9 @@ python3-charset-normalizer 3.4.0 pypi:charset-normalizer/3.4.0: https://github.c
valid = {"yes": True, "y": True, "ye": True, "no": False, "n": False}
if default is None:
Copyright (c) 2019 TAHRI Ahmed R.
Copyright (c) 2025 TAHRI Ahmed R.
Copyright (c) 2019 TAHRI Ahmed R.
Copyright (c) 2025 TAHRI Ahmed R.
copyright = '2023, Ahmed TAHRI
author = 'Ahmed TAHRI'
@ -2731,6 +2702,9 @@ author = 'Ahmed TAHRI'
© [Ahmed TAHRI @Ousret
©<><C2A9><EFBFBD><EFBFBD>-<2D>52 <06>b<EFBFBD>]ct<63><11>M<EFBFBD>
<EFBFBD>C<EFBFBD>Ufw <0A><>٧<EFBFBD><D9A7>x<EFBFBD>h<>n<EFBFBD>&d<><64><EFBFBD>U +<2B>u*gG@"<22><>4<EFBFBD>TW <17>]愅<>$Q<><51><EFBFBD><EFBFBD>aRL 6KXo<06>5<08> <0A><><EFBFBD>P ^0<>yQDX<44><58>UbF5?<3F><61>6Ȉ<7F>f}<7D>5<EFBFBD><35>H<EFBFBD>W<EFBFBD><57><EFBFBD>[<1A>9B8<42>?<3F><>5W<35>ZZ<5A><5A>d<><64>*s<><73>M<EFBFBD>J<EFBFBD>X)<29><>U<EFBFBD>Ӛ@02<30>`J<><4A>/.^c)ndJ<64><4A>F<EFBFBD>6"Ŵj<C5B4><6A>ch<63><1A><><EFBFBD>4/<2F><>e_JT<><54>h<EFBFBD>T<EFBFBD><37><D4B1><EFBFBD>7n<37>n<EFBFBD><6E>!<21>Z<EFBFBD>ɩA<C9A9><41>X6<58>Н<EFBFBD>){<08>4<EFBFBD>T<EFBFBD><54><EFBFBD>fV[=,<2C>A~oO8#<23><><EFBFBD><EFBFBD><03>2<EFBFBD><32>S<>z<EFBFBD>I<EFBFBD><49>kK\T1<54><31>D<1C><>L<EFBFBD>s<>&<26><><EFBFBD><EFBFBD>Bul PU<50> <09>4<EFBFBD>`<60>f+<2B>#<23>&Z<0F><><EFBFBD> <0C>k<EFBFBD><18><>jfT<66>&<26>TH"Qa<51><61><EFBFBD>I n<>}<7D>B<EFBFBD>i<EFBFBD><69><EFBFBD><EFBFBD>k<EFBFBD><6B><EFBFBD><EFBFBD>&"L<>l<EFBFBD>U<18>Xf<><66><EFBFBD>GWWg<>D<EFBFBD><44>f34<18><><EFBFBD>Ϧj<CFA6>=<3D>$%<25>ۚ@<40>сײ@_
p<0F><> <20>G<EFBFBD><14><>Ei<45><69><EFBFBD>6엽<36>\<5C>X<03>y<EFBFBD>1<EFBFBD>i<EFBFBD><69> <0A><><EFBFBD>X<EFBFBD>@N<><4E><EFBFBD>-<2D>s'yy1<79>a跭#<23> _<> <20>c<EFBFBD>{<7B><>.<1A><><EFBFBD>B<EFBFBD>.lZ7<5A><37><EFBFBD><EFBFBD> mk<6D>f<EFBFBD>e_<65>dM<64>(փ|<7C> zo<7A><6F>0S<30>6<1F>e<EFBFBD><65><EFBFBD><EFBFBD>X<01><>k<EFBFBD><6B><EFBFBD><EFBFBD>V<EFBFBD> IE*8S<38><53><EFBFBD>\?f83<38>k<EFBFBD><6B>U<EFBFBD> P<>%Ql1<6C><31>M,<2C><>p?<3F>hEU<45>CD7<44>#<03><><EFBFBD>0*<2A>+<2B><02>Z<EFBFBD>G<EFBFBD><47>K<EFBFBD><4B>5<EFBFBD>KF<4B>"<22>,a<><61> <0C>bU<62>Z<EFBFBD>9V=;% /4<><34><EFBFBD><EFBFBD>\qi<71><69>=e<>!<21>TTn<54>?<3F><>,wd<77>6<><36>E<EFBFBD><45>@K<>Ȼ<EFBFBD><C8BB>󑟈DPnps<70><73><02>2<EFBFBD><18><05>R<><52><16><15>ix.-<2D><>ߊ<19><>y<>W<1F>y-<1B><>[<5B>$<24>ih޼<68><DEBC>]bmXG<58>S<15>ŒU<C592><55>e_l<5F>j<EFBFBD>X2Ƙ<15>:-<2D>o<EFBFBD><6F><EFBFBD>}<7D>ɝO<C99D>U<EFBFBD><55>c<EFBFBD>S<EFBFBD>O<EFBFBD>m<01> <0B>MpZѸQrC<15><1D><><EFBFBD>s<EFBFBD><73><q<>z<18>4ZE[<0F><><EFBFBD>B|<7C>Y%X+7<12>0<EFBFBD><04>M<EFBFBD><08>U<EFBFBD><01>قi<D982><69>a$pE<19>c
RonnyPfannschmidt/iniconfig 2.0.0 pypi:iniconfig/2.0.0: https://github.com/RonnyPfannschmidt/iniconfig
(C) Ronny Pfannschmidt, Holger Krekel -- MIT licensed
"""
@ -13525,45 +13499,14 @@ package originally developed by Stephen G. Nash in Fortran.
copyright: Copyright 2015 Jon Lund Steffensen. Based on extlinks by
smmap 5.0.1 pypi:smmap/5.0.1: https://github.com/gitpython-developers/smmap
(c)
assert man_optimal.num_file_handles() == 1
# PERFORMANCE
# blast away with random access and a full mapping - we don't want to
# exaggerate the manager's overhead, but measure the buffer overhead
# We do it once with an optimal setting, and with a worse manager which
# will produce small mappings only !
max_num_accesses = 100
fd = os.open(fc.path, os.O_RDONLY)
for item in (fc.path, fd):
Copyright (C) 2010, 2011 Sebastian Thiel and contributors
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* 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.
* Neither the name of the async project nor the names of
its contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
smmap 5.0.2 pypi:smmap/5.0.2: https://github.com/gitpython-developers/smmap
No Copyrights found
tomli 2.2.1 pypi:tomli/2.2.1: https://github.com/hukkin/tomli
Copyright (c) 2021 Taneli Hukkinen
Copyright (c) 2021 Taneli Hukkinen
urllib3 2.2.3 pypi:urllib3/2.2.3: https://urllib3.readthedocs.io/en/stable
urllib3 2.3.0 pypi:urllib3/2.3.0: https://urllib3.readthedocs.io/en/stable
Copyright (c) 2008-2020 Andrey Petrov and contributors.
copyright = f"
@ -13594,7 +13537,7 @@ modification, are permitted provided that the following conditions are met:
Licenses:
Apache License 2.0
(Coverage 7.6.9, Packaging 24.2, pbr 6.1.0, psf-requests 2.32.3)
(Packaging 24.2, pbr 6.1.0, psf-requests 2.32.3)
Apache License
Version 2.0, January 2004
@ -13810,7 +13753,7 @@ DAMAGE.
---
BSD 3-clause "New" or "Revised" License
(gitdb 4.0.11, GitPython 3.1.43, idna 3.10, NumPy 1.24.4, SciPy 1.9.1, smmap 5.0.1, voluptuous 0.15.2)
(gitdb 4.0.12, idna 3.10, NumPy 1.24.4, SciPy 1.9.1, voluptuous 0.15.2)
Copyright (c) <YEAR>, <OWNER>
All rights reserved.
@ -13873,7 +13816,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 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.0, RonnyPfannschmidt/iniconfig 2.0.0, ruamel-yaml 0.18.6, ruamel.yaml.clib 0.2.12, tomli 2.2.1, urllib3 2.2.3)
(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)
The MIT License
===============

@ -123,8 +123,7 @@ This key is used to set individual options to match the old ECU types, see examp
"generateRteCheckpointIds": false,
"generateYamlInterfaceFile": false,
"propagateTagName": true,
"useA2lSymbolLinks": true,
"useSwcNameAsPrefix": false
"useA2lSymbolLinks": true
}
}
}

@ -12,17 +12,15 @@
},
"CodeGenerationConfig": {
"generateInterfaceHeaders": true,
"generateYamlInterfaceFile": true,
"useSwcNameAsPrefix": true
"generateYamlInterfaceFile": true
},
"ProjectTemplates": {
"dummy": {
"generalAsilLevelDebug": "D",
"generalAsilLevelDependability": "D",
"generateInterfaceHeaders": false,
"generateYamlInterfaceFile": false,
"useSwcNameAsPrefix": false
"generateYamlInterfaceFile": false
}
},
"UnitCfgs": "./rasters.json"
}
}

@ -44,5 +44,4 @@ class TestReadCodeSw(unittest.TestCase):
expected['generalAsilLevelDependability'] = 'D'
expected['generateInterfaceHeaders'] = True
expected['generateYamlInterfaceFile'] = True
expected['useSwcNameAsPrefix'] = True
self.assertDictEqual(self.build_prj_cfg._prj_cfg['CodeGenerationConfig'], expected)