From 249e59ec5024a18d6834e203b9c7ce2d83a66b77 Mon Sep 17 00:00:00 2001 From: Gleyberson Andrade Date: Thu, 6 Aug 2020 17:24:48 -0300 Subject: [PATCH] Update setup.py to use native setuptools install Today, the kytos installation with 'eggs' is broken. This commit comments the InstallMode class, so now we will use the native setuptools install. --- setup.py | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/setup.py b/setup.py index bd56bc68e..d85dea622 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,6 @@ import pip # pylint: disable=unused-import from setuptools import Command, find_packages, setup from setuptools.command.egg_info import egg_info - from setuptools.command.install import install except ModuleNotFoundError: print('Please install python3-pip and run setup.py again.') sys.exit(-1) @@ -191,21 +190,21 @@ def run(self): check_call(cmd, shell=True) -class InstallMode(install): - """Class used to overwrite the default installation using setuptools.""" +# class InstallMode(install): +# """Class used to overwrite the default installation using setuptools.""" - def run(self): - """Install the package in install mode. +# def run(self): +# """Install the package in install mode. - super().run() does not install dependencies when running - ``python setup.py install`` (pypa/setuptools#456). - """ - if 'bdist_wheel' in sys.argv: - # do not use eggs, but wheels - super().run() - else: - # force install of deps' eggs during setup.py install - self.do_egg_install() +# super().run() does not install dependencies when running +# ``python setup.py install`` (pypa/setuptools#456). +# """ +# if 'bdist_wheel' in sys.argv: +# # do not use eggs, but wheels +# super().run() +# else: +# # force install of deps' eggs during setup.py install +# self.do_egg_install() # class DevelopMode(develop): @@ -256,7 +255,6 @@ def run(self): 'coverage': TestCoverage, 'doctest': DocTest, 'egg_info': EggInfo, - 'install': InstallMode, 'lint': Linter, 'test': Test },