Depcrecate MatInstl2017, updated to just MatInstl

Change-Id: I29089fbd02b943ea85a25f2a55388c74c608a698

NOTICE

@@ -28,7 +28,7 @@ pycodestyle 2.14.0: https://pypi.python.org/pypi/pycodestyle : MIT License
 Pyflakes 3.4.0: https://github.com/pyflakes/pyflakes : MIT License
 Pygments - Python syntax highlighter 2.19.2: http://pygments.org/ : BSD 2-clause "Simplified" License
 pypi/setuptools 59.6.0: https://pypi.org/project/setuptools/ : MIT License
-pytest 8.4.1: http://pytest.org : MIT License
+pytest 8.4.2: http://pytest.org : MIT License
 python3-charset-normalizer 3.4.3: 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.6.0: https://pypi.python.org/pypi/pluggy : MIT License
@@ -17594,10 +17594,10 @@ met:
 	Copyright (C) 2014 Agustin Berge
 
 
-	Copyright (c) 2014 Agustin Berge
+	Copyright (C) 2014 Agustin Berge
 
 
-	Copyright (C) 2014 Agustin Berge
+	Copyright (c) 2014 Agustin Berge
 
 
 	Copyright (c) 2014 Ahmed Charles
@@ -26895,39 +26895,8 @@ pypi/setuptools 59.6.0 pypi:setuptools/59.6.0: https://pypi.org/project/setuptoo
 
 	Copyright Jason R. Coombs
 
-pytest 8.4.1 pypi:pytest/8.4.1: http://pytest.org
+pytest 8.4.2 pypi:pytest/8.4.2: http://pytest.org
-	(c)
+	No Copyrights found
-
-    # 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.
-
 python3-charset-normalizer 3.4.3 pypi:charset-normalizer/3.4.3: 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/
@@ -38106,7 +38075,7 @@ IN THE SOFTWARE
 ---
 
 MIT License
-(exceptiongroup 1.3.0, flake8 7.3.0, pycodestyle 2.14.0, Pyflakes 3.4.0, pytest 8.4.1, python-pluggy 1.6.0, python3-charset-normalizer 3.4.3, RonnyPfannschmidt/iniconfig 2.1.0, ruamel-yaml 0.18.6, ruamel.yaml.clib 0.2.12, tomli 2.2.1, urllib3 2.5.0)
+(exceptiongroup 1.3.0, flake8 7.3.0, pycodestyle 2.14.0, Pyflakes 3.4.0, pytest 8.4.2, python-pluggy 1.6.0, python3-charset-normalizer 3.4.3, RonnyPfannschmidt/iniconfig 2.1.0, ruamel-yaml 0.18.6, ruamel.yaml.clib 0.2.12, tomli 2.2.1, urllib3 2.5.0)
 
 The MIT License
 ===============

docs/powertrain_build.md

@@ -69,13 +69,13 @@ Add New User Variables
 click 'New...' and add if you want to run python from command line
 
 ```bash
-MatInstl2017 "C:\Program Files\MATLAB\R2017b\bin\matlab.exe"
+MatInstl "C:\Program Files\MATLAB\R2017b\bin\matlab.exe"
 ```
 
 or
 
 ```bash
-MatInstl2017 "/c/Program\ Files/MATLAB/R2017b/bin/matlab.exe"
+MatInstl "/c/Program\ Files/MATLAB/R2017b/bin/matlab.exe"
 ```
 
 if you want to generate code from bash.

powertrain_build/__init__.py

@@ -2,6 +2,7 @@
 # Licensed under Apache 2.0.
 
 """Main package of the powertrain-build application."""
+from os import environ
 from pbr.version import VersionInfo
 from pathlib import Path
 from powertrain_build.lib import logger, helper_functions
@@ -29,9 +30,11 @@ if requirement_path.exists():
             elif "powertrain-build==" in line and expected_package not in line:
                 LOGGER.warning('powertrain-build version does not match requirements!')
                 break
-
 else:
     LOGGER.warning('Current repository does not have a requirement file' +
                    ' in expected location: %s', str(requirement_path))
 
 check_python_string(__required_python_lower__, __required_python_upper__)
+
+if environ.get('MatInstl2017') is not None:
+    LOGGER.warning('Using environment variable MatInstl2017 is depricated, use MatInstl instead.')

powertrain_build/pt_matlab.py

@@ -15,13 +15,15 @@ import time
 
 my_system = platform.system()
 if my_system == "Darwin":
-    MATLAB_BIN = os.environ.get("MatInstl2017", "/Applications/MATLAB_R2020a.app/bin/matlab")
+    MATLAB_BIN = os.environ.get(
+        "MatInstl",
+        os.environ.get("MatInstl2017", "/Applications/MATLAB_R2020a.app/bin/matlab")
+    )
 elif my_system == "Linux":
-    MATLAB_BIN = os.environ.get("MatInstl2017", "/usr/local/MATLAB/R2017b/bin/matlab")
+    MATLAB_BIN = os.environ.get("MatInstl", os.environ.get("MatInstl2017", "/usr/local/MATLAB/R2017b/bin/matlab"))
 else:
     from . import pt_win32
-
+    MATLAB_BIN = os.environ.get("MatInstl", os.environ.get("MatInstl2017", "C:\\MATLABR2017b_x64\\bin\\matlab.exe"))
-    MATLAB_BIN = os.environ.get("MatInstl2017", "C:\\MATLABR2017b_x64\\bin\\matlab.exe")
 
 LOGGER = logging.getLogger(__name__)
 logging.basicConfig(level=logging.INFO)