diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2023-09-29 14:12:18 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2023-09-29 14:55:29 +0200 |
| commit | 7eddfbd968c159312dfb4889d6738f54dc8b32b6 (patch) | |
| tree | bc697220f702d8465ade4e0583ffaf9c68d532e6 /xtesting/utils | |
| parent | db5bcd80c547d0bfb765c137320e01dc403fdb6a (diff) | |
Upgrade pylint and fix latest warnings
Change-Id: I8b9e4b663a12ac9be18fded2d7b4e4b38428fa9f
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit f430ee4d9ef63f104dde63710fce7f8fa3c61591)
Diffstat (limited to 'xtesting/utils')
| -rw-r--r-- | xtesting/utils/constants.py | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/xtesting/utils/constants.py b/xtesting/utils/constants.py index f5e29e0d..12f1fde3 100644 --- a/xtesting/utils/constants.py +++ b/xtesting/utils/constants.py @@ -12,7 +12,7 @@ import os import sys -import pkg_resources +import importlib.resources ENV_FILE = '/var/lib/xtesting/conf/env_file' @@ -20,14 +20,21 @@ XTESTING_PATHES = [ "~/.xtesting", "/etc/xtesting", os.path.join(sys.prefix + "/etc/xtesting")] TESTCASE_DESCRIPTION = 'testcases.yaml' -TESTCASE_DESCRIPTION_DEFAULT = pkg_resources.resource_filename( - 'xtesting', f'ci/{TESTCASE_DESCRIPTION}') + +with importlib.resources.as_file( + importlib.resources.files('xtesting') / + f'ci/{TESTCASE_DESCRIPTION}') as path: + TESTCASE_DESCRIPTION_DEFAULT = path RESULTS_DIR = '/var/lib/xtesting/results' LOG_PATH = os.path.join(RESULTS_DIR, 'xtesting.log') DEBUG_LOG_PATH = os.path.join(RESULTS_DIR, 'xtesting.debug.log') -INI_PATH_DEFAULT = pkg_resources.resource_filename( - 'xtesting', 'ci/logging.ini') -DEBUG_INI_PATH_DEFAULT = pkg_resources.resource_filename( - 'xtesting', 'ci/logging.debug.ini') +with importlib.resources.as_file( + importlib.resources.files('xtesting') / + 'ci/logging.ini') as path: + INI_PATH_DEFAULT = path +with importlib.resources.as_file( + importlib.resources.files('xtesting') / + 'ci/logging.debug.ini') as path: + DEBUG_INI_PATH_DEFAULT = path |