diff options
| author | Cristián Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2023-06-08 16:59:50 +0200 |
|---|---|---|
| committer | Cristián Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2023-07-14 10:36:12 +0200 |
| commit | 709c3f0b8a7a597e531506d6024ead26b3a8f08a (patch) | |
| tree | f0504226484503f65efed5101d9c98b304f7cb7f /build_scripts/options.py | |
| parent | 4b12b8f558eb52625a458703698030090ae8d50f (diff) | |
build: remove traces of distutils
Removed mentions, comments, and fallback usages
in some sections of the build scripts and documentation.
On the CI, we upgrade setuptools in order to avoid having
missing functionality, so it shouldn't be an issue.
For Shiboken and CMake, there is still a helper that relies
on distutils in case people is using python < 3.8.2
Pick-to: 6.5
Change-Id: Ic33abe9fa8bd8564e9d44c8714b7fedd4e50434a
Reviewed-by: Simo Fält <simo.falt@qt.io>
Diffstat (limited to 'build_scripts/options.py')
| -rw-r--r-- | build_scripts/options.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/build_scripts/options.py b/build_scripts/options.py index 5d4c44203..e49dd61cc 100644 --- a/build_scripts/options.py +++ b/build_scripts/options.py @@ -1,13 +1,7 @@ # 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 -try: - from setuptools import Command -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.cmd import Command # TODO: remove +from setuptools import Command import sys import logging @@ -166,7 +160,7 @@ OPTION = { "SNAPSHOT_BUILD": has_option("snapshot-build"), "LIMITED_API": option_value("limited-api"), "PACKAGE_TIMESTAMP": option_value("package-timestamp"), - # This is used automatically by distutils.command.install object, to + # This is used automatically by setuptools.command.install object, to # specify the final installation location. "FINAL_INSTALL_PREFIX": option_value("prefix", remove=False), "CMAKE_TOOLCHAIN_FILE": option_value("cmake-toolchain-file"), |