summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.rst8
-rw-r--r--ceilometerclient/v2/client.py4
-rw-r--r--requirements.txt4
-rw-r--r--test-requirements.txt2
4 files changed, 13 insertions, 5 deletions
diff --git a/README.rst b/README.rst
index cccad04..fdb7fc7 100644
--- a/README.rst
+++ b/README.rst
@@ -1,6 +1,14 @@
Python bindings to the Ceilometer API
=====================================
+.. image:: https://img.shields.io/pypi/v/python-ceilometerclient.svg
+ :target: https://pypi.python.org/pypi/python-ceilometerclient/
+ :alt: Latest Version
+
+.. image:: https://img.shields.io/pypi/dm/python-ceilometerclient.svg
+ :target: https://pypi.python.org/pypi/python-ceilometerclient/
+ :alt: Downloads
+
This is a client library for Ceilometer built on the Ceilometer API. It
provides a Python API (the ``ceilometerclient`` module) and a command-line tool
(``ceilometer``).
diff --git a/ceilometerclient/v2/client.py b/ceilometerclient/v2/client.py
index f613cec..3aaf9b1 100644
--- a/ceilometerclient/v2/client.py
+++ b/ceilometerclient/v2/client.py
@@ -110,8 +110,8 @@ class Client(object):
kwargs['auth_plugin'] = ceiloclient.get_auth_plugin(
aodh_endpoint, **kwargs)
else:
- # Users may just provided ceilometer endpoint and token, and no
- # auth_url, in this case, we need 'aodh_endpoint' also
+ # Users may just provide ceilometer endpoint and token, and no
+ # auth_url, in this case, we need 'aodh_endpoint' also to be
# provided, otherwise we cannot get aodh endpoint from
# keystone, and assume aodh is unavailable.
return None
diff --git a/requirements.txt b/requirements.txt
index cc0c4e8..0e2259d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,11 +4,11 @@
pbr>=1.6 # Apache-2.0
iso8601>=0.1.9 # MIT
keystoneauth1>=2.1.0 # Apache-2.0
-oslo.i18n>=1.5.0 # Apache-2.0
+oslo.i18n>=2.1.0 # Apache-2.0
oslo.serialization>=1.10.0 # Apache-2.0
oslo.utils>=3.4.0 # Apache-2.0
PrettyTable<0.8,>=0.7 # BSD
-python-keystoneclient!=1.8.0,>=1.6.0 # Apache-2.0
+python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0
requests!=2.9.0,>=2.8.1 # Apache-2.0
six>=1.9.0 # MIT
stevedore>=1.5.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 8641064..95db34b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,6 +10,6 @@ mock>=1.2 # BSD
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
python-subunit>=0.0.18 # Apache-2.0/BSD
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
-tempest-lib>=0.13.0 # Apache-2.0
+tempest-lib>=0.14.0 # Apache-2.0
testrepository>=0.0.18 # Apache-2.0/BSD
testtools>=1.4.0 # MIT