Updated from global requirements

Change-Id: Ibf423f14a5c37aa298b2115bfd4936f660c6f530

ceilometerclient/common/http.py

@@ -145,11 +145,13 @@ class HTTPClient(object):
             conn.request(method, conn_url, **kwargs)
             resp = conn.getresponse()
         except socket.gaierror as e:
-            message = "Error finding address for %(url)s: %(e)s" % locals()
+            message = ("Error finding address for %(url)s: %(e)s"
+                       % dict(url=url, e=e))
             raise exc.InvalidEndpoint(message=message)
         except (socket.error, socket.timeout) as e:
             endpoint = self.endpoint
-            message = "Error communicating with %(endpoint)s %(e)s" % locals()
+            message = ("Error communicating with %(endpoint)s %(e)s"
+                       % dict(endpoint=endpoint, e=e))
             raise exc.CommunicationError(message=message)
 
         body_iter = ResponseBodyIterator(resp)

ceilometerclient/tests/fakes.py

@@ -1,3 +1,14 @@
+#   Licensed under the Apache License, Version 2.0 (the "License"); you may
+#   not use this file except in compliance with the License. You may obtain
+#   a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#   License for the specific language governing permissions and limitations
+#   under the License.
 
 from keystoneclient.v2_0 import client as ksclient
 

ceilometerclient/tests/test_shell.py

@@ -1,3 +1,15 @@
+#   Licensed under the Apache License, Version 2.0 (the "License"); you may
+#   not use this file except in compliance with the License. You may obtain
+#   a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#   License for the specific language governing permissions and limitations
+#   under the License.
+
 import cStringIO
 import httplib2
 import re

requirements.txt

@@ -1,7 +1,6 @@
-d2to1>=0.2.10,<0.3
+pbr>=0.5.21,<1.0
-pbr>=0.5.16,<0.6
 argparse
 httplib2
 iso8601>=0.1.4
-prettytable>=0.6,<0.8
+PrettyTable>=0.6,<0.8
-python-keystoneclient>=0.2.1
+python-keystoneclient>=0.3.0

setup.py

@@ -14,8 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
 setuptools.setup(
-    setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5.16,<0.6'],
+    setup_requires=['pbr>=0.5.21,<1.0'],
-    d2to1=True)
+    pbr=True)

test-requirements.txt

@@ -2,12 +2,12 @@
 pep8==1.4.5
 pyflakes==0.7.2
 flake8==2.0
-hacking>=0.5.6,<0.6
+hacking>=0.5.6,<0.7
 coverage>=3.6
 discover
 fixtures>=0.3.12
 mox>=0.5.3
 python-subunit
 sphinx>=1.1.2
-testrepository>=0.0.13
+testrepository>=0.0.17
 testtools>=0.9.32

tox.ini

@@ -24,6 +24,6 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
 commands = {posargs}
 
 [flake8]
-ignore = E121,E122,E123,E128,E711,E721,E712,H302
+ignore = E121,E122,E123,E128,E711,E721,E712,H233,H302
 show-source = True
 exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools