From 79552afea4a5d526fe35648a1f7ae1cdc090a7e4 Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Fri, 17 Jul 2020 03:15:48 -0400 Subject: [PATCH] pybind: Silence distutils/setuptools warning Setuptools would very much like to be imported BEFORE distutils So move the conditional imports of setuptools above the import of distutils. Signed-off-by: Adam C. Emerson --- src/pybind/cephfs/setup.py | 13 ++++++------- src/pybind/rados/setup.py | 16 +++++++--------- src/pybind/rbd/setup.py | 13 ++++++------- src/pybind/rgw/setup.py | 15 +++++++-------- 4 files changed, 26 insertions(+), 31 deletions(-) diff --git a/src/pybind/cephfs/setup.py b/src/pybind/cephfs/setup.py index 40466614f67a9..4eec949731a36 100755 --- a/src/pybind/cephfs/setup.py +++ b/src/pybind/cephfs/setup.py @@ -7,6 +7,12 @@ import subprocess import sys import tempfile import textwrap +if not pkgutil.find_loader('setuptools'): + from distutils.core import setup + from distutils.extension import Extension +else: + from setuptools import setup + from setuptools.extension import Extension from distutils.ccompiler import new_compiler from distutils.errors import CompileError, LinkError from itertools import filterfalse, takewhile @@ -45,13 +51,6 @@ def monkey_with_compiler(customize): distutils.sysconfig.customize_compiler = \ monkey_with_compiler(distutils.sysconfig.customize_compiler) -if not pkgutil.find_loader('setuptools'): - from distutils.core import setup - from distutils.extension import Extension -else: - from setuptools import setup - from setuptools.extension import Extension - # PEP 440 versioning of the Ceph FS package on PyPI # Bump this version, after every changeset diff --git a/src/pybind/rados/setup.py b/src/pybind/rados/setup.py index 5b40a806e6018..66682b15b6c45 100755 --- a/src/pybind/rados/setup.py +++ b/src/pybind/rados/setup.py @@ -1,11 +1,17 @@ from __future__ import print_function +import pkgutil +if not pkgutil.find_loader('setuptools'): + from distutils.core import setup + from distutils.extension import Extension +else: + from setuptools import setup + from setuptools.extension import Extension import distutils.sysconfig from distutils.errors import CompileError, LinkError from distutils.ccompiler import new_compiler from itertools import filterfalse, takewhile import os -import pkgutil import shutil import subprocess import sys @@ -45,14 +51,6 @@ def monkey_with_compiler(customize): distutils.sysconfig.customize_compiler = \ monkey_with_compiler(distutils.sysconfig.customize_compiler) -if not pkgutil.find_loader('setuptools'): - from distutils.core import setup - from distutils.extension import Extension -else: - from setuptools import setup - from setuptools.extension import Extension - - distutils.sysconfig.customize_compiler = \ monkey_with_compiler(distutils.sysconfig.customize_compiler) diff --git a/src/pybind/rbd/setup.py b/src/pybind/rbd/setup.py index 1f4d9ed79825b..60c47c1a9c932 100755 --- a/src/pybind/rbd/setup.py +++ b/src/pybind/rbd/setup.py @@ -7,6 +7,12 @@ import subprocess import sys import tempfile import textwrap +if not pkgutil.find_loader('setuptools'): + from distutils.core import setup + from distutils.extension import Extension +else: + from setuptools import setup + from setuptools.extension import Extension from distutils.ccompiler import new_compiler from distutils.errors import CompileError, LinkError from itertools import filterfalse, takewhile @@ -45,13 +51,6 @@ def monkey_with_compiler(customize): distutils.sysconfig.customize_compiler = \ monkey_with_compiler(distutils.sysconfig.customize_compiler) -if not pkgutil.find_loader('setuptools'): - from distutils.core import setup - from distutils.extension import Extension -else: - from setuptools import setup - from setuptools.extension import Extension - # PEP 440 versioning of the RBD package on PyPI # Bump this version, after every changeset diff --git a/src/pybind/rgw/setup.py b/src/pybind/rgw/setup.py index d53aec7f84c12..518fa9f81bc22 100755 --- a/src/pybind/rgw/setup.py +++ b/src/pybind/rgw/setup.py @@ -1,8 +1,14 @@ from __future__ import print_function +import pkgutil +if not pkgutil.find_loader('setuptools'): + from distutils.core import setup + from distutils.extension import Extension +else: + from setuptools import setup + from setuptools.extension import Extension import distutils.core import os -import pkgutil import shutil import subprocess import sys @@ -46,13 +52,6 @@ def monkey_with_compiler(customize): distutils.sysconfig.customize_compiler = \ monkey_with_compiler(distutils.sysconfig.customize_compiler) -if not pkgutil.find_loader('setuptools'): - from distutils.core import setup - from distutils.extension import Extension -else: - from setuptools import setup - from setuptools.extension import Extension - # PEP 440 versioning of the RGW package on PyPI # Bump this version, after every changeset -- 2.39.5