From cf07393d1e5bf9b71ddf145c4bbc42599b1bd48a Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Mon, 16 Jan 2017 16:39:49 -0700 Subject: [PATCH] Fix a conflict with openstack requirements Signed-off-by: Zack Cerza --- setup.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 4f60821508..8754f4cf9f 100644 --- a/setup.py +++ b/setup.py @@ -76,16 +76,15 @@ setup( 'pyopenssl>=0.13', 'ndg-httpsclient', 'pyasn1', - # Work around regression in 0.9.2 that caused - # `openstack ip floating list -f json` to fail and return - # "Connection failure that may be retried." - 'openstacksdk != 0.9.2', # python-novaclient is specified here, even though it is # redundant, because python-openstackclient requires # Babel, and installs 2.3.3, which is forbidden by # python-novaclient 4.0.0 'python-novaclient', 'python-openstackclient', + # Copy the below from python-openstackclient's + # requirements to avoid a conflict + 'openstacksdk!=0.9.11,!=0.9.12,>=0.9.10', # with openstacklient >= 2.1.0, neutronclient no longer is # a dependency but we need it anyway. 'python-neutronclient', -- 2.39.5