From b89a2f21365e4b7f9eb010c0b99b85c70251a6cf Mon Sep 17 00:00:00 2001 From: Wojciech Siewierski Date: Wed, 13 May 2020 23:00:20 +0200 Subject: Fully migrate from distutils to setuptools Even the Python docs recommend setuptools over using distutils directly. --- setup.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index edf48c4a..493deadd 100755 --- a/setup.py +++ b/setup.py @@ -4,11 +4,13 @@ from __future__ import (absolute_import, division, print_function) -from distutils import log # pylint: disable=import-error,no-name-in-module from hashlib import sha512 import os import shutil +from setuptools import setup +from setuptools.command.install_lib import install_lib + import ranger @@ -16,16 +18,6 @@ SCRIPTS_PATH = 'build_scripts' EXECUTABLES_PATHS = ['/ranger/data/scope.sh'] -# pylint: disable=import-error,no-name-in-module,ungrouped-imports -if os.environ.get('SETUPTOOLS_USE'): - from setuptools import setup - from setuptools.command.install_lib import install_lib -else: - from distutils.core import setup - from distutils.command.install_lib import install_lib -# pylint: enable=import-error,no-name-in-module,ungrouped-imports - - def findall(directory): return [os.path.join(directory, f) for f in os.listdir(directory) if os.path.isfile(os.path.join(directory, f))] @@ -59,7 +51,7 @@ class InstallLib(install_lib): for exe_path in EXECUTABLES_PATHS: if path.endswith(exe_path): mode = ((os.stat(path).st_mode) | 0o555) & 0o7777 - log.info('changing mode of %s to %o', path, mode) + print('changing mode of %s to %o' % (path, mode)) os.chmod(path, mode) -- cgit 1.4.1-2-gfad0