Hello community,

here is the log from the commit of package python-ceilometerclient for 
openSUSE:Factory checked in at 2016-10-13 11:29:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-ceilometerclient (Old)
 and      /work/SRC/openSUSE:Factory/.python-ceilometerclient.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-ceilometerclient"

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/python-ceilometerclient/python-ceilometerclient.changes
  2016-09-30 15:31:03.000000000 +0200
+++ 
/work/SRC/openSUSE:Factory/.python-ceilometerclient.new/python-ceilometerclient.changes
     2016-10-13 11:29:21.000000000 +0200
@@ -1,0 +2,11 @@
+Mon Sep 26 12:47:36 UTC 2016 - tbecht...@suse.com
+
+- update to version 2.6.1
+  * Remove discover from test-requirements
+  * Correct the parameters's position of assertEqual
+  * Remove keystoneclient dependency
+  * Fix from_response method to process response from requests
+  * [trivial] add a blank character
+  * Add support for Python 3.5
+
+-------------------------------------------------------------------

Old:
----
  python-ceilometerclient-2.5.0.tar.gz

New:
----
  python-ceilometerclient-2.6.1.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-ceilometerclient.spec ++++++
--- /var/tmp/diff_new_pack.CkuSMH/_old  2016-10-13 11:29:22.000000000 +0200
+++ /var/tmp/diff_new_pack.CkuSMH/_new  2016-10-13 11:29:22.000000000 +0200
@@ -18,7 +18,7 @@
 
 %global sname python-ceilometerclient
 Name:           python-ceilometerclient
-Version:        2.5.0
+Version:        2.6.1
 Release:        0
 Summary:        Python API and CLI for OpenStack Ceilometer
 License:        Apache-2.0
@@ -28,31 +28,30 @@
 BuildRequires:  openstack-macros
 BuildRequires:  python-PrettyTable >= 0.7
 BuildRequires:  python-devel
-BuildRequires:  python-keystoneclient >= 1.7.0
-BuildRequires:  python-mock >= 1.2
+BuildRequires:  python-keystoneauth1 >= 2.10.0
+BuildRequires:  python-mock >= 2.0
 BuildRequires:  python-oslo.i18n >= 2.1.0
 BuildRequires:  python-oslo.serialization >= 1.10.0
-BuildRequires:  python-oslo.utils >= 3.5.0
+BuildRequires:  python-oslo.utils >= 3.16.0
 BuildRequires:  python-pbr >= 1.6
 BuildRequires:  python-requests >= 2.10.0
-BuildRequires:  python-requests-mock >= 0.7.0
+BuildRequires:  python-requests-mock >= 1.0
 BuildRequires:  python-setuptools >= 16.0
 BuildRequires:  python-six >= 1.9.0
-BuildRequires:  python-stevedore >= 1.10.0
+BuildRequires:  python-stevedore >= 1.16.0
 BuildRequires:  python-testrepository >= 0.0.18
 BuildRequires:  python-testscenarios >= 0.4
 BuildRequires:  python-testtools >= 1.4.0
 Requires:       python-PrettyTable >= 0.7
 Requires:       python-iso8601 >= 0.1.11
-Requires:       python-keystoneauth1 >= 2.1.0
-Requires:       python-keystoneclient >= 1.7.0
+Requires:       python-keystoneauth1 >= 2.10.0
 Requires:       python-oslo.i18n >= 2.1.0
 Requires:       python-oslo.serialization >= 1.10.0
-Requires:       python-oslo.utils >= 3.5.0
+Requires:       python-oslo.utils >= 3.16.0
 Requires:       python-pbr >= 1.6
 Requires:       python-requests >= 2.10.0
 Requires:       python-six >= 1.9.0
-Requires:       python-stevedore >= 1.10.0
+Requires:       python-stevedore >= 1.16.0
 BuildArch:      noarch
 
 %description

++++++ _service ++++++
--- /var/tmp/diff_new_pack.CkuSMH/_old  2016-10-13 11:29:22.000000000 +0200
+++ /var/tmp/diff_new_pack.CkuSMH/_new  2016-10-13 11:29:22.000000000 +0200
@@ -1,13 +1,11 @@
 <services>
   <service mode="disabled" name="renderspec">
-    <param 
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/master/openstack/python-ceilometerclient/python-ceilometerclient.spec.j2</param>
+    <param 
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/newton/openstack/python-ceilometerclient/python-ceilometerclient.spec.j2</param>
     <param name="output-name">python-ceilometerclient.spec</param>
-    <param 
name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/master/global-requirements.txt</param>
+    <param 
name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/newton/global-requirements.txt</param>
   </service>
   <service mode="disabled" name="download_files">
     <param name="changesgenerate">enable</param>
   </service>
-  <service name="refresh_patches" mode="disabled">
-    <param name="changesgenerate">enable</param>
-  </service>
+  <service name="format_spec_file" mode="disabled"/>
 </services>

++++++ python-ceilometerclient-2.5.0.tar.gz -> 
python-ceilometerclient-2.6.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/python-ceilometerclient-2.5.0/AUTHORS 
new/python-ceilometerclient-2.6.1/AUTHORS
--- old/python-ceilometerclient-2.5.0/AUTHORS   2016-07-25 16:23:03.000000000 
+0200
+++ new/python-ceilometerclient-2.6.1/AUTHORS   2016-09-08 15:48:33.000000000 
+0200
@@ -108,5 +108,7 @@
 venkatamahesh <venkatamaheshko...@gmail.com>
 xialinjuan <ljxi...@cn.ibm.com>
 xiangjun li <lixiang...@cn.fujitsu.com>
+xiaozhuangqing <zhuangqing.x...@easystack.cn>
 yolanda.robla <yolanda.ro...@canonical.com>
 yuyafei <yu.ya...@zte.com.cn>
+zhangguoqing <zhang.guoq...@99cloud.net>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/python-ceilometerclient-2.5.0/ChangeLog 
new/python-ceilometerclient-2.6.1/ChangeLog
--- old/python-ceilometerclient-2.5.0/ChangeLog 2016-07-25 16:23:03.000000000 
+0200
+++ new/python-ceilometerclient-2.6.1/ChangeLog 2016-09-08 15:48:33.000000000 
+0200
@@ -1,6 +1,20 @@
 CHANGES
 =======
 
+2.6.1
+-----
+
+* Fix from_response method to process response from requests
+
+2.6.0
+-----
+
+* [trivial] add a blank character
+* Correct the parameters's position of assertEqual
+* Remove keystoneclient dependency
+* Add support for Python 3.5
+* Remove discover from test-requirements
+
 2.5.0
 -----
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/python-ceilometerclient-2.5.0/PKG-INFO 
new/python-ceilometerclient-2.6.1/PKG-INFO
--- old/python-ceilometerclient-2.5.0/PKG-INFO  2016-07-25 16:23:03.000000000 
+0200
+++ new/python-ceilometerclient-2.6.1/PKG-INFO  2016-09-08 15:48:34.000000000 
+0200
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: python-ceilometerclient
-Version: 2.5.0
+Version: 2.6.1
 Summary: OpenStack Telemetry API Client Library
 Home-page: http://docs.openstack.org/developer/python-ceilometerclient
 Author: OpenStack
@@ -47,3 +47,4 @@
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/python-ceilometerclient-2.5.0/ceilometerclient/exc.py 
new/python-ceilometerclient-2.6.1/ceilometerclient/exc.py
--- old/python-ceilometerclient-2.5.0/ceilometerclient/exc.py   2016-07-25 
16:20:09.000000000 +0200
+++ new/python-ceilometerclient-2.6.1/ceilometerclient/exc.py   2016-09-08 
15:46:41.000000000 +0200
@@ -118,6 +118,16 @@
 
 
 def from_response(response, details=None):
-    """Return an instance of an HTTPException based on httplib response."""
-    cls = _code_map.get(response.status, HTTPException)
+    """Return an instance of an HTTPException based on http response."""
+    if hasattr(response, "status"):
+        # it is response from HTTPClient (httplib)
+        code = response.status
+    elif hasattr(response, "status_code"):
+        # it is response from SessionClient (requests)
+        code = response.status_code
+    else:
+        # it is something unexpected
+        raise TypeError("Function 'from_response' expects only response object"
+                        " from httplib or requests libraries.")
+    cls = _code_map.get(code, HTTPException)
     return cls(details)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/python-ceilometerclient-2.5.0/ceilometerclient/tests/unit/fakes.py 
new/python-ceilometerclient-2.6.1/ceilometerclient/tests/unit/fakes.py
--- old/python-ceilometerclient-2.5.0/ceilometerclient/tests/unit/fakes.py      
2016-07-25 16:20:09.000000000 +0200
+++ new/python-ceilometerclient-2.6.1/ceilometerclient/tests/unit/fakes.py      
1970-01-01 01:00:00.000000000 +0100
@@ -1,64 +0,0 @@
-#   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
-
-
-def script_keystone_client():
-    ksclient.Client(auth_url='http://no.where',
-                    insecure=False,
-                    password='password',
-                    tenant_id='',
-                    tenant_name='tenant_name',
-                    username='username').AndReturn(FakeKeystone('abcd1234'))
-
-
-def fake_headers():
-    return {'X-Auth-Token': 'abcd1234',
-            'Content-Type': 'application/json',
-            'Accept': 'application/json',
-            'User-Agent': 'python-ceilometerclient'}
-
-
-class FakeServiceCatalog(object):
-    @staticmethod
-    def url_for(endpoint_type, service_type):
-        return 'http://192.168.1.5:8004/v1/f14b41234'
-
-
-class FakeKeystone(object):
-    service_catalog = FakeServiceCatalog()
-
-    def __init__(self, auth_token):
-        self.auth_token = auth_token
-
-
-class FakeHTTPResponse(object):
-
-    version = 1.1
-
-    def __init__(self, status, reason, headers, body):
-        self.headers = headers
-        self.body = body
-        self.status = status
-        self.reason = reason
-
-    def getheader(self, name, default=None):
-        return self.headers.get(name, default)
-
-    def getheaders(self):
-        return self.headers.items()
-
-    def read(self, amt=None):
-        b = self.body
-        self.body = None
-        return b
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/python-ceilometerclient-2.5.0/ceilometerclient/tests/unit/test_client.py 
new/python-ceilometerclient-2.6.1/ceilometerclient/tests/unit/test_client.py
--- 
old/python-ceilometerclient-2.5.0/ceilometerclient/tests/unit/test_client.py    
    2016-07-25 16:20:09.000000000 +0200
+++ 
new/python-ceilometerclient-2.6.1/ceilometerclient/tests/unit/test_client.py    
    2016-09-08 15:46:41.000000000 +0200
@@ -22,7 +22,6 @@
 from ceilometerclient import client
 from ceilometerclient import exc
 from ceilometerclient.openstack.common.apiclient import exceptions
-from ceilometerclient.tests.unit import fakes
 from ceilometerclient.tests.unit import utils
 from ceilometerclient.v2 import client as v2client
 
@@ -77,7 +76,6 @@
         c2 = self.create_client(env)
         self.assertIsInstance(c2, v2client.Client)
 
-    @mock.patch('keystoneclient.v2_0.client', fakes.FakeKeystone)
     def test_client_without_auth_plugin(self):
         env = FAKE_ENV.copy()
         del env['auth_plugin']
@@ -201,7 +199,6 @@
                         return_value=mock.MagicMock()):
             return client.get_client(api_version, **env)
 
-    @mock.patch('keystoneclient.v2_0.client', fakes.FakeKeystone)
     def test_client_without_auth_plugin(self):
         env = FAKE_ENV.copy()
         del env['auth_plugin']
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/python-ceilometerclient-2.5.0/ceilometerclient/tests/unit/test_exc.py 
new/python-ceilometerclient-2.6.1/ceilometerclient/tests/unit/test_exc.py
--- old/python-ceilometerclient-2.5.0/ceilometerclient/tests/unit/test_exc.py   
2016-07-25 16:20:09.000000000 +0200
+++ new/python-ceilometerclient-2.6.1/ceilometerclient/tests/unit/test_exc.py   
2016-09-08 15:46:41.000000000 +0200
@@ -69,3 +69,19 @@
                 {"error_message": {"faultstring": "oops"}}))
             ret_str = k + " (HTTP " + str(exception.code) + ") ERROR oops"
             self.assertEqual(ret_str, str(exception))
+
+    def test_from_response(self):
+        class HTTPLibLikeResponse(object):
+            status = 400
+
+        class RequestsLikeResponse(object):
+            status_code = 401
+
+        class UnexpectedResponse(object):
+            code = 200
+
+        self.assertEqual(HTTPLibLikeResponse.status,
+                         exc.from_response(HTTPLibLikeResponse).code)
+        self.assertEqual(RequestsLikeResponse.status_code,
+                         exc.from_response(RequestsLikeResponse).code)
+        self.assertRaises(TypeError, exc.from_response, UnexpectedResponse)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/python-ceilometerclient-2.5.0/ceilometerclient/tests/unit/v2/test_alarms.py 
new/python-ceilometerclient-2.6.1/ceilometerclient/tests/unit/v2/test_alarms.py
--- 
old/python-ceilometerclient-2.5.0/ceilometerclient/tests/unit/v2/test_alarms.py 
    2016-07-25 16:20:09.000000000 +0200
+++ 
new/python-ceilometerclient-2.6.1/ceilometerclient/tests/unit/v2/test_alarms.py 
    2016-09-08 15:46:41.000000000 +0200
@@ -279,8 +279,8 @@
             'GET', '/v2/alarms'
         ]
         self.http_client.assert_called(*expect)
-        self.assertEqual(len(alarms), 1)
-        self.assertEqual(alarms[0].alarm_id, 'alarm-id')
+        self.assertEqual(1, len(alarms))
+        self.assertEqual('alarm-id', alarms[0].alarm_id)
 
     def test_list_with_query(self):
         alarms = list(self.mgr.list(q=[{"field": "project_id",
@@ -293,8 +293,8 @@
             '&q.type=&q.type=&q.value=project-id&q.value=SwiftObjectAlarm',
         ]
         self.http_client.assert_called(*expect)
-        self.assertEqual(len(alarms), 1)
-        self.assertEqual(alarms[0].alarm_id, 'alarm-id')
+        self.assertEqual(1, len(alarms))
+        self.assertEqual('alarm-id', alarms[0].alarm_id)
 
     def test_get(self):
         alarm = self.mgr.get(alarm_id='alarm-id')
@@ -303,7 +303,7 @@
         ]
         self.http_client.assert_called(*expect)
         self.assertIsNotNone(alarm)
-        self.assertEqual(alarm.alarm_id, 'alarm-id')
+        self.assertEqual('alarm-id', alarm.alarm_id)
         self.assertEqual(alarm.rule, alarm.threshold_rule)
 
     def test_create(self):
@@ -325,7 +325,7 @@
         self.http_client.assert_called(*expect_get, pos=0)
         self.http_client.assert_called(*expect_put, pos=1)
         self.assertIsNotNone(alarm)
-        self.assertEqual(alarm.alarm_id, 'alarm-id')
+        self.assertEqual('alarm-id', alarm.alarm_id)
         for (key, value) in six.iteritems(UPDATED_ALARM):
             self.assertEqual(getattr(alarm, key), value)
 
@@ -340,7 +340,7 @@
         self.http_client.assert_called(*expect_get, pos=0)
         self.http_client.assert_called(*expect_put, pos=1)
         self.assertIsNotNone(alarm)
-        self.assertEqual(alarm.alarm_id, 'alarm-id')
+        self.assertEqual('alarm-id', alarm.alarm_id)
         for (key, value) in six.iteritems(UPDATED_ALARM):
             self.assertEqual(getattr(alarm, key), value)
 
@@ -350,7 +350,7 @@
             'PUT', '/v2/alarms/alarm-id/state'
         ]
         self.http_client.assert_called(*expect, body='alarm')
-        self.assertEqual(state, {'alarm': 'alarm'})
+        self.assertEqual({'alarm': 'alarm'}, state)
 
     def test_get_state(self):
         state = self.mgr.get_state(alarm_id='alarm-id')
@@ -358,7 +358,7 @@
             'GET', '/v2/alarms/alarm-id/state'
         ]
         self.http_client.assert_called(*expect)
-        self.assertEqual(state, {'alarm': 'alarm'})
+        self.assertEqual({'alarm': 'alarm'}, state)
 
     def test_delete(self):
         deleted = self.mgr.delete(alarm_id='victim-id')
@@ -472,7 +472,7 @@
         ]
         self.http_client.assert_called(*expect_put)
         self.assertIsNotNone(alarm)
-        self.assertEqual(alarm.alarm_id, 'alarm-id')
+        self.assertEqual('alarm-id', alarm.alarm_id)
         for (key, value) in six.iteritems(UPDATED_ALARM):
             self.assertEqual(getattr(alarm, key), value)
 
@@ -487,7 +487,7 @@
         ]
         self.http_client.assert_called(*expect_put)
         self.assertIsNotNone(alarm)
-        self.assertEqual(alarm.alarm_id, 'alarm-id')
+        self.assertEqual('alarm-id', alarm.alarm_id)
         for (key, value) in six.iteritems(UPDATED_ALARM):
             self.assertEqual(getattr(alarm, key), value)
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/python-ceilometerclient-2.5.0/ceilometerclient/tests/unit/v2/test_event_types.py
 
new/python-ceilometerclient-2.6.1/ceilometerclient/tests/unit/v2/test_event_types.py
--- 
old/python-ceilometerclient-2.5.0/ceilometerclient/tests/unit/v2/test_event_types.py
        2016-07-25 16:20:09.000000000 +0200
+++ 
new/python-ceilometerclient-2.6.1/ceilometerclient/tests/unit/v2/test_event_types.py
        2016-09-08 15:46:41.000000000 +0200
@@ -43,8 +43,8 @@
             'GET', '/v2/event_types/'
         ]
         self.http_client.assert_called(*expect)
-        self.assertEqual(len(event_types), 4)
-        self.assertEqual(event_types[0].event_type, "Foo")
-        self.assertEqual(event_types[1].event_type, "Bar")
-        self.assertEqual(event_types[2].event_type, "Sna")
-        self.assertEqual(event_types[3].event_type, "Fu")
+        self.assertEqual(4, len(event_types))
+        self.assertEqual("Foo", event_types[0].event_type)
+        self.assertEqual("Bar", event_types[1].event_type)
+        self.assertEqual("Sna", event_types[2].event_type)
+        self.assertEqual("Fu", event_types[3].event_type)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/python-ceilometerclient-2.5.0/ceilometerclient/tests/unit/v2/test_resources.py
 
new/python-ceilometerclient-2.6.1/ceilometerclient/tests/unit/v2/test_resources.py
--- 
old/python-ceilometerclient-2.5.0/ceilometerclient/tests/unit/v2/test_resources.py
  2016-07-25 16:20:09.000000000 +0200
+++ 
new/python-ceilometerclient-2.6.1/ceilometerclient/tests/unit/v2/test_resources.py
  2016-09-08 15:46:41.000000000 +0200
@@ -100,9 +100,9 @@
             'GET', '/v2/resources?meter_links=0'
         ]
         self.http_client.assert_called(*expect)
-        self.assertEqual(len(resources), 2)
-        self.assertEqual(resources[0].resource_id, 'a')
-        self.assertEqual(resources[1].resource_id, 'b')
+        self.assertEqual(2, len(resources))
+        self.assertEqual('a', resources[0].resource_id)
+        self.assertEqual('b', resources[1].resource_id)
 
     def test_list_all_with_links_enabled(self):
         resources = list(self.mgr.list(links=True))
@@ -121,7 +121,7 @@
         ]
         self.http_client.assert_called(*expect)
         self.assertIsNotNone(resource)
-        self.assertEqual(resource.resource_id, 'a')
+        self.assertEqual('a', resource.resource_id)
 
     def test_list_by_query(self):
         resources = list(self.mgr.list(q=[{"field": "resource_id",
@@ -132,8 +132,8 @@
             '&q.type=&q.value=a&meter_links=0'
         ]
         self.http_client.assert_called(*expect)
-        self.assertEqual(len(resources), 1)
-        self.assertEqual(resources[0].resource_id, 'a')
+        self.assertEqual(1, len(resources))
+        self.assertEqual('a', resources[0].resource_id)
 
     def test_get_from_resource_class(self):
         resource = self.mgr.get(resource_id='a')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/python-ceilometerclient-2.5.0/ceilometerclient/tests/unit/v2/test_samples.py
 
new/python-ceilometerclient-2.6.1/ceilometerclient/tests/unit/v2/test_samples.py
--- 
old/python-ceilometerclient-2.5.0/ceilometerclient/tests/unit/v2/test_samples.py
    2016-07-25 16:20:09.000000000 +0200
+++ 
new/python-ceilometerclient-2.6.1/ceilometerclient/tests/unit/v2/test_samples.py
    2016-09-08 15:46:41.000000000 +0200
@@ -147,8 +147,8 @@
             'GET', '/v2/meters/instance'
         ]
         self.http_client.assert_called(*expect)
-        self.assertEqual(len(samples), 1)
-        self.assertEqual(samples[0].resource_id, 'resource-id')
+        self.assertEqual(1, len(samples))
+        self.assertEqual('resource-id', samples[0].resource_id)
 
     def test_list_by_meter_name_extended(self):
         samples = list(self.mgr.list(meter_name='instance',
@@ -160,7 +160,7 @@
                                      ]))
         expect = ['GET', '%s?%s' % (METER_URL, QUERIES)]
         self.http_client.assert_called(*expect)
-        self.assertEqual(len(samples), 0)
+        self.assertEqual(0, len(samples))
 
     def test_create(self):
         sample = self.mgr.create(**CREATE_SAMPLE)
@@ -200,7 +200,7 @@
         samples = list(self.mgr.list(meter_name='instance', limit=1))
         expect = ['GET', '/v2/meters/instance?limit=1']
         self.http_client.assert_called(*expect)
-        self.assertEqual(len(samples), 1)
+        self.assertEqual(1, len(samples))
 
 
 class SampleManagerTest(utils.BaseTestCase):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/python-ceilometerclient-2.5.0/ceilometerclient/tests/unit/v2/test_shell.py 
new/python-ceilometerclient-2.6.1/ceilometerclient/tests/unit/v2/test_shell.py
--- 
old/python-ceilometerclient-2.5.0/ceilometerclient/tests/unit/v2/test_shell.py  
    2016-07-25 16:20:09.000000000 +0200
+++ 
new/python-ceilometerclient-2.6.1/ceilometerclient/tests/unit/v2/test_shell.py  
    2016-09-08 15:46:41.000000000 +0200
@@ -538,72 +538,11 @@
         ceilometer_shell.\
             do_alarm_gnocchi_aggregation_by_metrics_threshold_create(
                 self.cc, self.args)
-        self.assertEqual('''\
-+---------------------------+------------------------------------------\
---------------------------+
-| Property                  | Value                                    \
-                          |
-+---------------------------+------------------------------------------\
---------------------------+
-| aggregation_method        | count                                    \
-                          |
-| alarm_actions             | ["http://something/alarm";]               \
-                          |
-| alarm_id                  | b69ecdb9-f19b-4fb5-950f-5eb53938b718     \
-                          |
-| comparison_operator       | le                                       \
-                          |
-| description               | description_gnocchi_alarm                \
-                          |
-| enabled                   | True                                     \
-                          |
-| evaluation_periods        | 3                                        \
-                          |
-| granularity               | 60                                       \
-                          |
-| insufficient_data_actions | ["http://something/insufficient";]        \
-                          |
-| metrics                   | ["b3d9d8ab-05e8-439f-89ad-5e978dd2a5eb", \
-"009d4faf-c275-46f0-8f2d- |
-|                           | 670b15bac2b0"]                           \
-                          |
-| name                      | name_gnocchi_alarm                       \
-                          |
-| ok_actions                | ["http://something/ok";]                  \
-                          |
-| project_id                | 97fcad0402ce4f65ac3bd42a0c6a7e74         \
-                          |
-| repeat_actions            | True                                     \
-                          |
-| severity                  | critical                                 \
-                          |
-| state                     | ok                                       \
-                          |
-| threshold                 | 70.0                                     \
-                          |
-| time_constraints          | [{name: cons1,                           \
-                          |
-|                           |   description: desc1,                    \
-                          |
-|                           |   start: 0 11 * * *,                     \
-                          |
-|                           |   duration: 300},                        \
-                          |
-|                           |  {name: cons2,                           \
-                          |
-|                           |   description: desc2,                    \
-                          |
-|                           |   start: 0 23 * * *,                     \
-                          |
-|                           |   duration: 600}]                        \
-                          |
-| type                      | gnocchi_aggregation_by_metrics_threshold \
-                          |
-| user_id                   | f28735621ee84f329144eb467c91fce6         \
-                          |
-+---------------------------+------------------------------------------\
---------------------------+
-''', sys.stdout.getvalue())
+        stdout = sys.stdout.getvalue()
+        self.assertIn("b69ecdb9-f19b-4fb5-950f-5eb53938b718", stdout)
+        self.assertIn("[\"http://something/alarm\"]";, stdout)
+        self.assertIn("description_gnocchi_alarm", stdout)
+        self.assertIn("gnocchi_aggregation_by_metrics_threshold", stdout)
 
     @mock.patch('sys.stdout', new=six.StringIO())
     def test_do_alarm_gnocchi_aggr_by_resources_threshold_create(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/python-ceilometerclient-2.5.0/ceilometerclient/tests/unit/v2/test_statistics.py
 
new/python-ceilometerclient-2.6.1/ceilometerclient/tests/unit/v2/test_statistics.py
--- 
old/python-ceilometerclient-2.5.0/ceilometerclient/tests/unit/v2/test_statistics.py
 2016-07-25 16:20:09.000000000 +0200
+++ 
new/python-ceilometerclient-2.6.1/ceilometerclient/tests/unit/v2/test_statistics.py
 2016-09-08 15:46:41.000000000 +0200
@@ -125,8 +125,8 @@
             'GET', '/v2/meters/instance/statistics'
         ]
         self.http_client.assert_called(*expect)
-        self.assertEqual(len(stats), 1)
-        self.assertEqual(stats[0].count, 135)
+        self.assertEqual(1, len(stats))
+        self.assertEqual(135, stats[0].count)
 
     def test_list_by_meter_name_extended(self):
         stats = list(self.mgr.list(meter_name='instance',
@@ -140,8 +140,8 @@
             'GET', '%s?%s' % (base_url, qry)
         ]
         self.http_client.assert_called(*expect)
-        self.assertEqual(len(stats), 1)
-        self.assertEqual(stats[0].count, 135)
+        self.assertEqual(1, len(stats))
+        self.assertEqual(135, stats[0].count)
 
     def test_list_by_meter_name_with_period(self):
         stats = list(self.mgr.list(meter_name='instance',
@@ -156,8 +156,8 @@
             'GET', '%s?%s%s' % (base_url, qry, period)
         ]
         self.http_client.assert_called(*expect)
-        self.assertEqual(len(stats), 1)
-        self.assertEqual(stats[0].count, 135)
+        self.assertEqual(1, len(stats))
+        self.assertEqual(135, stats[0].count)
 
     def test_list_by_meter_name_with_groupby(self):
         stats = list(self.mgr.list(meter_name='instance',
@@ -173,11 +173,11 @@
             '%s?%s%s' % (base_url, qry, groupby)
         ]
         self.http_client.assert_called(*expect)
-        self.assertEqual(len(stats), 2)
-        self.assertEqual(stats[0].count, 135)
-        self.assertEqual(stats[1].count, 12)
-        self.assertEqual(stats[0].groupby.get('resource_id'), 'foo')
-        self.assertEqual(stats[1].groupby.get('resource_id'), 'bar')
+        self.assertEqual(2, len(stats))
+        self.assertEqual(135, stats[0].count)
+        self.assertEqual(12, stats[1].count)
+        self.assertEqual('foo', stats[0].groupby.get('resource_id'))
+        self.assertEqual('bar', stats[1].groupby.get('resource_id'))
 
     def test_list_by_meter_name_with_groupby_as_str(self):
         stats = list(self.mgr.list(meter_name='instance',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/python-ceilometerclient-2.5.0/ceilometerclient/tests/unit/v2/test_trait_descriptions.py
 
new/python-ceilometerclient-2.6.1/ceilometerclient/tests/unit/v2/test_trait_descriptions.py
--- 
old/python-ceilometerclient-2.5.0/ceilometerclient/tests/unit/v2/test_trait_descriptions.py
 2016-07-25 16:20:09.000000000 +0200
+++ 
new/python-ceilometerclient-2.6.1/ceilometerclient/tests/unit/v2/test_trait_descriptions.py
 2016-09-08 15:46:41.000000000 +0200
@@ -46,7 +46,7 @@
             'GET', '/v2/event_types/Foo/traits'
         ]
         self.http_client.assert_called(*expect)
-        self.assertEqual(len(trait_descriptions), 3)
+        self.assertEqual(3, len(trait_descriptions))
         for i, vals in enumerate([('trait_1', 'string'),
                                   ('trait_2', 'integer'),
                                   ('trait_3', 'datetime')]):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/python-ceilometerclient-2.5.0/ceilometerclient/tests/unit/v2/test_traits.py 
new/python-ceilometerclient-2.6.1/ceilometerclient/tests/unit/v2/test_traits.py
--- 
old/python-ceilometerclient-2.5.0/ceilometerclient/tests/unit/v2/test_traits.py 
    2016-07-25 16:20:09.000000000 +0200
+++ 
new/python-ceilometerclient-2.6.1/ceilometerclient/tests/unit/v2/test_traits.py 
    2016-09-08 15:46:41.000000000 +0200
@@ -48,7 +48,7 @@
             'GET', '/v2/event_types/Foo/traits/trait_1'
         ]
         self.http_client.assert_called(*expect)
-        self.assertEqual(len(traits), 2)
+        self.assertEqual(2, len(traits))
         for i, vals in enumerate([('trait_1',
                                    'datetime',
                                    '2014-01-07T17:22:10.925553'),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/python-ceilometerclient-2.5.0/ceilometerclient/v2/shell.py 
new/python-ceilometerclient-2.6.1/ceilometerclient/v2/shell.py
--- old/python-ceilometerclient-2.5.0/ceilometerclient/v2/shell.py      
2016-07-25 16:20:09.000000000 +0200
+++ new/python-ceilometerclient-2.6.1/ceilometerclient/v2/shell.py      
2016-09-08 15:46:41.000000000 +0200
@@ -1108,7 +1108,7 @@
 
 @utils.arg('-q', '--query', metavar='<QUERY>',
            help='key[op]data_type::value; list. data_type is optional, '
-                'but if supplied must be string, integer, float'
+                'but if supplied must be string, integer, float '
                 'or datetime.')
 @utils.arg('--no-traits', dest='no_traits', action='store_true',
            help='If specified, traits will not be printed.')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/python-ceilometerclient-2.5.0/python_ceilometerclient.egg-info/PKG-INFO 
new/python-ceilometerclient-2.6.1/python_ceilometerclient.egg-info/PKG-INFO
--- old/python-ceilometerclient-2.5.0/python_ceilometerclient.egg-info/PKG-INFO 
2016-07-25 16:23:03.000000000 +0200
+++ new/python-ceilometerclient-2.6.1/python_ceilometerclient.egg-info/PKG-INFO 
2016-09-08 15:48:33.000000000 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: python-ceilometerclient
-Version: 2.5.0
+Version: 2.6.1
 Summary: OpenStack Telemetry API Client Library
 Home-page: http://docs.openstack.org/developer/python-ceilometerclient
 Author: OpenStack
@@ -47,3 +47,4 @@
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/python-ceilometerclient-2.5.0/python_ceilometerclient.egg-info/SOURCES.txt 
new/python-ceilometerclient-2.6.1/python_ceilometerclient.egg-info/SOURCES.txt
--- 
old/python-ceilometerclient-2.5.0/python_ceilometerclient.egg-info/SOURCES.txt  
    2016-07-25 16:23:03.000000000 +0200
+++ 
new/python-ceilometerclient-2.6.1/python_ceilometerclient.egg-info/SOURCES.txt  
    2016-09-08 15:48:34.000000000 +0200
@@ -32,7 +32,6 @@
 ceilometerclient/tests/functional/test_readonly_ceilometer.py
 ceilometerclient/tests/functional/hooks/post_test_hook.sh
 ceilometerclient/tests/unit/__init__.py
-ceilometerclient/tests/unit/fakes.py
 ceilometerclient/tests/unit/test_client.py
 ceilometerclient/tests/unit/test_exc.py
 ceilometerclient/tests/unit/test_openstack_common.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/python-ceilometerclient-2.5.0/python_ceilometerclient.egg-info/pbr.json 
new/python-ceilometerclient-2.6.1/python_ceilometerclient.egg-info/pbr.json
--- old/python-ceilometerclient-2.5.0/python_ceilometerclient.egg-info/pbr.json 
2016-07-25 16:23:03.000000000 +0200
+++ new/python-ceilometerclient-2.6.1/python_ceilometerclient.egg-info/pbr.json 
2016-09-08 15:48:33.000000000 +0200
@@ -1 +1 @@
-{"git_version": "cfea4ae", "is_release": true}
\ No newline at end of file
+{"git_version": "090e5ff", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/python-ceilometerclient-2.5.0/python_ceilometerclient.egg-info/requires.txt 
new/python-ceilometerclient-2.6.1/python_ceilometerclient.egg-info/requires.txt
--- 
old/python-ceilometerclient-2.5.0/python_ceilometerclient.egg-info/requires.txt 
    2016-07-25 16:23:03.000000000 +0200
+++ 
new/python-ceilometerclient-2.6.1/python_ceilometerclient.egg-info/requires.txt 
    2016-09-08 15:48:33.000000000 +0200
@@ -5,7 +5,6 @@
 oslo.serialization>=1.10.0
 oslo.utils>=3.5.0
 PrettyTable<0.8,>=0.7
-python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0
 requests!=2.9.0,>=2.8.1
 six>=1.9.0
 stevedore>=1.10.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/python-ceilometerclient-2.5.0/requirements.txt 
new/python-ceilometerclient-2.6.1/requirements.txt
--- old/python-ceilometerclient-2.5.0/requirements.txt  2016-07-25 
16:20:09.000000000 +0200
+++ new/python-ceilometerclient-2.6.1/requirements.txt  2016-09-08 
15:46:41.000000000 +0200
@@ -8,7 +8,6 @@
 oslo.serialization>=1.10.0 # Apache-2.0
 oslo.utils>=3.5.0 # Apache-2.0
 PrettyTable<0.8,>=0.7 # BSD
-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.10.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/python-ceilometerclient-2.5.0/setup.cfg 
new/python-ceilometerclient-2.6.1/setup.cfg
--- old/python-ceilometerclient-2.5.0/setup.cfg 2016-07-25 16:23:03.000000000 
+0200
+++ new/python-ceilometerclient-2.6.1/setup.cfg 2016-09-08 15:48:34.000000000 
+0200
@@ -17,6 +17,7 @@
        Programming Language :: Python :: 2.7
        Programming Language :: Python :: 3
        Programming Language :: Python :: 3.4
+       Programming Language :: Python :: 3.5
 
 [files]
 packages = 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/python-ceilometerclient-2.5.0/test-requirements.txt 
new/python-ceilometerclient-2.6.1/test-requirements.txt
--- old/python-ceilometerclient-2.5.0/test-requirements.txt     2016-07-25 
16:20:09.000000000 +0200
+++ new/python-ceilometerclient-2.6.1/test-requirements.txt     2016-09-08 
15:46:41.000000000 +0200
@@ -3,7 +3,6 @@
 # process, which may cause wedges in the gate later.
 # Hacking already pins down pep8, pyflakes and flake8
 coverage>=3.6 # Apache-2.0
-discover # BSD
 fixtures<2.0,>=1.3.1 # Apache-2.0/BSD
 mock>=1.2 # BSD
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/python-ceilometerclient-2.5.0/tox.ini 
new/python-ceilometerclient-2.6.1/tox.ini
--- old/python-ceilometerclient-2.5.0/tox.ini   2016-07-25 16:20:09.000000000 
+0200
+++ new/python-ceilometerclient-2.6.1/tox.ini   2016-09-08 15:46:41.000000000 
+0200
@@ -1,5 +1,5 @@
 [tox]
-envlist = py34,py27,pypy,pep8
+envlist = py34,py35,py27,pypy,pep8
 minversion = 1.6
 skipsdist = True
 


Reply via email to