diff options
| -rw-r--r-- | build_scripts/config.py | 2 | ||||
| -rw-r--r-- | build_scripts/main.py | 2 | ||||
| -rw-r--r-- | build_scripts/options.py | 1 | ||||
| -rw-r--r-- | build_scripts/platforms/linux.py | 1 | ||||
| -rw-r--r-- | build_scripts/platforms/macos.py | 1 | ||||
| -rw-r--r-- | build_scripts/platforms/unix.py | 1 | ||||
| -rw-r--r-- | build_scripts/setup_runner.py | 1 | ||||
| -rw-r--r-- | build_scripts/utils.py | 3 | ||||
| -rw-r--r-- | build_scripts/wheel_override.py | 1 | ||||
| -rw-r--r-- | build_scripts/wheel_utils.py | 1 |
10 files changed, 2 insertions, 12 deletions
diff --git a/build_scripts/config.py b/build_scripts/config.py index 98dc23042..3f63f842a 100644 --- a/build_scripts/config.py +++ b/build_scripts/config.py @@ -1,8 +1,6 @@ # Copyright (C) 2018 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -import os - from .log import log from pathlib import Path diff --git a/build_scripts/main.py b/build_scripts/main.py index c12d2101f..788a24335 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -38,7 +38,7 @@ from .options import OPTION, CommandMixin from .platforms.unix import prepare_packages_posix from .platforms.windows_desktop import prepare_packages_win32 from .qtinfo import QtInfo -from .utils import (copydir, copyfile, detect_clang, filter_match, +from .utils import (copydir, copyfile, detect_clang, get_numpy_location, get_python_dict, linux_fix_rpaths_for_library, macos_fix_rpaths_for_library, platform_cmake_options, remove_tree, run_process, diff --git a/build_scripts/options.py b/build_scripts/options.py index ebcada31f..e3d713d16 100644 --- a/build_scripts/options.py +++ b/build_scripts/options.py @@ -9,7 +9,6 @@ except ModuleNotFoundError: # import from this file, it was failing. from distutils.cmd import Command # TODO: remove -import os import sys import warnings import logging diff --git a/build_scripts/platforms/linux.py b/build_scripts/platforms/linux.py index 3d473063c..df99de823 100644 --- a/build_scripts/platforms/linux.py +++ b/build_scripts/platforms/linux.py @@ -1,7 +1,6 @@ # Copyright (C) 2018 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -import os from pathlib import Path from ..config import config diff --git a/build_scripts/platforms/macos.py b/build_scripts/platforms/macos.py index dc76bbeb5..53e5c6fa5 100644 --- a/build_scripts/platforms/macos.py +++ b/build_scripts/platforms/macos.py @@ -2,7 +2,6 @@ # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only import fnmatch -import os from pathlib import Path from ..config import config diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index 1879f3072..54ec8a004 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -2,7 +2,6 @@ # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only import fnmatch -import os import sys from pathlib import Path diff --git a/build_scripts/setup_runner.py b/build_scripts/setup_runner.py index 73e986d5b..4afb9dd85 100644 --- a/build_scripts/setup_runner.py +++ b/build_scripts/setup_runner.py @@ -1,7 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -import re import os import sys import tempfile diff --git a/build_scripts/utils.py b/build_scripts/utils.py index bc31c29fc..88e916782 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -28,7 +28,6 @@ except ModuleNotFoundError: # This is motivated by our CI using an old version of setuptools # so then the coin_build_instructions.py script is executed, and # import from this file, it was failing. - from distutils import log from distutils.errors import DistutilsSetupError as SetupError try: @@ -70,7 +69,7 @@ def filter_match(name, patterns): def update_env_path(newpaths): paths = os.environ['PATH'].lower().split(os.pathsep) for path in newpaths: - if not str(path).lower() in paths: + if str(path).lower() not in paths: log.info(f"Inserting path '{path}' to environment") paths.insert(0, path) os.environ['PATH'] = f"{path}{os.pathsep}{os.environ['PATH']}" diff --git a/build_scripts/wheel_override.py b/build_scripts/wheel_override.py index 53e3fda9d..f3f9f17a9 100644 --- a/build_scripts/wheel_override.py +++ b/build_scripts/wheel_override.py @@ -2,7 +2,6 @@ # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -import os import platform import sys from pathlib import Path diff --git a/build_scripts/wheel_utils.py b/build_scripts/wheel_utils.py index 6e5c88afc..9472a29d4 100644 --- a/build_scripts/wheel_utils.py +++ b/build_scripts/wheel_utils.py @@ -1,7 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -import os import time from pathlib import Path from sysconfig import get_config_var, get_platform |