From 49ff6d1e16f24272eafe4044186aae32f0e7054d Mon Sep 17 00:00:00 2001 From: Paul Vinciguerra Date: Mon, 25 Feb 2019 18:55:28 -0800 Subject: vpp-papi: Only install enum34 for python<=3.4. Change-Id: I20d7c8c1a59b3a9aa016bec860289b7aef4ce06b Signed-off-by: Paul Vinciguerra --- src/vpp-api/python/setup.py | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/src/vpp-api/python/setup.py b/src/vpp-api/python/setup.py index a719d10df28..952944578c8 100644 --- a/src/vpp-api/python/setup.py +++ b/src/vpp-api/python/setup.py @@ -11,23 +11,26 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +import sys + +stdlib_enum = sys.version_info >= (3, 4) try: from setuptools import setup, find_packages except ImportError: from distutils.core import setup, find_packages -setup(name='vpp_papi', - version='1.6.2', - description='VPP Python binding', - author='Ole Troan', - author_email='ot@cisco.com', - url='https://wiki.fd.io/view/VPP/Python_API', - license='Apache-2.0', - test_suite='vpp_papi.tests', - # Add when we don't need to support 2.7.5 - # 'enum34;python_version<"3.4"'], - install_requires=['cffi >= 1.6', 'enum34'], - packages=find_packages(), - long_description='''VPP Python language binding.''', - zip_safe=True) +setup( + name='vpp_papi', + version='1.6.2', + description='VPP Python binding', + author='Ole Troan', + author_email='ot@cisco.com', + url='https://wiki.fd.io/view/VPP/Python_API', + license='Apache-2.0', + test_suite='vpp_papi.tests', + install_requires=['cffi >= 1.6'] if stdlib_enum else + ['cffi >= 1.6', 'enum34'], + packages=find_packages(), + long_description='''VPP Python language binding.''', + zip_safe=True) -- cgit 1.2.3-korg