diff -pruN 4.4.0-2/debian/changelog 4.5.0-0ubuntu1/debian/changelog --- 4.4.0-2/debian/changelog 2021-09-29 15:55:27.000000000 +0000 +++ 4.5.0-0ubuntu1/debian/changelog 2022-05-31 21:10:05.000000000 +0000 @@ -1,107 +1,136 @@ -python-vitrageclient (4.4.0-2) unstable; urgency=medium +python-vitrageclient (4.5.0-0ubuntu1) kinetic; urgency=medium - * Uploading to unstable. + * New upstream release for OpenStack Zed. + * d/control: Update standards version to 4.6.1. - -- Thomas Goirand Wed, 29 Sep 2021 17:55:27 +0200 + -- Corey Bryant Tue, 31 May 2022 17:10:05 -0400 -python-vitrageclient (4.4.0-1) experimental; urgency=medium +python-vitrageclient (4.4.0-0ubuntu2) jammy; urgency=medium - * New upstream release. - * Switch to subunit+stestr. + * d/control: Drop python3-pydot(plus) Depends as they are Suggests + dependencies of networkx. + * d/p/drop-pydot.patch: Drop python3-pydot from requirements.txt. - -- Thomas Goirand Thu, 02 Sep 2021 13:05:06 +0200 + -- Corey Bryant Wed, 26 Jan 2022 14:32:00 -0500 -python-vitrageclient (4.3.0-1) experimental; urgency=medium +python-vitrageclient (4.4.0-0ubuntu1) jammy; urgency=medium - * New upstream release. - * Debhelper 11. - * Standards-Version: 4.5.1. + * New upstream release for OpenStack Yoga. + * d/control: Align (Build-)Depends with upstream. + * d/control, d/rules: Bump debhelper compat to 13 and switch to pybuild. - -- Thomas Goirand Sun, 14 Mar 2021 15:51:21 +0100 + -- Corey Bryant Wed, 01 Dec 2021 16:06:17 -0500 -python-vitrageclient (4.1.1-2) unstable; urgency=medium +python-vitrageclient (4.3.0-0ubuntu1) hirsute; urgency=medium - * Uploading to unstable. - * Fixed debian/watch. - * Add a debian/salsa-ci.yml. + * New upstream release for OpenStack Wallaby. - -- Thomas Goirand Fri, 16 Oct 2020 17:34:05 +0200 + -- Corey Bryant Wed, 17 Mar 2021 10:45:12 -0400 -python-vitrageclient (4.1.1-1) experimental; urgency=medium +python-vitrageclient (4.2.0-0ubuntu1) hirsute; urgency=medium - * New upstream release. - * Fixed (build-)depends for this release. + * d/control: Update VCS paths for move to lp:~ubuntu-openstack-dev. + * New upstream release for OpenStack Wallaby. + * d/p/skip-test_dot_emitter-for-cloud-archive.patch: Refreshed. - -- Thomas Goirand Wed, 09 Sep 2020 22:19:33 +0200 + -- Chris MacNaughton Thu, 03 Dec 2020 15:30:57 +0000 -python-vitrageclient (4.0.1-2) unstable; urgency=medium +python-vitrageclient (4.1.1-0ubuntu1) groovy; urgency=medium - * Uploading to unstable. + * New upstream release for OpenStack Victoria. + * d/control: Align (Build-)Depends with upstream. - -- Thomas Goirand Fri, 08 May 2020 23:51:53 +0200 + -- Corey Bryant Fri, 11 Sep 2020 16:38:10 -0400 -python-vitrageclient (4.0.1-1) experimental; urgency=medium +python-vitrageclient (4.1.0-0ubuntu1) groovy; urgency=medium - * New upstream release. - * Fixed (build-)depends for this release. - * Rebased disable-install-bash-completion-from-git.patch. + * New upstream release for OpenStack Victoria. + * d/control: Align (Build-)Depends with upstream. + * d/p/*: Refreshed. - -- Thomas Goirand Wed, 08 Apr 2020 17:36:12 +0200 + -- Chris MacNaughton Wed, 29 Jul 2020 12:00:59 +0000 -python-vitrageclient (3.0.0-2) unstable; urgency=medium +python-vitrageclient (4.0.1-0ubuntu1) focal; urgency=medium - [ Ondřej Nový ] - * Bump Standards-Version to 4.4.1. + * New upstream release for OpenStack Ussuri. + * d/p/disable-install-bash-completion-from-git.patch: Rebased. - [ Thomas Goirand ] - * Uploading to unstable. + -- Corey Bryant Thu, 09 Apr 2020 15:33:53 -0400 - -- Thomas Goirand Mon, 21 Oct 2019 01:52:18 +0200 +python-vitrageclient (4.0.0-0ubuntu1) focal; urgency=medium -python-vitrageclient (3.0.0-1) experimental; urgency=medium + * New upstream release for OpenStack Ussuri. + * d/control: Align (Build-)Depends with upstream. - [ Ondřej Nový ] - * Use debhelper-compat instead of debian/compat. - * Bump Standards-Version to 4.4.0. + -- Corey Bryant Wed, 11 Mar 2020 16:36:44 -0400 - [ Thomas Goirand ] - * New upstream release. - * Note: current version needs networkx >= 2.3 which isn't available yet in - Debian (bug filled). +python-vitrageclient (3.0.0-0ubuntu1) eoan; urgency=medium - -- Thomas Goirand Tue, 17 Sep 2019 09:34:46 +0200 + * New upstream release for OpenStack Train. -python-vitrageclient (2.7.0-2) unstable; urgency=medium + -- James Page Thu, 26 Sep 2019 10:38:36 +0100 - * Uploading to unstable. +python-vitrageclient (2.7.0-0ubuntu2) eoan; urgency=medium - -- Thomas Goirand Wed, 17 Jul 2019 14:40:09 +0200 + * d/control, d/rules, d/python(3)-*: Drop Python 2 support. -python-vitrageclient (2.7.0-1) experimental; urgency=medium + -- Corey Bryant Wed, 10 Jul 2019 14:17:20 -0400 - * New upstream release. - * Removed versions when satisfied in Buster. +python-vitrageclient (2.7.0-0ubuntu1) disco; urgency=medium - -- Thomas Goirand Mon, 25 Mar 2019 22:31:28 +0100 + * New upstream release for OpenStack Stein. -python-vitrageclient (2.3.0-2) unstable; urgency=medium + -- Corey Bryant Wed, 13 Mar 2019 14:40:36 -0400 - * Uploading to unstable. +python-vitrageclient (2.5.0-0ubuntu3) disco; urgency=medium - -- Michal Arbet Tue, 04 Sep 2018 22:37:30 +0200 + * d/control: Add python(3)-pydotplus to (Build-)Depends as it is + a suggested package for python(3)-networkx in bionic, enabling bionic + cloud archive support. + * d/control, d/p/skip-test_dot_emitter-for-cloud-archive.patch: Added + patch to skip test_dot_emitter() on backport to cloud-archive. -python-vitrageclient (2.3.0-1) experimental; urgency=medium + -- Corey Bryant Fri, 08 Feb 2019 16:26:58 -0500 - [ Michal Arbet ] - * New upstream release. - * d/control: Fix dependencies for new version - * d/patches: Update remove-privacy-breach-generic-lintian.patch +python-vitrageclient (2.5.0-0ubuntu2) disco; urgency=medium + + * d/control: Drop min version of python(3)-networkx, enabling cloud + archive backports. + + -- Corey Bryant Wed, 06 Feb 2019 11:14:48 -0500 + +python-vitrageclient (2.5.0-0ubuntu1) disco; urgency=medium - [ Ondřej Nový ] - * d/copyright: Use https protocol in Format field - * d/control: Use team+openstack@tracker.debian.org as maintainer + * New upstream release for OpenStack Stein. + * d/control: Align (Build-)Depends with upstream. + + -- Corey Bryant Wed, 30 Jan 2019 10:16:26 -0500 + +python-vitrageclient (2.4.0-0ubuntu1) disco; urgency=medium + + * New upstream release for OpenStack Stein. + * d/control: Align (Build-)Depends with upstream. + + -- Corey Bryant Wed, 14 Nov 2018 15:09:39 -0500 + +python-vitrageclient (2.3.0-0ubuntu1) cosmic; urgency=medium + + * New upstream release for OpenStack Rocky. + * d/p/remove-privacy-breach-generic-lintian.patch: Rebased. + + -- Corey Bryant Fri, 03 Aug 2018 14:44:23 -0400 + +python-vitrageclient (2.1.0-0ubuntu1) cosmic; urgency=medium + + * d/gbp.conf: Update gbp configuration file. + * d/control: Update Vcs-* links and maintainers. + * d/control, d/rules, d/python(3)-vitrageclient-p*: Add support for + python-vitrageclient. + * New upstream release. + * d/control: Align (Build-)Depends with upstream. + * d/control, d/tests/*: Enable autopkgtest-pkg-python testsuite. - -- Michal Arbet Tue, 21 Aug 2018 12:04:23 +0100 + -- Corey Bryant Thu, 14 Jun 2018 13:58:24 -0400 python-vitrageclient (2.0.0-1) unstable; urgency=medium diff -pruN 4.4.0-2/debian/control 4.5.0-0ubuntu1/debian/control --- 4.4.0-2/debian/control 2021-09-29 15:55:27.000000000 +0000 +++ 4.5.0-0ubuntu1/debian/control 2022-05-31 21:10:05.000000000 +0000 @@ -1,41 +1,44 @@ Source: python-vitrageclient Section: python Priority: optional -Maintainer: Debian OpenStack +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian OpenStack Uploaders: Thomas Goirand , Michal Arbet , Build-Depends: - debhelper-compat (= 11), + debhelper-compat (= 13), dh-python, + lsb-release, openstack-pkg-tools, python3-all, - python3-pbr, + python3-pbr (>= 3.1.1), python3-setuptools, - python3-sphinx, + python3-sphinx (>= 2.0.0), Build-Depends-Indep: - python3-cliff, + python3-cliff (>= 2.8.0), python3-coverage, python3-hacking, - python3-iso8601, - python3-keystoneauth1, - python3-networkx, - python3-openstackdocstheme, - python3-osc-lib, - python3-oslo.log, - python3-oslo.utils, - python3-oslotest, - python3-pydot, - python3-reno, - python3-subunit, - python3-testscenarios, - python3-testtools, - python3-stestr, - subunit, -Standards-Version: 4.5.1 -Homepage: https://github.com/openstack/python-vitrageclient.git -Vcs-Git: https://salsa.debian.org/openstack-team/clients/python-vitrageclient.git -Vcs-Browser: https://salsa.debian.org/openstack-team/clients/python-vitrageclient + python3-iso8601 (>= 0.1.11), + python3-keystoneauth1 (>= 3.4.0), + python3-mock (>= 2.0.0), + python3-networkx (>= 2.3), + python3-openstackdocstheme (>= 2.2.0), + python3-osc-lib (>= 1.8.0), + python3-oslo.log (>= 3.21.0), + python3-oslo.utils (>= 3.33.0), + python3-oslotest (>= 1:3.3.0), + python3-pydot (>= 1.4.1), + python3-pydotplus, + python3-stestr (>= 2.0.0), + python3-subunit (>= 1.2.0), + python3-testrepository (>= 0.0.18), + python3-testscenarios (>= 0.5.0), + python3-testtools (>= 2.3.0), +Standards-Version: 4.6.1 +Homepage: https://opendev.org/openstack/python-vitrageclient.git +Vcs-Git: https://git.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/python-vitrageclient +Testsuite: autopkgtest-pkg-python Package: python-vitrageclient-doc Section: doc @@ -57,18 +60,17 @@ Package: python3-vitrageclient Section: python Architecture: all Depends: - python3-cliff, - python3-iso8601, - python3-keystoneauth1, - python3-networkx, - python3-osc-lib, - python3-oslo.log, - python3-oslo.utils, - python3-pbr, - python3-pydot, + python3-cliff (>= 2.8.0), + python3-iso8601 (>= 0.1.11), + python3-keystoneauth1 (>= 3.4.0), + python3-networkx (>= 2.3), + python3-osc-lib (>= 1.8.0), + python3-oslo.log (>= 3.21.0), + python3-oslo.utils (>= 3.33.0), + python3-pbr (>= 3.1.1), ${misc:Depends}, ${python3:Depends}, -Description: OpenStack root cause analysis as a Service client. +Description: OpenStack root cause analysis as a Service client - Python 3.x Vitrage is the OpenStack RCA (Root Cause Analysis) Service for organizing, analyzing and expanding OpenStack alarms & events, yielding insights regarding the root cause of problems and deducing diff -pruN 4.4.0-2/debian/copyright 4.5.0-0ubuntu1/debian/copyright --- 4.4.0-2/debian/copyright 2021-09-29 15:55:27.000000000 +0000 +++ 4.5.0-0ubuntu1/debian/copyright 2022-05-31 21:10:05.000000000 +0000 @@ -1,4 +1,4 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: python-vitrageclient Source: https://github.com/openstack/python-vitrageclient.git diff -pruN 4.4.0-2/debian/gbp.conf 4.5.0-0ubuntu1/debian/gbp.conf --- 4.4.0-2/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ 4.5.0-0ubuntu1/debian/gbp.conf 2022-05-31 21:10:05.000000000 +0000 @@ -0,0 +1,7 @@ +[DEFAULT] +debian-branch = master +upstream-tag = %(version)s +pristine-tar = True + +[buildpackage] +export-dir = ../build-area diff -pruN 4.4.0-2/debian/patches/disable-install-bash-completion-from-git.patch 4.5.0-0ubuntu1/debian/patches/disable-install-bash-completion-from-git.patch --- 4.4.0-2/debian/patches/disable-install-bash-completion-from-git.patch 2021-09-29 15:55:27.000000000 +0000 +++ 4.5.0-0ubuntu1/debian/patches/disable-install-bash-completion-from-git.patch 2022-05-31 21:10:05.000000000 +0000 @@ -3,13 +3,11 @@ Description: Disable installing of bash_ bash_completion Author: Michal Arbet Forwarded: no -Last-Update: 2020-04-08 +Last-Update: 2018-08-03 -diff --git a/setup.cfg b/setup.cfg -index e6c2e0f..5309a1a 100644 --- a/setup.cfg +++ b/setup.cfg -@@ -23,8 +23,6 @@ +@@ -24,8 +24,6 @@ classifier = [files] packages = vitrageclient diff -pruN 4.4.0-2/debian/patches/drop-pydot.patch 4.5.0-0ubuntu1/debian/patches/drop-pydot.patch --- 4.4.0-2/debian/patches/drop-pydot.patch 1970-01-01 00:00:00.000000000 +0000 +++ 4.5.0-0ubuntu1/debian/patches/drop-pydot.patch 2022-05-31 21:10:05.000000000 +0000 @@ -0,0 +1,12 @@ +Description: Drop pydot as it is a dependency + of networkx, not a dependency of vitrageclient. +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1959142 +Forwarded: No + +--- a/requirements.txt ++++ b/requirements.txt +@@ -9,4 +9,3 @@ + keystoneauth1>=3.4.0 # Apache-2.0 + iso8601>=0.1.11 # MIT + networkx>=2.3 # BSD +-pydot>=1.4.1 # BSD diff -pruN 4.4.0-2/debian/patches/remove-privacy-breach-generic-lintian.patch 4.5.0-0ubuntu1/debian/patches/remove-privacy-breach-generic-lintian.patch --- 4.4.0-2/debian/patches/remove-privacy-breach-generic-lintian.patch 2021-09-29 15:55:27.000000000 +0000 +++ 4.5.0-0ubuntu1/debian/patches/remove-privacy-breach-generic-lintian.patch 2022-05-31 21:10:05.000000000 +0000 @@ -1,5 +1,3 @@ -diff --git a/README.rst b/README.rst -index 5b0ad08..ecbc1f8 100644 --- a/README.rst +++ b/README.rst @@ -2,9 +2,6 @@ diff -pruN 4.4.0-2/debian/patches/series 4.5.0-0ubuntu1/debian/patches/series --- 4.4.0-2/debian/patches/series 2021-09-29 15:55:27.000000000 +0000 +++ 4.5.0-0ubuntu1/debian/patches/series 2022-05-31 21:10:05.000000000 +0000 @@ -1,2 +1,4 @@ +drop-pydot.patch +skip-test_dot_emitter-for-cloud-archive.patch disable-install-bash-completion-from-git.patch remove-privacy-breach-generic-lintian.patch diff -pruN 4.4.0-2/debian/patches/skip-test_dot_emitter-for-cloud-archive.patch 4.5.0-0ubuntu1/debian/patches/skip-test_dot_emitter-for-cloud-archive.patch --- 4.4.0-2/debian/patches/skip-test_dot_emitter-for-cloud-archive.patch 1970-01-01 00:00:00.000000000 +0000 +++ 4.5.0-0ubuntu1/debian/patches/skip-test_dot_emitter-for-cloud-archive.patch 2022-05-31 21:10:05.000000000 +0000 @@ -0,0 +1,34 @@ +Description: Skip test_dot_emitter() when backporting package to + bionic-based cloud archive. The call to self.assertEqual(DOT_DATA, + out.getvalue()) fails due to differences in the bionic networkx + package version. The expected strict digraph output appears to + be valid but is not exactly the same format as DOT_DATA. + Unfortunately the ordering of the output is also not consistently + the same, otherwise comparing against different output on bionic + would be simple. And I'm just not familiar enough with handling + dot-format in Python so let's just skip this test. +Author: Corey Bryant +Forwarded: no + +--- a/vitrageclient/tests/cli/test_topology_show.py ++++ b/vitrageclient/tests/cli/test_topology_show.py +@@ -18,8 +18,10 @@ from unittest import mock + import io + import json + ++import lsb_release + # noinspection PyPackageRequirements + # noinspection PyPackageRequirements ++import testtools + from testtools import ExpectedException + + from vitrageclient.common.formatters import DOTFormatter +@@ -333,6 +335,8 @@ class TopologyShowTest(CliTestCase): + '--root', 'blabla', + '--graph-type', 'tree']) + ++ @testtools.skipIf(lsb_release.get_distro_information()['RELEASE'] == '18.04', ++ "Skipped by Ubuntu") + def test_dot_emitter(self): + def dict2columns(data): + return zip(*sorted(data.items())) diff -pruN 4.4.0-2/debian/rules 4.5.0-0ubuntu1/debian/rules --- 4.4.0-2/debian/rules 2021-09-29 15:55:27.000000000 +0000 +++ 4.5.0-0ubuntu1/debian/rules 2022-05-31 21:10:05.000000000 +0000 @@ -1,9 +1,11 @@ #!/usr/bin/make -f +export PYBUILD_NAME=vitrageclient + include /usr/share/openstack-pkg-tools/pkgos.make %: - dh $@ --buildsystem=python_distutils --with python3,sphinxdoc + dh $@ --buildsystem=pybuild --with python3,sphinxdoc override_dh_auto_build: @@ -32,5 +34,5 @@ override_dh_auto_clean: override_dh_sphinxdoc: ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS))) python3 -m sphinx -b html doc/source $(CURDIR)/debian/python-vitrageclient-doc/usr/share/doc/python-vitrageclient-doc/html - dh_sphinxdoc -O--buildsystem=python_distutils + dh_sphinxdoc -O--buildsystem=pybuild endif diff -pruN 4.4.0-2/debian/salsa-ci.yml 4.5.0-0ubuntu1/debian/salsa-ci.yml --- 4.4.0-2/debian/salsa-ci.yml 2021-09-29 15:55:27.000000000 +0000 +++ 4.5.0-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 4.4.0-2/debian/watch 4.5.0-0ubuntu1/debian/watch --- 4.4.0-2/debian/watch 2021-09-29 15:55:27.000000000 +0000 +++ 4.5.0-0ubuntu1/debian/watch 2022-05-31 21:10:05.000000000 +0000 @@ -1,3 +1,3 @@ version=3 -opts="uversionmangle=s/\.0rc/~rc/;s/\.0b1/~b1/;s/\.0b2/~b2/;s/\.0b3/~b3/" \ -https://github.com/openstack/python-vitrageclient/tags .*/(\d[brc\d\.]+)\.tar\.gz +opts="uversionmangle=s/\.(b|rc)/~$1/" \ +https://github.com/openstack/python-vitrageclient/tags .*/(\d[\d\.]+)\.tar\.gz diff -pruN 4.4.0-2/releasenotes/source/index.rst 4.5.0-0ubuntu1/releasenotes/source/index.rst --- 4.4.0-2/releasenotes/source/index.rst 2021-05-04 02:30:43.000000000 +0000 +++ 4.5.0-0ubuntu1/releasenotes/source/index.rst 2021-09-10 15:18:14.000000000 +0000 @@ -8,6 +8,7 @@ Contents :maxdepth: 2 unreleased + xena wallaby victoria ussuri diff -pruN 4.4.0-2/releasenotes/source/xena.rst 4.5.0-0ubuntu1/releasenotes/source/xena.rst --- 4.4.0-2/releasenotes/source/xena.rst 1970-01-01 00:00:00.000000000 +0000 +++ 4.5.0-0ubuntu1/releasenotes/source/xena.rst 2021-09-10 15:18:14.000000000 +0000 @@ -0,0 +1,6 @@ +========================= +Xena Series Release Notes +========================= + +.. release-notes:: + :branch: stable/xena diff -pruN 4.4.0-2/.zuul.yaml 4.5.0-0ubuntu1/.zuul.yaml --- 4.4.0-2/.zuul.yaml 2021-05-04 02:30:43.000000000 +0000 +++ 4.5.0-0ubuntu1/.zuul.yaml 2021-09-10 15:18:14.000000000 +0000 @@ -1,7 +1,7 @@ - project: templates: - check-requirements - - openstack-python3-xena-jobs + - openstack-python3-yoga-jobs - openstackclient-plugin-jobs - publish-openstack-docs-pti - release-notes-jobs-python3