diff -pruN 2.3.0-2/AUTHORS 2.4.1-0ubuntu1/AUTHORS --- 2.3.0-2/AUTHORS 1970-01-01 00:00:00.000000000 +0000 +++ 2.4.1-0ubuntu1/AUTHORS 2022-02-16 17:35:32.000000000 +0000 @@ -0,0 +1,43 @@ +Andreas Jaeger +Andrew Smith +Cao Xuan Hoang +Chris Dent +Clément Contini +Corey Bryant +Darren Hague +Doug Hellmann +Flavio Percoco +Ghanshyam Mann +Hanxi Liu +Julien Danjou +Le Hou +Mehdi Abaakouk +Monty Taylor +Nadya Privalova +OpenStack Release Bot +Rohit Jaiswal +Romain LE DISEZ +Romain Soufflet +Romain de Joux +Sean McGinnis +Steve Lewis +Swapnil Kulkarni (coolsvap) +Takashi Kajinami +Thomas Bechtold +Tom Cocozzello +Tony Breeds +Vu Cong Tuan +Yandong Xuan +Yuanbin.Chen +ZhiQiang Fan +aditi +gengchc2 +gord chung +gordon chung +prankul mahajan +sonu.kumar +venkatamahesh +xiaozhuangqing +xuanyandong +zhangboye +zhurong diff -pruN 2.3.0-2/ceilometermiddleware/swift.py 2.4.1-0ubuntu1/ceilometermiddleware/swift.py --- 2.3.0-2/ceilometermiddleware/swift.py 2021-03-12 12:30:09.000000000 +0000 +++ 2.4.1-0ubuntu1/ceilometermiddleware/swift.py 2022-02-16 17:34:58.000000000 +0000 @@ -73,11 +73,9 @@ from pycadf.helper import api from pycadf import measurement as cadf_measurement from pycadf import metric as cadf_metric from pycadf import resource as cadf_resource -import six -import six.moves.queue as queue -import six.moves.urllib.parse as urlparse +import queue import threading - +import urllib.parse as urlparse LOG = logging.getLogger(__name__) @@ -241,7 +239,7 @@ class Swift(object): return [client.projects.get(name_or_id)] except ksa_exc.NotFound: pass - if isinstance(name_or_id, six.binary_type): + if isinstance(name_or_id, bytes): name_or_id = name_or_id.decode('utf-8', 'strict') projects = client.projects.list(name=name_or_id) if not projects: @@ -305,8 +303,8 @@ class Swift(object): for header in env: if header.startswith('HTTP_') and env[header]: key = header[5:] - if isinstance(env[header], six.text_type): - headers[key] = six.text_type(env[header]) + if isinstance(env[header], str): + headers[key] = str(env[header]) else: headers[key] = str(env[header]) diff -pruN 2.3.0-2/ceilometermiddleware/tests/test_swift.py 2.4.1-0ubuntu1/ceilometermiddleware/tests/test_swift.py --- 2.3.0-2/ceilometermiddleware/tests/test_swift.py 2021-03-12 12:30:09.000000000 +0000 +++ 2.4.1-0ubuntu1/ceilometermiddleware/tests/test_swift.py 2022-02-16 17:34:58.000000000 +0000 @@ -12,11 +12,11 @@ # 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 io import StringIO import threading from unittest import mock from oslo_config import cfg -import six from ceilometermiddleware import swift from ceilometermiddleware.tests import base as tests_base @@ -53,9 +53,9 @@ class FakeRequest(object): environ['PATH_INFO'] = path if 'wsgi.input' not in environ: - environ['wsgi.input'] = six.moves.cStringIO('') + environ['wsgi.input'] = StringIO('') - for header, value in six.iteritems(headers): + for header, value in headers.items(): environ['HTTP_%s' % header.upper()] = value self.environ = environ @@ -125,7 +125,7 @@ class TestSwift(tests_base.TestCase): '/1.0/account/container/obj', environ={'REQUEST_METHOD': 'PUT', 'wsgi.input': - six.moves.cStringIO('some stuff')}) + StringIO('some stuff')}) with mock.patch('oslo_messaging.Notifier.info') as notify: list(app(req.environ, self.start_response)) self.assertEqual(1, len(notify.call_args_list)) @@ -145,7 +145,7 @@ class TestSwift(tests_base.TestCase): req = self.get_request( '/1.0/account/container/obj', environ={'REQUEST_METHOD': 'POST', - 'wsgi.input': six.moves.cStringIO('some other stuff')}) + 'wsgi.input': StringIO('some other stuff')}) with mock.patch('oslo_messaging.Notifier.info') as notify: list(app(req.environ, self.start_response)) self.assertEqual(1, len(notify.call_args_list)) @@ -277,7 +277,7 @@ class TestSwift(tests_base.TestCase): http_headers = [k for k in metadata.keys() if k.startswith('http_header_')] self.assertEqual(1, len(http_headers)) - self.assertEqual(six.text_type(uni), + self.assertEqual(str(uni), metadata['http_header_unicode']) def test_metadata_headers_on_not_existing_header(self): @@ -315,7 +315,7 @@ class TestSwift(tests_base.TestCase): list(app(req.environ, self.start_response)) self.assertEqual(0, len(notify.call_args_list)) - @mock.patch('six.moves.urllib.parse.quote') + @mock.patch('urllib.parse.quote') def test_emit_event_fail(self, mocked_func): mocked_func.side_effect = Exception("a exception") app = swift.Swift(FakeApp(body=["test"]), {}) @@ -429,7 +429,7 @@ class TestSwift(tests_base.TestCase): '/1.0/account/container/obj', environ={'REQUEST_METHOD': 'PUT', 'wsgi.input': - six.moves.cStringIO('some stuff'), + StringIO('some stuff'), 'swift.source': 'RL'}) with mock.patch('oslo_messaging.Notifier.info') as notify: list(app(req.environ, self.start_response)) diff -pruN 2.3.0-2/ceilometermiddleware.egg-info/dependency_links.txt 2.4.1-0ubuntu1/ceilometermiddleware.egg-info/dependency_links.txt --- 2.3.0-2/ceilometermiddleware.egg-info/dependency_links.txt 1970-01-01 00:00:00.000000000 +0000 +++ 2.4.1-0ubuntu1/ceilometermiddleware.egg-info/dependency_links.txt 2022-02-16 17:35:32.000000000 +0000 @@ -0,0 +1 @@ + diff -pruN 2.3.0-2/ceilometermiddleware.egg-info/entry_points.txt 2.4.1-0ubuntu1/ceilometermiddleware.egg-info/entry_points.txt --- 2.3.0-2/ceilometermiddleware.egg-info/entry_points.txt 1970-01-01 00:00:00.000000000 +0000 +++ 2.4.1-0ubuntu1/ceilometermiddleware.egg-info/entry_points.txt 2022-02-16 17:35:32.000000000 +0000 @@ -0,0 +1,3 @@ +[paste.filter_factory] +swift = ceilometermiddleware.swift:filter_factory + diff -pruN 2.3.0-2/ceilometermiddleware.egg-info/not-zip-safe 2.4.1-0ubuntu1/ceilometermiddleware.egg-info/not-zip-safe --- 2.3.0-2/ceilometermiddleware.egg-info/not-zip-safe 1970-01-01 00:00:00.000000000 +0000 +++ 2.4.1-0ubuntu1/ceilometermiddleware.egg-info/not-zip-safe 2022-02-16 17:35:32.000000000 +0000 @@ -0,0 +1 @@ + diff -pruN 2.3.0-2/ceilometermiddleware.egg-info/pbr.json 2.4.1-0ubuntu1/ceilometermiddleware.egg-info/pbr.json --- 2.3.0-2/ceilometermiddleware.egg-info/pbr.json 1970-01-01 00:00:00.000000000 +0000 +++ 2.4.1-0ubuntu1/ceilometermiddleware.egg-info/pbr.json 2022-02-16 17:35:32.000000000 +0000 @@ -0,0 +1 @@ +{"git_version": "4a2da3e", "is_release": true} \ No newline at end of file diff -pruN 2.3.0-2/ceilometermiddleware.egg-info/PKG-INFO 2.4.1-0ubuntu1/ceilometermiddleware.egg-info/PKG-INFO --- 2.3.0-2/ceilometermiddleware.egg-info/PKG-INFO 1970-01-01 00:00:00.000000000 +0000 +++ 2.4.1-0ubuntu1/ceilometermiddleware.egg-info/PKG-INFO 2022-02-16 17:35:32.000000000 +0000 @@ -0,0 +1,41 @@ +Metadata-Version: 1.2 +Name: ceilometermiddleware +Version: 2.4.1 +Summary: OpenStack Telemetry middleware for generating metrics +Home-page: https://docs.openstack.org/ceilometermiddleware/latest/ +Author: OpenStack +Author-email: openstack-discuss@lists.openstack.org +License: UNKNOWN +Description: =============================================== + Middleware for OpenStack Telemetry (Ceilometer) + =============================================== + + This library provides middleware modules designed to enable metric and event + data generation to be consumed by Ceilometer. + + For information on contributing, see ``CONTRIBUTING.rst``. + + * License: Apache License, Version 2.0 + * Documentation: https://docs.openstack.org/ceilometermiddleware/latest/ + * Source: http://opendev.org/openstack/ceilometermiddleware + * Bugs: http://bugs.launchpad.net/ceilometermiddleware + + For any other information, refer to the parent project, Ceilometer: + + https://opendev.org/openstack/ceilometer + + +Platform: UNKNOWN +Classifier: Environment :: OpenStack +Classifier: Intended Audience :: Information Technology +Classifier: Intended Audience :: System Administrators +Classifier: License :: OSI Approved :: Apache Software License +Classifier: Operating System :: POSIX :: Linux +Classifier: Programming Language :: Python +Classifier: Programming Language :: Python :: Implementation :: CPython +Classifier: Programming Language :: Python :: 3 :: Only +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 +Classifier: Programming Language :: Python :: 3.8 +Requires-Python: >=3.6 diff -pruN 2.3.0-2/ceilometermiddleware.egg-info/requires.txt 2.4.1-0ubuntu1/ceilometermiddleware.egg-info/requires.txt --- 2.3.0-2/ceilometermiddleware.egg-info/requires.txt 1970-01-01 00:00:00.000000000 +0000 +++ 2.4.1-0ubuntu1/ceilometermiddleware.egg-info/requires.txt 2022-02-16 17:35:32.000000000 +0000 @@ -0,0 +1,8 @@ +keystoneauth1>=2.18.0 +oslo.config>=3.9.0 +oslo.messaging>=5.2.0 +oslo.utils +pbr>=1.6 +pycadf!=2.0.0,>=1.1.0 +python-keystoneclient>=3.8.0 +six>=1.9.0 diff -pruN 2.3.0-2/ceilometermiddleware.egg-info/SOURCES.txt 2.4.1-0ubuntu1/ceilometermiddleware.egg-info/SOURCES.txt --- 2.3.0-2/ceilometermiddleware.egg-info/SOURCES.txt 1970-01-01 00:00:00.000000000 +0000 +++ 2.4.1-0ubuntu1/ceilometermiddleware.egg-info/SOURCES.txt 2022-02-16 17:35:32.000000000 +0000 @@ -0,0 +1,54 @@ +.coveragerc +.stestr.conf +.zuul.yaml +AUTHORS +CONTRIBUTING.rst +ChangeLog +HACKING.rst +LICENSE +README.rst +requirements.txt +setup.cfg +setup.py +test-requirements.txt +tox.ini +ceilometermiddleware/__init__.py +ceilometermiddleware/swift.py +ceilometermiddleware.egg-info/PKG-INFO +ceilometermiddleware.egg-info/SOURCES.txt +ceilometermiddleware.egg-info/dependency_links.txt +ceilometermiddleware.egg-info/entry_points.txt +ceilometermiddleware.egg-info/not-zip-safe +ceilometermiddleware.egg-info/pbr.json +ceilometermiddleware.egg-info/requires.txt +ceilometermiddleware.egg-info/top_level.txt +ceilometermiddleware/tests/__init__.py +ceilometermiddleware/tests/base.py +ceilometermiddleware/tests/test_swift.py +ceilometermiddleware/tests/data/list_projects.yaml +doc/source/conf.py +doc/source/contributing.rst +doc/source/index.rst +doc/source/installation.rst +doc/source/readme.rst +doc/source/usage.rst +releasenotes/notes/.placeholder +releasenotes/notes/background-thread-notifier-21b36a5f5c8dec0e.yaml +releasenotes/notes/bug-1679196-ab9d6bb2134120e0.yaml +releasenotes/notes/drop-py-2-7-21178ddd27b28806.yaml +releasenotes/source/conf.py +releasenotes/source/index.rst +releasenotes/source/mitaka.rst +releasenotes/source/newton.rst +releasenotes/source/ocata.rst +releasenotes/source/pike.rst +releasenotes/source/queens.rst +releasenotes/source/stein.rst +releasenotes/source/train.rst +releasenotes/source/unreleased.rst +releasenotes/source/ussuri.rst +releasenotes/source/victoria.rst +releasenotes/source/wallaby.rst +releasenotes/source/xena.rst +releasenotes/source/_static/.placeholder +releasenotes/source/_templates/.placeholder \ No newline at end of file diff -pruN 2.3.0-2/ceilometermiddleware.egg-info/top_level.txt 2.4.1-0ubuntu1/ceilometermiddleware.egg-info/top_level.txt --- 2.3.0-2/ceilometermiddleware.egg-info/top_level.txt 1970-01-01 00:00:00.000000000 +0000 +++ 2.4.1-0ubuntu1/ceilometermiddleware.egg-info/top_level.txt 2022-02-16 17:35:32.000000000 +0000 @@ -0,0 +1 @@ +ceilometermiddleware diff -pruN 2.3.0-2/ChangeLog 2.4.1-0ubuntu1/ChangeLog --- 2.3.0-2/ChangeLog 1970-01-01 00:00:00.000000000 +0000 +++ 2.4.1-0ubuntu1/ChangeLog 2022-02-16 17:35:32.000000000 +0000 @@ -0,0 +1,201 @@ +CHANGES +======= + +2.4.1 +----- + +* Add Python3 yoga unit tests + +2.4.0 +----- + +* Update master for stable/xena +* setup.cfg: Replace dashes with underscores +* Add Python3 xena unit tests + +2.3.0 +----- + +* Update master for stable/wallaby +* Replace the following items with Python 3 style code + +2.2.0 +----- + +* Add Python3 wallaby unit tests +* Update master for stable/victoria + +2.1.0 +----- + +* Switch to newer openstackdocstheme and reno versions +* Further Cleanup py27 support +* Bump default tox env from py37 to py38 +* Add py38 package metadata +* Use unittest.mock instead of third party mock +* Add Python3 victoria unit tests +* Update master for stable/ussuri +* Use swift.backend\_path from Swift/s3api to extract account/container +* Cleanup py27 support + +2.0.0 +----- + +* Replace lib-forward-testing-plugin +* Drop python 2.7 support and testing +* Switch to Ussuri jobs +* Drop oslosphinx and use openstackdocstheme +* Update master for stable/train + +1.5.0 +----- + +* Fix a socket leak in case of broken connection +* Fix py37 test error +* Add Python 3 Train unit tests +* Use opendev repository +* OpenDev Migration Patch +* Dropping the py35 testing +* Update master for stable/stein +* Change openstack-dev to openstack-discuss + +1.4.0 +----- + +* add python 3.6 unit test job +* switch documentation job to new PTI +* import zuul job settings from project-config +* Switch to stestr + +1.3.0 +----- + +* fix tox python3 overrides +* Update reno for stable/queens + +1.2.0 +----- + +* Fix documentation url 404 error +* Remove setting of version/release from releasenotes +* Update reno for stable/pike +* Fix default service project to "service" +* retrieve project id to ignore from keystone + +1.1.0 +----- + +* Switch to get\_notification\_transport for Notifier + +1.0.1 +----- + +* Trivial: remove support for py34 +* switch to topics when declaring notifier +* Update reno for stable/ocata +* Fix releasenotes branches +* Use https instead of http for git.openstack.org +* Remove link to modindex +* [doc] Note lack of constraints is a choice +* Revert "Show team and repo badges on README" +* Show team and repo badges on README +* Bump hacking to 0.12 + +1.0.0 +----- + +* Convert nonblocking\_notify value from string to boolean +* No reason to start with '\_' define a general variable +* Enable release notes translation +* Clean imports in code +* Bump the oslo.messaging version +* clean up oslo-incubator related stuff +* Add release note for background thread notifier +* Delete openstack/common from the exclude list of flake8 in tox +* Add reno for release notes management +* Avoid useless dependency on oslo\_utils +* Update the home-page with developer documentation +* Fix bug in background sending +* Add support for Python 3.5 +* Remove py33 from tox envlist + +0.5.0 +----- + +* Add background thread notifier sending ability +* Upgrade hacking +* Updated from global requirements +* Only install hacking in pep8 +* Remove oslo.context dependency +* Remove unused requirements +* Add missing requirements for mock +* Updated from global requirements +* [Trivial] Remove executable privilege of doc/source/conf.py +* Updated from global requirements +* Updated from global requirements +* use path as resource id when missing RESELLER prefix + +0.4.0 +----- + +* Updated from global requirements +* Updated from global requirements +* Updated from global requirements +* Updated from global requirements +* Updated from global requirements +* Updated from global requirements +* Use assertTrue/False instead of assertEqual(T/F) +* Updated from global requirements +* Removes MANIFEST.in as it is not needed explicitely by PBR +* Remove py26 support from ceilometermiddleware +* Updated from global requirements +* Updated from global requirements +* Updated from global requirements +* Updated from global requirements +* swift: upgrade messaging to v2 +* Updated from global requirements +* Updated from global requirements +* Fix the mistakes in .gitignore file +* Change ignore-errors to ignore\_errors + +0.3.0 +----- + +* Ignore request with swift.source in env +* Updated from global requirements +* Fixes parsing req path for account HEAD/GET +* HTTP\_X\_TENANT\_ID is deprecated and replaced by HTTP\_X\_PROJECT\_ID +* Updated from global requirements +* Activate pep8 check that \_ is imported +* Updated from global requirements +* Drop use of 'oslo' namespace package +* Updated from global requirements +* Add test which asserts non-empty target\_id +* Updated from global requirements +* add support to skip event/meter generation for certain projects +* Set correct config choice for transport url + +0.2.0 +----- + +* Updated from global requirements +* Drop use of 'oslo' namespace package +* Update README to work with release tools +* Updated from global requirements +* Add \*paste.filter\_factory\* entry point +* use pycadf helper module to assign action +* Updated from global requirements +* remove gitignore files + +0.1.0 +----- + +* add README template +* add options to configure messaging +* ignore changelog +* fix py34 tests +* fix gitignore +* fix gitignore +* initial checkin +* initial checkin +* Initial commit diff -pruN 2.3.0-2/debian/changelog 2.4.1-0ubuntu1/debian/changelog --- 2.3.0-2/debian/changelog 2021-09-29 08:07:10.000000000 +0000 +++ 2.4.1-0ubuntu1/debian/changelog 2022-03-01 18:41:12.000000000 +0000 @@ -1,58 +1,53 @@ -python-ceilometermiddleware (2.3.0-2) unstable; urgency=medium +python-ceilometermiddleware (2.4.1-0ubuntu1) jammy; urgency=medium - * Uploading to unstable. - - -- Thomas Goirand Wed, 29 Sep 2021 10:07:10 +0200 - -python-ceilometermiddleware (2.3.0-1) experimental; urgency=medium + * New upstream release for OpenStack Yoga. - * New upstream release. - * Added myself in copyright and uploaders. + -- Corey Bryant Tue, 01 Mar 2022 13:41:12 -0500 - -- papamica Mon, 23 Aug 2021 09:45:27 -0500 +python-ceilometermiddleware (2.4.0-0ubuntu1) jammy; urgency=medium -python-ceilometermiddleware (2.2.0-2) unstable; urgency=medium + * New upstream release for OpenStack Yoga. + * d/control: Bump debhelper compat to 13. + * d/p/skip-tests.patch: Dropped. No longer needed. + * d/rules: Switch to pybuild. - * Add rabbit-over-ssl.patch. - * Add python3-swift as build-depends because of this patch. - * Upload to unstable. + -- Corey Bryant Wed, 12 Jan 2022 10:46:45 -0500 - -- Thomas Goirand Mon, 16 Aug 2021 08:56:31 +0200 +python-ceilometermiddleware (2.3.0-0ubuntu1) impish; urgency=medium -python-ceilometermiddleware (2.2.0-1) experimental; urgency=medium + * New upstream release for OpenStack Xena. - * New upstream release. + -- Chris MacNaughton Wed, 06 Oct 2021 12:34:15 +0000 - -- Thomas Goirand Fri, 12 Mar 2021 15:27:41 +0100 +python-ceilometermiddleware (2.2.0-0ubuntu1) impish; urgency=medium -python-ceilometermiddleware (2.1.0-2) unstable; urgency=medium + [ Chris MacNaughton ] + * d/control: Update VCS paths for move to lp:~ubuntu-openstack-dev. - * Uploading to unstable. - * Add a debian/salsa-ci.yml. + [ Corey Bryant ] + * New upstream release for OpenStack Xena. - -- Thomas Goirand Wed, 14 Oct 2020 22:51:32 +0200 + -- Corey Bryant Wed, 21 Jul 2021 09:34:50 -0400 -python-ceilometermiddleware (2.1.0-1) experimental; urgency=medium +python-ceilometermiddleware (2.1.0-0ubuntu1) groovy; urgency=medium - * New upstream release. - * Removed python3-mock from build-depends. - * debhelper-compat = 11. - * Standards-Version: 4.5.0. - - -- Thomas Goirand Mon, 07 Sep 2020 14:09:55 +0200 - -python-ceilometermiddleware (2.0.0-2) unstable; urgency=medium - - * Uploading to unstable. + * New upstream release for OpenStack Victoria. + * d/control: Align (Build-)Depends with upstream. + * d/p/skip-tests.patch: Refreshed. - -- Thomas Goirand Fri, 08 May 2020 12:31:30 +0200 + -- Chris MacNaughton Fri, 24 Jul 2020 09:24:54 +0000 -python-ceilometermiddleware (2.0.0-1) experimental; urgency=medium +python-ceilometermiddleware (2.0.0-0ubuntu1) focal; urgency=low - * New upstream release. - * Removed oslosphinx build-depends. + * Merge from Debian unstable. Remaining changes: + - d/gbp.conf: Retain for gbp and pristine-tar config. + - d/watch: Get tarball from pypi.debian.net. + - d/p/skip-tests.patch: Skip failing Py3.7 tests. + - d/control: Drop BDI's on python-*. + - d/control: Enable autopkgtest-pkg-python testsuite. + * New upstream release for OpenStack Ussuri. - -- Thomas Goirand Mon, 06 Apr 2020 18:38:47 +0200 + -- Sahid Orentino Ferdjaoui Fri, 31 Jan 2020 14:03:47 +0100 python-ceilometermiddleware (1.5.0-2) unstable; urgency=medium @@ -73,6 +68,13 @@ python-ceilometermiddleware (1.5.0-1) ex -- Thomas Goirand Tue, 17 Sep 2019 21:52:49 +0200 +python-ceilometermiddleware (1.5.0-0ubuntu1) eoan; urgency=medium + + * New upstream release for OpenStack Train. + * d/control: Align (Build-)Depends with upstream. + + -- Corey Bryant Wed, 25 Sep 2019 14:28:23 -0400 + python-ceilometermiddleware (1.4.0-1) unstable; urgency=medium * New upstream release. @@ -93,6 +95,26 @@ python-ceilometermiddleware (1.3.0-1) un -- Thomas Goirand Mon, 08 Oct 2018 20:13:05 +0200 +python-ceilometermiddleware (1.3.0-0ubuntu2) eoan; urgency=medium + + * Drop Python 2 support: + - d/control: Drop python-ceilometermiddleware binary package. + - d/control: Drop BDI's on python-*. + - d/rules: Drop install and test of Python 2 module. + + -- James Page Thu, 11 Jul 2019 05:53:16 +0100 + +python-ceilometermiddleware (1.3.0-0ubuntu1) cosmic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/gbp.conf: Retain for gbp and pristine-tar config. + - d/watch: Get tarball from pypi.debian.net. + * d/p/skip-tests.patch: Skip failing Py3.7 tests. + * New upstream release for OpenStack Rocky. + * d/control: Align (Build-)Depends with upstream. + + -- Corey Bryant Mon, 06 Aug 2018 10:21:47 -0400 + python-ceilometermiddleware (1.2.0-2) unstable; urgency=medium * Uploading to unstable. @@ -122,6 +144,42 @@ python-ceilometermiddleware (1.2.0-1) ex -- Thomas Goirand Wed, 14 Feb 2018 08:26:28 +0000 +python-ceilometermiddleware (1.2.0-0ubuntu1) bionic; urgency=medium + + * New upstream release. + * d/*: wrap-and-sort -bast. + * d/control: Update Standards-Version to 4.1.2. + * d/control: Bump debhelper compat to 10. + * d/control: Align (Build-)Depends with upstream. + + -- Corey Bryant Tue, 13 Feb 2018 13:03:03 -0500 + +python-ceilometermiddleware (1.1.0-0ubuntu1) artful; urgency=medium + + * New upstream release. + * Align (Build-)Depends with upstream milestone. + + -- James Page Fri, 21 Apr 2017 09:53:28 +0100 + +python-ceilometermiddleware (1.0.2-0ubuntu1) zesty; urgency=medium + + * d/watch: Update to point to pypi.debian.net. + * New upstream relese. + + -- Chuck Short Mon, 20 Mar 2017 10:29:27 -0400 + +python-ceilometermiddleware (1.0.0-1ubuntu1) zesty; urgency=medium + + [ Corey Bryant ] + * d/gbp.conf: Update gbp configuration file. + * d/control: Update Vcs-* links and maintainers. + + [ Chuck Short ] + * New upstream version. + * debian/control: Bump versioned dependencies + + -- Chuck Short Wed, 09 Nov 2016 11:06:25 -0500 + python-ceilometermiddleware (0.5.0-3) unstable; urgency=medium * Added Py3 support. @@ -146,6 +204,13 @@ python-ceilometermiddleware (0.5.0-1) ex -- James Page Thu, 08 Sep 2016 09:51:45 +0100 +python-ceilometermiddleware (0.5.0-0ubuntu1) yakkety; urgency=medium + + * New upstream release. + * Align (Build-)Depends with upstream. + + -- James Page Thu, 08 Sep 2016 09:51:45 +0100 + python-ceilometermiddleware (0.4.0-1) unstable; urgency=medium * Team upload. @@ -183,3 +248,4 @@ python-ceilometermiddleware (0.1.0-1) un * Initial release. (Closes: #788453) -- Thomas Goirand Sat, 18 Apr 2015 18:49:40 +0200 + diff -pruN 2.3.0-2/debian/control 2.4.1-0ubuntu1/debian/control --- 2.3.0-2/debian/control 2021-09-29 08:07:10.000000000 +0000 +++ 2.4.1-0ubuntu1/debian/control 2022-03-01 18:41:12.000000000 +0000 @@ -1,43 +1,41 @@ Source: python-ceilometermiddleware Section: python Priority: optional -Maintainer: Debian OpenStack +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian OpenStack Uploaders: Thomas Goirand , - Mickael Asseline , Build-Depends: - debhelper-compat (= 11), + debhelper-compat (= 13), dh-python, openstack-pkg-tools, python3-all, - python3-pbr, + python3-pbr (>= 2.0.0), python3-setuptools, - python3-sphinx, + python3-sphinx (>= 2.0.0), Build-Depends-Indep: - python3-babel, - python3-betamax, - python3-coverage, - python3-hacking, + python3-betamax (>= 0.7.0), + python3-coverage (>= 3.6), python3-keystoneauth1 (>= 2.18.0), - python3-keystoneclient (>= 3.8.0), - python3-openstackdocstheme (>= 1.17.0), - python3-oslo.config, - python3-oslo.context (>= 0.2.0), + python3-keystoneclient (>= 1:3.8.0), + python3-mock (>= 1.2), + python3-openstackdocstheme (>= 2.2.1), + python3-oslo.config (>= 1:3.9.0), python3-oslo.messaging (>= 5.2.0), - python3-oslo.utils (>= 3.33.0), + python3-oslo.utils, + python3-oslosphinx (>= 2.5.0), python3-oslotest (>= 1:1.10.0), - python3-pycadf, - python3-six, - python3-subunit, - python3-swift, - python3-testscenarios, - python3-testtools (>= 1.4.0), - subunit, - testrepository, -Standards-Version: 4.5.0 -Vcs-Browser: https://salsa.debian.org/openstack-team/libs/python-ceilometermiddleware -Vcs-Git: https://salsa.debian.org/openstack-team/libs/python-ceilometermiddleware.git + python3-pycadf (>= 1.1.0), + python3-reno (>= 0.1.1), + python3-six (>= 1.9.0), + python3-stestr (>= 2.0.0), + python3-subunit (>= 0.0.18), + python3-testrepository, +Standards-Version: 4.1.3 +Vcs-Browser: https://git.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/python-ceilometermiddleware +Vcs-Git: https://git.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/python-ceilometermiddleware Homepage: http://www.openstack.org/ +Testsuite: autopkgtest-pkg-python Package: python-ceilometermiddleware-doc Section: doc @@ -56,14 +54,13 @@ Architecture: all Depends: python3-babel, python3-keystoneauth1 (>= 2.18.0), - python3-keystoneclient (>= 3.8.0), - python3-oslo.config, + python3-keystoneclient (>= 1:3.8.0), + python3-oslo.config (>= 1:3.9.0), python3-oslo.messaging (>= 5.2.0), - python3-oslo.utils (>= 3.33.0), - python3-pbr, - python3-pycadf, - python3-six, - python3-swift, + python3-oslo.utils, + python3-pbr (>= 2.0.0), + python3-pycadf (>= 1.1.0), + python3-six (>= 1.9.0), ${misc:Depends}, ${python3:Depends}, Suggests: diff -pruN 2.3.0-2/debian/copyright 2.4.1-0ubuntu1/debian/copyright --- 2.3.0-2/debian/copyright 2021-09-29 08:07:10.000000000 +0000 +++ 2.4.1-0ubuntu1/debian/copyright 2022-03-01 18:41:12.000000000 +0000 @@ -11,7 +11,6 @@ License: Apache-2 Files: debian/* Copyright: (c) 2014-2016, Thomas Goirand (c) 2016-2019, Ondřej Nový - (c) 2021 Mickael Asseline License: Apache-2 License: Apache-2 diff -pruN 2.3.0-2/debian/gbp.conf 2.4.1-0ubuntu1/debian/gbp.conf --- 2.3.0-2/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ 2.4.1-0ubuntu1/debian/gbp.conf 2022-03-01 18:41:12.000000000 +0000 @@ -0,0 +1,7 @@ +[DEFAULT] +debian-branch = master +upstream-tag = %(version)s +pristine-tar = True + +[buildpackage] +export-dir = ../build-area diff -pruN 2.3.0-2/debian/patches/rabbit-over-ssl.patch 2.4.1-0ubuntu1/debian/patches/rabbit-over-ssl.patch --- 2.3.0-2/debian/patches/rabbit-over-ssl.patch 2021-09-29 08:07:10.000000000 +0000 +++ 2.4.1-0ubuntu1/debian/patches/rabbit-over-ssl.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -Description: Rabbit over SSL patch - In its current form, ceilometermiddleware isn't capable of connecting to - RabbitMQ over SSL. This patch adds the necessary configuration bits. -Author: Siméon Gourlin -Forwarded: no -Last-Update: 2021-07-23 - ---- a/ceilometermiddleware/swift.py 2020-06-02 12:00:56.000000000 +0000 -+++ b/ceilometermiddleware/swift.py 2021-07-23 12:49:15.386695370 +0000 -@@ -76,6 +76,7 @@ - import six - import six.moves.queue as queue - import six.moves.urllib.parse as urlparse -+from swift.common.utils import readconf - import threading - - -@@ -182,6 +183,19 @@ - - LOG.setLevel(getattr(logging, conf.get('log_level', 'WARNING'))) - -+ # Overriding SSL options -+ if conf.get('__file__', None) is not None: -+ oslo_rabbit_config = {} -+ all_conf = readconf(conf['__file__']) -+ for section, options in all_conf.items(): -+ if not section.startswith("oslo_messaging_rabbit"): -+ continue -+ oslo_rabbit_config = options -+ for oslo_rabbit_option in oslo_rabbit_config: -+ if oslo_rabbit_option.startswith("ssl"): -+ LOG.warning(f"Rabbit config: {oslo_rabbit_option} : {oslo_rabbit_config[oslo_rabbit_option]}") -+ cfg.CONF.set_default(oslo_rabbit_option, oslo_rabbit_config[oslo_rabbit_option], group="oslo_messaging_rabbit") -+ - # NOTE: If the background thread's send queue fills up, the event will - # be discarded - # diff -pruN 2.3.0-2/debian/patches/series 2.4.1-0ubuntu1/debian/patches/series --- 2.3.0-2/debian/patches/series 2021-09-29 08:07:10.000000000 +0000 +++ 2.4.1-0ubuntu1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -rabbit-over-ssl.patch diff -pruN 2.3.0-2/debian/rules 2.4.1-0ubuntu1/debian/rules --- 2.3.0-2/debian/rules 2021-09-29 08:07:10.000000000 +0000 +++ 2.4.1-0ubuntu1/debian/rules 2022-03-01 18:41:12.000000000 +0000 @@ -3,8 +3,10 @@ UPSTREAM_GIT = https://github.com/openstack/ceilometermiddleware.git include /usr/share/openstack-pkg-tools/pkgos.make +export PYBUILD_NAME=ceilometermiddleware + %: - dh $@ --buildsystem=python_distutils --with python3,sphinxdoc + dh $@ --buildsystem=pybuild --with python3,sphinxdoc override_dh_auto_clean: rm -rf build diff -pruN 2.3.0-2/debian/salsa-ci.yml 2.4.1-0ubuntu1/debian/salsa-ci.yml --- 2.3.0-2/debian/salsa-ci.yml 2021-09-29 08:07:10.000000000 +0000 +++ 2.4.1-0ubuntu1/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -include: - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff -pruN 2.3.0-2/debian/watch 2.4.1-0ubuntu1/debian/watch --- 2.3.0-2/debian/watch 2021-09-29 08:07:10.000000000 +0000 +++ 2.4.1-0ubuntu1/debian/watch 2022-03-01 18:41:12.000000000 +0000 @@ -1,2 +1,3 @@ version=3 -https://github.com/openstack/ceilometermiddleware/tags .*/(\d[\d\.]+)\.tar\.gz +opts=uversionmangle=s/(rc|a|b|c)/~$1/ \ +https://pypi.debian.net/ceilometermiddleware/ceilometermiddleware-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff -pruN 2.3.0-2/.gitignore 2.4.1-0ubuntu1/.gitignore --- 2.3.0-2/.gitignore 2021-03-12 12:30:09.000000000 +0000 +++ 2.4.1-0ubuntu1/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] - -# ChangeLog -ChangeLog - -# C extensions -*.so - -# Distribution / packaging -.Python -env/ -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -*.egg-info/ -.installed.cfg -*.egg - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.stestr/ -.coverage -.cache -coverage.xml - -# Translations -*.mo -*.pot - -# Django stuff: -*.log - -# Sphinx documentation -doc/build/ - -# PyBuilder -target/ - -# Files created by releasenotes build -releasenotes/build diff -pruN 2.3.0-2/.gitreview 2.4.1-0ubuntu1/.gitreview --- 2.3.0-2/.gitreview 2021-03-12 12:30:09.000000000 +0000 +++ 2.4.1-0ubuntu1/.gitreview 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -[gerrit] -host=review.opendev.org -port=29418 -project=openstack/ceilometermiddleware.git diff -pruN 2.3.0-2/PKG-INFO 2.4.1-0ubuntu1/PKG-INFO --- 2.3.0-2/PKG-INFO 1970-01-01 00:00:00.000000000 +0000 +++ 2.4.1-0ubuntu1/PKG-INFO 2022-02-16 17:35:32.177732700 +0000 @@ -0,0 +1,41 @@ +Metadata-Version: 1.2 +Name: ceilometermiddleware +Version: 2.4.1 +Summary: OpenStack Telemetry middleware for generating metrics +Home-page: https://docs.openstack.org/ceilometermiddleware/latest/ +Author: OpenStack +Author-email: openstack-discuss@lists.openstack.org +License: UNKNOWN +Description: =============================================== + Middleware for OpenStack Telemetry (Ceilometer) + =============================================== + + This library provides middleware modules designed to enable metric and event + data generation to be consumed by Ceilometer. + + For information on contributing, see ``CONTRIBUTING.rst``. + + * License: Apache License, Version 2.0 + * Documentation: https://docs.openstack.org/ceilometermiddleware/latest/ + * Source: http://opendev.org/openstack/ceilometermiddleware + * Bugs: http://bugs.launchpad.net/ceilometermiddleware + + For any other information, refer to the parent project, Ceilometer: + + https://opendev.org/openstack/ceilometer + + +Platform: UNKNOWN +Classifier: Environment :: OpenStack +Classifier: Intended Audience :: Information Technology +Classifier: Intended Audience :: System Administrators +Classifier: License :: OSI Approved :: Apache Software License +Classifier: Operating System :: POSIX :: Linux +Classifier: Programming Language :: Python +Classifier: Programming Language :: Python :: Implementation :: CPython +Classifier: Programming Language :: Python :: 3 :: Only +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 +Classifier: Programming Language :: Python :: 3.8 +Requires-Python: >=3.6 diff -pruN 2.3.0-2/releasenotes/source/index.rst 2.4.1-0ubuntu1/releasenotes/source/index.rst --- 2.3.0-2/releasenotes/source/index.rst 2021-03-12 12:30:09.000000000 +0000 +++ 2.4.1-0ubuntu1/releasenotes/source/index.rst 2022-02-16 17:34:58.000000000 +0000 @@ -6,6 +6,7 @@ :maxdepth: 1 unreleased + xena wallaby victoria ussuri diff -pruN 2.3.0-2/releasenotes/source/xena.rst 2.4.1-0ubuntu1/releasenotes/source/xena.rst --- 2.3.0-2/releasenotes/source/xena.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.4.1-0ubuntu1/releasenotes/source/xena.rst 2022-02-16 17:34:58.000000000 +0000 @@ -0,0 +1,6 @@ +========================= +Xena Series Release Notes +========================= + +.. release-notes:: + :branch: stable/xena diff -pruN 2.3.0-2/setup.cfg 2.4.1-0ubuntu1/setup.cfg --- 2.3.0-2/setup.cfg 2021-03-12 12:30:09.000000000 +0000 +++ 2.4.1-0ubuntu1/setup.cfg 2022-02-16 17:35:32.181732700 +0000 @@ -1,30 +1,35 @@ [metadata] name = ceilometermiddleware summary = OpenStack Telemetry middleware for generating metrics -description-file = - README.rst +description_file = + README.rst author = OpenStack -author-email = openstack-discuss@lists.openstack.org -home-page = https://docs.openstack.org/ceilometermiddleware/latest/ -python-requires = >=3.6 -classifier = - Environment :: OpenStack - Intended Audience :: Information Technology - Intended Audience :: System Administrators - License :: OSI Approved :: Apache Software License - Operating System :: POSIX :: Linux - Programming Language :: Python - Programming Language :: Python :: Implementation :: CPython - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3 - Programming Language :: Python :: 3.6 - Programming Language :: Python :: 3.7 - Programming Language :: Python :: 3.8 +author_email = openstack-discuss@lists.openstack.org +home_page = https://docs.openstack.org/ceilometermiddleware/latest/ +python_requires = >=3.6 +classifier = + Environment :: OpenStack + Intended Audience :: Information Technology + Intended Audience :: System Administrators + License :: OSI Approved :: Apache Software License + Operating System :: POSIX :: Linux + Programming Language :: Python + Programming Language :: Python :: Implementation :: CPython + Programming Language :: Python :: 3 :: Only + Programming Language :: Python :: 3 + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 [files] -packages = - ceilometermiddleware +packages = + ceilometermiddleware [entry_points] -paste.filter_factory = - swift = ceilometermiddleware.swift:filter_factory +paste.filter_factory = + swift = ceilometermiddleware.swift:filter_factory + +[egg_info] +tag_build = +tag_date = 0 + diff -pruN 2.3.0-2/.zuul.yaml 2.4.1-0ubuntu1/.zuul.yaml --- 2.3.0-2/.zuul.yaml 2021-03-12 12:30:09.000000000 +0000 +++ 2.4.1-0ubuntu1/.zuul.yaml 2022-02-16 17:34:58.000000000 +0000 @@ -6,7 +6,7 @@ - project: templates: - - openstack-python3-wallaby-jobs + - openstack-python3-yoga-jobs - publish-openstack-docs-pti - release-notes-jobs-python3 check: