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
This commit is contained in:
parent
a08b76893d
commit
7da3790160
8
setup.py
8
setup.py
@ -17,12 +17,8 @@ limitations under the License.
|
|||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
try:
|
from setuptools import setup, find_packages
|
||||||
from setuptools import setup, find_packages
|
from setuptools.command.install import install as _install
|
||||||
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
|
|
||||||
|
|
||||||
|
|
||||||
if sys.argv[-1] == 'publish':
|
if sys.argv[-1] == 'publish':
|
||||||
|
Loading…
Reference in New Issue
Block a user