From 1709fef25f085ec4ebf2686deb636b3a03b00a7a Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Wed, 18 Jun 2014 00:47:25 +0000 Subject: [PATCH] Updated from global requirements Change-Id: Ie9ea577f35f1eb6fc71876be0d4f721887f1d769 --- requirements.txt | 4 ++-- setup.py | 2 -- test-requirements.txt | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 7493a0ee6..596392d3d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,5 +4,5 @@ httplib2>=0.7.5 lxml>=2.3 pbr>=0.6,!=0.7,<1.0 PrettyTable>=0.7,<0.8 -python-keystoneclient>=0.8.0 -six>=1.6.0 +python-keystoneclient>=0.9.0 +six>=1.7.0 diff --git a/setup.py b/setup.py index 4a00f9b04..736375744 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- -# # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/test-requirements.txt b/test-requirements.txt index f6df81d11..f127f80cd 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,6 +6,6 @@ hacking>=0.8.0,<0.9 mock>=1.0 oslosphinx python-subunit>=0.0.18 -sphinx>=1.1.2,<1.2 +sphinx>=1.1.2,!=1.2.0,<1.3 testrepository>=0.0.18 testtools>=0.9.34