summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2015-07-13 15:02:37 +0000
committerOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2015-07-13 15:02:37 +0000
commite3ef3db503ae95139f4868a4f1e3724b780a766e (patch)
tree0506496f02e2ae88934b7fd086181f6c01ac1aa5
parenta6d7335ddd7e11401fb6ef2fe8b20be0aef33c44 (diff)
downloadpython-ceilometerclient-e3ef3db503ae95139f4868a4f1e3724b780a766e.tar.gz
Updated from global requirements
Change-Id: Iefd21a4d65ea8a92d16867a167bb5e0cf3bab810
-rw-r--r--requirements.txt16
-rw-r--r--setup.py1
-rw-r--r--test-requirements.txt10
3 files changed, 13 insertions, 14 deletions
diff --git a/requirements.txt b/requirements.txt
index 22d73a6..8993f62 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,14 +1,14 @@
# 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>=0.6,!=0.7,<1.0
+pbr!=0.7,<1.0,>=0.6
argparse
iso8601>=0.1.9
-oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0
-oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0
-oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
-PrettyTable>=0.7,<0.8
-python-keystoneclient>=1.1.0,<1.4.0
-requests>=2.2.0,!=2.4.0
+oslo.i18n<1.6.0,>=1.5.0 # Apache-2.0
+oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
+oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
+PrettyTable<0.8,>=0.7
+python-keystoneclient<1.4.0,>=1.2.0
+requests!=2.4.0,>=2.2.0
six>=1.9.0
-stevedore>=1.3.0,<1.4.0 # Apache-2.0
+stevedore<1.4.0,>=1.3.0 # Apache-2.0
diff --git a/setup.py b/setup.py
index 7363757..056c16c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# 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 882cebb..c26f221 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,13 +2,13 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
# Hacking already pins down pep8, pyflakes and flake8
-hacking>=0.10.0,<0.11
+hacking<0.11,>=0.10.0
coverage>=3.6
discover
fixtures>=0.3.14
-mock>=1.0
-oslosphinx>=2.5.0,<2.6.0 # Apache-2.0
+mock<1.1.0,>=1.0
+oslosphinx<2.6.0,>=2.5.0 # Apache-2.0
python-subunit>=0.0.18
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
testrepository>=0.0.18
-testtools>=0.9.36,!=1.2.0
+testtools!=1.2.0,>=0.9.36