diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-03 07:56:16 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-05 15:09:48 +0000 |
| commit | b70183a78ed7a478ae9f2af19bd84535a8e69320 (patch) | |
| tree | 6960d1540c43789ed652c4fc8929996b7e20dcd6 /build_scripts | |
| parent | 3fbc9599fba7f76d081cda6a55294bd130bead4a (diff) | |
build scripts: Fix warning about import order
Import Setuptools before Distutils, fixing:
distutils_patch.py:25: UserWarning: Distutils was imported before Setuptools. This usage is discouraged and may exhibit undesirable behaviors or errors. Please use Setuptools' objects directly or at least import Setuptools first.
Pick-to: 5.15
Change-Id: Ibbc1a5cd1d348f6f44f7e80a3ba7e9a7341fae8e
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'build_scripts')
| -rw-r--r-- | build_scripts/main.py | 15 | ||||
| -rw-r--r-- | build_scripts/setup_runner.py | 4 |
2 files changed, 8 insertions, 11 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py index a1a697e3b..cca498e09 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -203,7 +203,13 @@ def get_py_library(build_type, py_version, py_prefix, py_libdir, py_include_dir) return py_library -import setuptools +import setuptools # Import setuptools before distutils +from setuptools import Extension +from setuptools.command.install import install as _install +from setuptools.command.install_lib import install_lib as _install_lib +from setuptools.command.bdist_egg import bdist_egg as _bdist_egg +from setuptools.command.develop import develop as _develop +from setuptools.command.build_py import build_py as _build_py import distutils.log as log from distutils.errors import DistutilsSetupError @@ -215,13 +221,6 @@ from distutils.command.build_ext import build_ext as _build_ext from distutils.util import get_platform from distutils.cmd import Command -from setuptools import Extension -from setuptools.command.install import install as _install -from setuptools.command.install_lib import install_lib as _install_lib -from setuptools.command.bdist_egg import bdist_egg as _bdist_egg -from setuptools.command.develop import develop as _develop -from setuptools.command.build_py import build_py as _build_py - from .qtinfo import QtInfo from .utils import rmtree, detect_clang, copyfile, copydir, run_process_output, run_process from .utils import update_env_path, init_msvc_env, filter_match diff --git a/build_scripts/setup_runner.py b/build_scripts/setup_runner.py index df62083ba..8a5791ebe 100644 --- a/build_scripts/setup_runner.py +++ b/build_scripts/setup_runner.py @@ -41,6 +41,7 @@ import sys import os import textwrap +from setuptools import setup # Import setuptools before distutils import distutils.log as log from build_scripts.config import config @@ -49,9 +50,6 @@ from build_scripts.main import cmd_class_dict from build_scripts.options import ADDITIONAL_OPTIONS, OPTION from build_scripts.utils import run_process -from setuptools import setup - - class SetupRunner(object): def __init__(self, orig_argv): |