From 77b67f613f0d1fe491b4cca365b2ffd2935d7e38 Mon Sep 17 00:00:00 2001 From: csine-nflx Date: Tue, 1 Sep 2020 16:07:47 -0700 Subject: [PATCH] removing dependency on distutils from setup.py --- setup.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/setup.py b/setup.py index 471c5358..e6624198 100644 --- a/setup.py +++ b/setup.py @@ -9,20 +9,20 @@ Is a TLS management and orchestration tool. """ from __future__ import absolute_import -import sys -import json -import os.path import datetime - -from setuptools.command.develop import develop -from setuptools.command.install import install -from setuptools.command.sdist import sdist -from setuptools import setup, find_packages -from distutils import log -from distutils.core import Command +import json +import logging +import os.path +import sys from subprocess import check_output import pip +from setuptools import Command +from setuptools import setup, find_packages +from setuptools.command.develop import develop +from setuptools.command.install import install +from setuptools.command.sdist import sdist + if tuple(map(int, pip.__version__.split('.'))) >= (19, 3, 0): from pip._internal.network.session import PipSession from pip._internal.req import parse_requirements @@ -105,16 +105,16 @@ class BuildStatic(Command): pass def run(self): - log.info("running [npm install --quiet] in {0}".format(ROOT)) + logging.info("running [npm install --quiet] in {0}".format(ROOT)) try: check_output(['npm', 'install', '--quiet'], cwd=ROOT) - log.info("running [gulp build]") + logging.info("running [gulp build]") check_output([os.path.join(ROOT, 'node_modules', '.bin', 'gulp'), 'build'], cwd=ROOT) - log.info("running [gulp package]") + logging.info("running [gulp package]") check_output([os.path.join(ROOT, 'node_modules', '.bin', 'gulp'), 'package'], cwd=ROOT) except Exception as e: - log.warn("Unable to build static content") + logging.warn("Unable to build static content") setup(