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/setup_runner.py | |
| 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/setup_runner.py')
| -rw-r--r-- | build_scripts/setup_runner.py | 4 |
1 files changed, 1 insertions, 3 deletions
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): |
