Permit newer versions of nova client

python_novaclient prior to 2.14.2 has pbr requirements that conflict
with other modules' requirements, making installation impossible.
Newer versions are fine.

shell.py whitespace changes are to pass pep8. Dummy test is to pass
python27.

Change-Id: I506e9c9d23e155be29481153522b24c1b8235fe8
This commit is contained in:
Jamie McCarthy 2015-01-22 11:17:23 -05:00
parent ee5f2cfe4f
commit 48f93c8a74
3 changed files with 10 additions and 3 deletions

View File

@ -214,7 +214,7 @@ class LibraClientArgumentParser(argparse.ArgumentParser):
exits.
"""
self.print_usage(sys.stderr)
#FIXME(lzyeval): if changes occur in argparse.ArgParser._check_value
# FIXME(lzyeval): if changes occur in argparse.ArgParser._check_value
choose_from = ' (choose from'
progparts = self.prog.partition(' ')
self.exit(2, "error: %(errmsg)s\nTry '%(mainp)s help %(subp)s'"
@ -540,7 +540,7 @@ class LibraShell(object):
os_password = None
#FIXME(usrleon): Here should be restrict for project id same as
# FIXME(usrleon): Here should be restrict for project id same as
# for os_username or os_password but for compatibility it is not.
if not cliutils.isunauthenticated(args.func):
if auth_plugin:

View File

@ -1,4 +1,4 @@
python_novaclient>=2.14.1,<2.14.2
python_novaclient>=2.14.1,!=2.14.2
PrettyTable>=0.7,<0.8
babel
stevedore

View File

@ -0,0 +1,7 @@
import testtools
class test_dummy(testtools.TestCase):
def test_dummy(self):
self.assertEqual(1, 1)