diff options
| author | Cristián Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2022-06-27 19:56:45 +0200 |
|---|---|---|
| committer | Cristián Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2022-06-29 11:01:33 +0200 |
| commit | ea9ac28cc215289ae46b1679c58a3acfc66883fc (patch) | |
| tree | 0cb3289a4765d9918bff799947f13aa258e40387 /testing | |
| parent | 5316feb88d9700f3acef3f83ccc30927fdfdfef0 (diff) | |
build: rename our rmtree to avoid shutil conflict
There is an implementation in the 'utils' module that
implements a 'rmtree' function to handle removing readonly files
from a directory. To avoid confusion with shutil.rmtree we rename
it to 'remove_tree'.
Pick-to: 6.2 6.3
Change-Id: I3548ea81f36c87ba51fd984fcf7b1cd4cafd54d6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/wheel_tester.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/testing/wheel_tester.py b/testing/wheel_tester.py index f4671478f..81ea45e28 100644 --- a/testing/wheel_tester.py +++ b/testing/wheel_tester.py @@ -35,7 +35,7 @@ sys.path.append(setup_script_dir) from setuptools._distutils import log from build_scripts.utils import (find_files_using_glob, find_glob_in_path, - rmtree, run_process, run_process_output) + remove_tree, run_process, run_process_output) log.set_verbosity(1) @@ -96,7 +96,7 @@ def clean_egg_info(): paths = find_files_using_glob(setup_script_dir, "*.egg-info") for p in paths: log.info(f"Removing {p}") - rmtree(p) + remove_tree(p) def install_wheel(wheel_path): @@ -241,7 +241,7 @@ def prepare_build_folder(src_path, build_folder_name): # preparing a build folder should clean any previous existing build. if os.path.exists(build_path): log.info(f"Removing {build_path}") - rmtree(build_path) + remove_tree(build_path) log.info(f"Creating {build_path}") os.makedirs(build_path) |