mirror of
https://github.com/espressif/esp-idf.git
synced 2025-07-31 03:07:21 +02:00
fix(tools): catch more general errors in python dependency checker
This commit is contained in:
@ -168,6 +168,8 @@
|
|||||||
|
|
||||||
- "tools/split_paths_by_spaces.py"
|
- "tools/split_paths_by_spaces.py"
|
||||||
|
|
||||||
|
- "tools/check_python_dependencies.py"
|
||||||
|
|
||||||
.patterns-docker: &patterns-docker
|
.patterns-docker: &patterns-docker
|
||||||
- "tools/docker/**/*"
|
- "tools/docker/**/*"
|
||||||
|
|
||||||
|
@ -1,8 +1,7 @@
|
|||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
#
|
#
|
||||||
# SPDX-FileCopyrightText: 2018-2023 Espressif Systems (Shanghai) CO LTD
|
# SPDX-FileCopyrightText: 2018-2024 Espressif Systems (Shanghai) CO LTD
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
import argparse
|
import argparse
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
@ -18,11 +17,11 @@ except ImportError:
|
|||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from importlib.metadata import PackageNotFoundError, requires
|
from importlib.metadata import requires
|
||||||
from importlib.metadata import version as get_version
|
from importlib.metadata import version as get_version
|
||||||
except ImportError:
|
except ImportError:
|
||||||
# compatibility for python <=3.7
|
# compatibility for python <=3.7
|
||||||
from importlib_metadata import PackageNotFoundError, requires # type: ignore
|
from importlib_metadata import requires # type: ignore
|
||||||
from importlib_metadata import version as get_version # type: ignore
|
from importlib_metadata import version as get_version # type: ignore
|
||||||
|
|
||||||
try:
|
try:
|
||||||
@ -92,8 +91,10 @@ if __name__ == '__main__':
|
|||||||
if not req.marker or req.marker.evaluate():
|
if not req.marker or req.marker.evaluate():
|
||||||
try:
|
try:
|
||||||
version_check(req)
|
version_check(req)
|
||||||
except PackageNotFoundError as e:
|
except Exception as e:
|
||||||
not_satisfied.append(f"'{e}' - was not found and is required by the application")
|
# Catch general exception, because get_version may return None (https://github.com/python/cpython/issues/91216)
|
||||||
|
# log package name alongside the error message for easier debugging
|
||||||
|
not_satisfied.append(f"Error while checking requirement '{req}'. Package was not found and is required by the application: {e}")
|
||||||
new_req_list.remove(req)
|
new_req_list.remove(req)
|
||||||
else:
|
else:
|
||||||
new_req_list.remove(req)
|
new_req_list.remove(req)
|
||||||
@ -120,8 +121,10 @@ if __name__ == '__main__':
|
|||||||
# version is taken into account as well because packages can have different requirements for a given
|
# version is taken into account as well because packages can have different requirements for a given
|
||||||
# Python package. The dependencies need to be checked for all of them because they can be different.
|
# Python package. The dependencies need to be checked for all of them because they can be different.
|
||||||
new_req_list.extend(dependency_requirements - already_checked)
|
new_req_list.extend(dependency_requirements - already_checked)
|
||||||
except PackageNotFoundError as e:
|
except Exception as e:
|
||||||
not_satisfied.append(f"'{e}' - was not found and is required by the application")
|
# Catch general exception, because get_version may return None (https://github.com/python/cpython/issues/91216)
|
||||||
|
# log package name alongside the error message for easier debugging
|
||||||
|
not_satisfied.append(f"Error while checking requirement '{req}'. Package was not found and is required by the application: {e}")
|
||||||
|
|
||||||
if len(not_satisfied) > 0:
|
if len(not_satisfied) > 0:
|
||||||
print('The following Python requirements are not satisfied:')
|
print('The following Python requirements are not satisfied:')
|
||||||
|
@ -8,7 +8,6 @@ tools/ci/get_all_test_results.py
|
|||||||
tools/ci/idf_unity_tester.py
|
tools/ci/idf_unity_tester.py
|
||||||
tools/gdb_panic_server.py
|
tools/gdb_panic_server.py
|
||||||
tools/check_term.py
|
tools/check_term.py
|
||||||
tools/check_python_dependencies.py
|
|
||||||
tools/python_version_checker.py
|
tools/python_version_checker.py
|
||||||
tools/generate_debug_prefix_map.py
|
tools/generate_debug_prefix_map.py
|
||||||
tools/ci/astyle-rules.yml
|
tools/ci/astyle-rules.yml
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
|
# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
# NOTE: unittest is by default sorting tests based on their names,
|
# NOTE: unittest is by default sorting tests based on their names,
|
||||||
# so the order if which the tests are started may be different from
|
# so the order if which the tests are started may be different from
|
||||||
# the order in which they are defined. Please make sure all tests
|
# the order in which they are defined. Please make sure all tests
|
||||||
@ -9,7 +8,6 @@
|
|||||||
# If test needs to change global state, it should return it to the
|
# If test needs to change global state, it should return it to the
|
||||||
# original state after it's finished. For more information please see
|
# original state after it's finished. For more information please see
|
||||||
# https://docs.python.org/3/library/unittest.html#organizing-test-code
|
# https://docs.python.org/3/library/unittest.html#organizing-test-code
|
||||||
|
|
||||||
import inspect
|
import inspect
|
||||||
import os
|
import os
|
||||||
import shutil
|
import shutil
|
||||||
@ -30,7 +28,7 @@ TOOLS_DIR = os.environ.get('IDF_TOOLS_PATH') or os.path.expanduser(idf_tools.IDF
|
|||||||
PYTHON_DIR = os.path.join(TOOLS_DIR, 'python_env')
|
PYTHON_DIR = os.path.join(TOOLS_DIR, 'python_env')
|
||||||
PYTHON_DIR_BACKUP = tempfile.mkdtemp()
|
PYTHON_DIR_BACKUP = tempfile.mkdtemp()
|
||||||
REQ_SATISFIED = 'Python requirements are satisfied'
|
REQ_SATISFIED = 'Python requirements are satisfied'
|
||||||
REQ_MISSING = "'{}' - was not found and is required by the application"
|
REQ_MISSING = 'Package was not found and is required by the application: {}'
|
||||||
REQ_CORE = '- {}'.format(os.path.join(IDF_PATH, 'tools', 'requirements', 'requirements.core.txt'))
|
REQ_CORE = '- {}'.format(os.path.join(IDF_PATH, 'tools', 'requirements', 'requirements.core.txt'))
|
||||||
REQ_GDBGUI = '- {}'.format(os.path.join(IDF_PATH, 'tools', 'requirements', 'requirements.gdbgui.txt'))
|
REQ_GDBGUI = '- {}'.format(os.path.join(IDF_PATH, 'tools', 'requirements', 'requirements.gdbgui.txt'))
|
||||||
CONSTR = 'Constraint file: {}/espidf.constraints'.format(TOOLS_DIR)
|
CONSTR = 'Constraint file: {}/espidf.constraints'.format(TOOLS_DIR)
|
||||||
|
Reference in New Issue
Block a user