diff --git a/requirements.txt b/requirements.txt index b23dba19cd..455beaa53c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1 @@ autotest>=0.16.2; python_version < '3.0' -aexpect>1.5.0 -simplejson>=3.5.3 -netaddr>=0.7.18 -netifaces>=0.10.5 diff --git a/setup.py b/setup.py index e9148e28ff..f643452f09 100644 --- a/setup.py +++ b/setup.py @@ -80,6 +80,17 @@ def pre_post_plugin_type(): if __name__ == "__main__": + requirements = ["netifaces", "aexpect", "netaddr", "simplejson"] + if sys.version_info[:2] >= (2, 7): + requirements.append("avocado-framework") + else: + # Latest py2 supported stevedore is 1.10.0, need to limit it here + # as older avocado versions were not limiting it. + # Note: Avocado 70+ doesn't require stevedore and older Avocado + # can use whatever version of stevedore on py3 + requirements.append("stevedore>=1.8.0,<=1.10.0") + requirements.append("avocado-framework<70.0") + setup(name='avocado-plugins-vt', version=VERSION, description='Avocado Virt Test Compatibility Layer plugin', @@ -101,4 +112,5 @@ def pre_post_plugin_type(): 'vt-joblock = avocado_vt.plugins.vt_joblock:VTJobLock', ], }, + install_requires=requirements, )