From 2d7b090fe220d182dc43cccb32b71ca1b55ec9d8 Mon Sep 17 00:00:00 2001 From: Paul Vinciguerra Date: Thu, 6 Jun 2019 07:38:42 -0400 Subject: vpp_papi: Fix missing dependency. Since we test vpp_papi as part of tests, the need for ipaddress under python2.7 is masked. Add ipaddress to setup.py for python <=3.3. Change-Id: I01c2f5560eeb740e546024e84028d5a2fb2ace45 Type: fix Signed-off-by: Paul Vinciguerra --- src/vpp-api/python/setup.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/vpp-api/python/setup.py b/src/vpp-api/python/setup.py index c8321320c73..a14e4e4d113 100644 --- a/src/vpp-api/python/setup.py +++ b/src/vpp-api/python/setup.py @@ -14,12 +14,19 @@ import sys stdlib_enum = sys.version_info >= (3, 6) +stdlib_ipaddress = sys.version_info >= (3, 3) try: from setuptools import setup, find_packages except ImportError: from distutils.core import setup, find_packages +requirements = ['cffi >= 1.6'] +if not stdlib_enum: + requirements.append('aenum') +if not stdlib_ipaddress: + requirements.append('ipaddress') + setup( name='vpp_papi', version='1.6.2', @@ -29,8 +36,7 @@ setup( 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', 'aenum'], + install_requires=requirements, packages=find_packages(), long_description='''VPP Python language binding.''', zip_safe=True) -- cgit 1.2.3-korg