From 7da3790160d273ea62a54f9f53dfb1d2f0b7d64e Mon Sep 17 00:00:00 2001 From: Anna Eilering Date: Fri, 15 Apr 2016 09:37:35 -0500 Subject: [PATCH] Remove try except around setup.py imports and remove distutils workaround. CloudRoast was initially written to support both setuptools and distutils. CloudRoast requires CloudCafe and OpenCafe, neither of which support distutils. If a user is able to install OpenCafe and CloudCafe, they will not require a workaround to install CloudRoast. Additionally the use of Distutils complicates the creation / instantiation of tests for the library. Change-Id: Ib2bbbf57832963695c7966aab64e717dca900ba7 --- setup.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index baa123b9..1e50cce4 100644 --- a/setup.py +++ b/setup.py @@ -17,12 +17,8 @@ limitations under the License. import os import sys -try: - from setuptools import setup, find_packages - from setuptools.command.install import install as _install -except ImportError: - from distutils.core import setup, find_packages - from distutils.command.install import install as _install +from setuptools import setup, find_packages +from setuptools.command.install import install as _install if sys.argv[-1] == 'publish':