summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2015-07-17 16:17:25 +0000
committerOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2015-07-17 16:17:25 +0000
commitd5d31fb6b8df7e39b90187e7defdbe3db4c665b8 (patch)
treef985f984a92971d72ae353b60351c5ee4dfd97f0
parent39cd06870c72da2bd4b4bbd9d58d1d7f27bde257 (diff)
downloadpython-ceilometerclient-d5d31fb6b8df7e39b90187e7defdbe3db4c665b8.tar.gz
Updated from global requirements
Change-Id: Id3a143b5253364ee2ef24f9541aa6a9b80be066d
-rw-r--r--requirements.txt4
-rw-r--r--setup.py2
-rw-r--r--test-requirements.txt2
3 files changed, 4 insertions, 4 deletions
diff --git a/requirements.txt b/requirements.txt
index fd82763..89b359d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,12 +1,12 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-pbr<2.0,>=0.11
+pbr<2.0,>=1.3
argparse
iso8601>=0.1.9
oslo.i18n>=1.5.0 # Apache-2.0
oslo.serialization>=1.4.0 # Apache-2.0
-oslo.utils>=1.6.0 # Apache-2.0
+oslo.utils>=1.9.0 # Apache-2.0
PrettyTable<0.8,>=0.7
python-keystoneclient>=1.6.0
requests>=2.5.2
diff --git a/setup.py b/setup.py
index 056c16c..d8080d0 100644
--- a/setup.py
+++ b/setup.py
@@ -25,5 +25,5 @@ except ImportError:
pass
setuptools.setup(
- setup_requires=['pbr'],
+ setup_requires=['pbr>=1.3'],
pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index a8ebac3..b831299 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,7 +6,7 @@ hacking<0.11,>=0.10.0
coverage>=3.6
discover
fixtures>=1.3.1
-mock>=1.1;python_version!='2.6'
+mock!=1.1.4,>=1.1;python_version!='2.6'
mock==1.0.1;python_version=='2.6'
oslosphinx>=2.5.0 # Apache-2.0
python-subunit>=0.0.18