Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristián Maureira-Fredes <Cristian.Maureira-Fredes@qt.io>2022-10-11 18:01:26 +0200
committerCristián Maureira-Fredes <Cristian.Maureira-Fredes@qt.io>2022-10-13 18:56:55 +0200
commit19acc417df1a920a5ded49258cf4b88f837fbcdc (patch)
tree81ff795124b5797faa937663c98a4f9ae2926fdb /build_scripts/utils.py
parent90289a1be1735cde5fc2471bc599de30bcbefc89 (diff)
build: replace DistutilsSetupError by SetupError
Replacing the distutils errors by the setuptools one. Task-number: PYSIDE-2079 Change-Id: I9968d9562f8dd40317344d3295943c194e3f2197 Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'build_scripts/utils.py')
-rw-r--r--build_scripts/utils.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/build_scripts/utils.py b/build_scripts/utils.py
index 06a9cd1f2..86df71316 100644
--- a/build_scripts/utils.py
+++ b/build_scripts/utils.py
@@ -20,13 +20,13 @@ from textwrap import dedent, indent
try:
# Using the distutils implementation within setuptools
from setuptools._distutils import log
- from setuptools._distutils.errors import DistutilsSetupError
+ from setuptools.errors import SetupError
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
+ from distutils.errors import DistutilsSetupError as SetupError
try:
WindowsError
@@ -96,8 +96,8 @@ def winsdk_setenv(platform_arch, build_type):
continue
setenv_paths.append(setenv_path)
if len(setenv_paths) == 0:
- raise DistutilsSetupError("Failed to find the Windows SDK with MSVC compiler "
- f"version {msvc9.VERSION}")
+ raise SetupError("Failed to find the Windows SDK with MSVC "
+ f"compiler version {msvc9.VERSION}")
for setenv_path in setenv_paths:
log.info(f"Found {setenv_path}")
@@ -172,8 +172,8 @@ def init_msvc_env(platform_arch, build_type):
log.info(f"Searching MSVC compiler version {msvc9.VERSION}")
vcdir_path = find_vcdir(msvc9.VERSION)
if not vcdir_path:
- raise DistutilsSetupError(f"Failed to find the MSVC compiler version {msvc9.VERSION} on "
- "your system.")
+ raise SetupError(f"Failed to find the MSVC compiler version {msvc9.VERSION} on "
+ "your system.")
else:
log.info(f"Found {vcdir_path}")