diff -pruN 3.2.0-2/AUTHORS 3.3.0-0ubuntu1/AUTHORS
--- 3.2.0-2/AUTHORS	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/AUTHORS	2021-09-01 19:14:05.000000000 +0000
@@ -0,0 +1,91 @@
+98k <18552437190@163.com>
+Alexander Chadin <a.chadin@servionica.ru>
+Alexander Chadin <aschadin@sbcloud.ru>
+Alexander Chadin <joker946@gmail.com>
+Alexandr Stavitskiy <stavitskiy@servionica.ru>
+Andreas Jaeger <aj@suse.com>
+Antoine Cabot <antoine.cabot@b-com.com>
+Cao Xuan Hoang <hoangcx@vn.fujitsu.com>
+Chihiro Yokoyama <c.yokoyama@ntt.com>
+Chris Spencer <christopher.m.spencer@intel.com>
+Daniel Pawlik <daniel.pawlik@corp.ovh.com>
+Dantali0n <info@dantalion.nl>
+Dao Cong Tien <tiendc@vn.fujitsu.com>
+David TARDIVEL <David.TARDIVEL@b-com.com>
+David.T <David.TARDIVEL@b-com.com>
+DeepaJon <deepak.kumar@nectechnologies.in>
+Doug Hellmann <doug@doughellmann.com>
+Dougal Matthews <dougal@redhat.com>
+Edwin Zhai <edwin.zhai@intel.com>
+Eric Fried <openstack@fried.cc>
+Flavio Percoco <flaper87@gmail.com>
+Ghanshyam Mann <gmann@ghanshyammann.com>
+Hangdong Zhang <hdzhang@fiberhome.com>
+Hidekazu Nakamura <hid-nakamura@vf.jp.nec.com>
+James E. Blair <jeblair@redhat.com>
+Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
+Jeremy Liu <liujiong@gohighsec.com>
+Jeremy Stanley <fungi@yuggoth.org>
+Larry Rensing <lr699s@att.com>
+Lucky samadhiya <lucky.samadhiya@nectechnologies.in>
+Luong Anh Tuan <tuanla@vn.fujitsu.com>
+M V P Nitesh <m.nitesh@nectechnologies.in>
+Matt Riedemann <mriedem.os@gmail.com>
+Nam Nguyen Hoai <namnh@vn.fujitsu.com>
+Nguyen Hai <nguyentrihai93@gmail.com>
+OpenStack Release Bot <infra-root@openstack.org>
+PanFengyun <fengyun.pan@easystack.cn>
+Prashanth Hari <prashanth.hari@walmart.com>
+Sean McGinnis <sean.mcginnis@gmail.com>
+Steve Martinelli <stevemar@ca.ibm.com>
+Swapnil Kulkarni (coolsvap) <me@coolsvap.net>
+Taylor Peoples <tpeoples@us.ibm.com>
+Tin Lam <tinlam@gmail.com>
+Tin Lam <tl3438@att.com>
+Tomasz Kaczynski <tomasz.kaczynski@intel.com>
+Tony Xu <hhktony@gmail.com>
+Vieri <15050873171@163.com>
+Vincent Francoise <Vincent.FRANCOISE@b-com.com>
+Vladimir Ostroverkhov <ostroverkhov@servionica.ru>
+XinxinShen <shenxinxin@inspur.com>
+Yumeng Bao <yumeng_bao@yahoo.com>
+ZhijunWei <wzj334965317@outlook.com>
+ZhongShengping <chdzsp@163.com>
+aditi <adi.sky17@gmail.com>
+aditi <aditi.s@nectechnologies.in>
+avnish <avnish.pal@nectechnologies.in>
+blue55 <yllan@fiberhome.com>
+caihui <cai.hui@zte.com.cn>
+chenke <chen.ke14@zte.com.cn>
+daohanli <dhli5759@fiberhome.com>
+deepak_mourya <deepak.mourya@nectechnologies.in>
+digambar <digambarpatil15@yahoo.co.in>
+ericxiett <eric_xiett@163.com>
+gecong1973 <ge.cong@zte.com.cn>
+gengchc2 <geng.changcai2@zte.com.cn>
+hongzhezheng <zheng.hongzhe32@zte.com.cn>
+huang.zhiping <huang.zhiping@99cloud.net>
+jacky06 <zhang.min@99cloud.net>
+kangyufei <kangyf@inspur.com>
+kavithahr <kavitha.r@nectechnologies.in>
+licanwei <li.canwei2@zte.com.cn>
+maaoyu <maaoyu@inspur.com>
+melissaml <ma.lei@99cloud.net>
+qinchunhua <qin.chunhua@zte.com.cn>
+qingszhao <zhao.daqing@99cloud.net>
+qiufossen <qiujunting@inspur.com>
+rajat29 <rajat.sharma@nectechnologies.in>
+ricolin <rico.l@inwinstack.com>
+ricolin <rico.lin@easystack.cn>
+shu-mutou <shu-mutou@rf.jp.nec.com>
+suzhengwei <sugar-2008@163.com>
+venkatamahesh <venkatamaheshkotha@gmail.com>
+wanghui <wang_hui@inspur.com>
+wu.shiming <wushiming@yovole.com>
+zhangbailin <zhangbailin@inspur.com>
+zhangboye <zhangboye@inspur.com>
+zhangguoqing <zhang.guoqing@99cloud.net>
+zhangyangyang <yyzhang1@sysnew.com>
+zhurong <aaronzhu1121@gmail.com>
+zhuzeyu <zhu.zeyu@zte.com.cn>
+zte-hanrong <han.rong3@zte.com.cn>
diff -pruN 3.2.0-2/ChangeLog 3.3.0-0ubuntu1/ChangeLog
--- 3.2.0-2/ChangeLog	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/ChangeLog	2021-09-01 19:14:05.000000000 +0000
@@ -0,0 +1,402 @@
+CHANGES
+=======
+
+3.3.0
+-----
+
+* Changed minversion in tox to 3.18.0
+* Switch testing to Xena testing runtime
+* Replace deprecated UPPER\_CONSTRAINTS\_FILE variable
+* setup.cfg: Replace dashes with underscores
+* Use py3 as the default runtime for tox
+* Drop lower constraints testing
+* remove unicode from code
+
+3.2.0
+-----
+
+* Remove install unnecessary packages
+* Add Python3 wallaby unit tests
+
+3.1.1
+-----
+
+* [goal] Migrate testing to ubuntu focal
+* remove mox3
+
+3.1.0
+-----
+
+* Switch to newer openstackdocstheme version
+* Fix hacking min version to 3.0.1
+* Remove Babel requirement
+* Remove future imports
+* Use unittest.mock instead of third party mock
+* Bump default tox env from py37 to py38
+* Add py38 package metadata
+* Add Python3 victoria unit tests
+
+3.0.0
+-----
+
+* Cleanup py27 support
+* Update hacking for Python3
+* Support audit type event
+* Watcherclient supports list data model API
+* Drop python 2.7 support and testing
+* Fix details doc format error
+
+2.5.0
+-----
+
+* Fix python-openstackclient plugin doc build
+* Switch to Ussuri jobs
+* Build pdf docs
+
+2.4.0
+-----
+
+* Implement watcher datamodel list in watcherclient
+* Add datamodel doc in watcherclient
+
+2.3.0
+-----
+
+* Fix \_make\_connection\_url
+* Add Python3 Train unit tests
+* Switch to the new canonical constraints URL on master
+* Remove unused readme file
+* remove unused cliutils.py file as osc\_lib is used
+* Add force option
+* Cleanup doc dependencies
+* Remove --test-path option from stestr run
+* Whitelist rm external usage in tox.ini
+* Use upper-constraints in tox runs
+* Add tempest voting
+* Replace git.openstack.org URLs with opendev.org URLs
+* OpenDev Migration Patch
+* Remove py35
+* Increase actionplan\_shell.py unittest coverage from 70% to 97%
+* Update .gitignore to ignore cover and .coverage\*
+* Increase the unit test coverage of action\_plan.py from 79% to 95%
+* Remove functional in tox.ini
+* Add marker option for strategy in watcher-client
+* Remove the functional test
+* Add marker option for goal
+* Add openstack-cover-jobs for watcherclient
+* add python 3.7 unit test job
+* DEFAULT\_VER should be '1.latest'
+* Use openstack common CLI
+* Update hacking version
+* Add deletion of actionplan to osc plugin
+* [Doc] Fix OS\_AUTH\_URL value
+* update audit start/end time help
+* Pass API microversion to Client class
+* Change openstack-dev to openstack-discuss
+* Revert "Pass actual API version to Client class"
+* Fix obsolete version of osc
+* Change openstack-dev to openstack-discuss
+* Add Python 3.6 classifier to setup.cfg
+* Add continuous audit functional test
+* add python 3.6 unit test job
+* Refactor the getid method base.py
+* Pass actual API version to Client class
+* Replace latest with explicit version
+* Update min tox version to 2.0
+* Update watcher api command argument
+* add start and end time for continuous audit
+* Prepare watcherclient for microversioning
+
+2.2.0
+-----
+
+* Allow CLI to pass goal and strategy names
+* Use templates lower-constraints, remove cover
+* Switch to stestr
+* add python 3.6 unit test job
+* switch documentation job to new PTI
+* import zuul job settings from project-config
+* fix watcher actionplan show command
+* Update watcher strategy state in CLI
+* Add --marker help info
+* Organize the use of 'log' and replace 'log' with LOG
+* Add audit name to CLI help doc
+
+2.1.0
+-----
+
+* Fix watherclient error in py3
+* Add --marker help info
+* Add hostname field to support HA
+* Invalid doc for Client exceptions
+* Don't run voting jobs in gate
+* fix tox python3 overrides
+
+2.0.0
+-----
+
+* Modify Watcher start actionplan command
+* Remove 'actionplan create' command
+
+1.7.0
+-----
+
+* [WiP] functional jobs fix
+* ZuulV3 support for watcherclient
+* add lower-constraints job
+* Add tempest plugin
+* Delete the unnecessary '-'
+* Updated from global requirements
+* Updated from global requirements
+* Update links in README
+* Updated from global requirements
+* Fix global efficacy format
+* Zuul: Remove project name
+
+1.6.0
+-----
+
+* Add strategy state command
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Audit Template Help Message
+* Fix test\_action\_plan functional tests
+* Updated from global requirements
+* Fix watcher actionplan list command
+
+1.5.0
+-----
+
+* Migrate to Zuul v3
+* Updated from global requirements
+* Update audit\_template create help message
+* marker when retrive audit
+* marker when retrive action
+* marker when retrive audit template
+* Add --marker for 'watcher actionplan list'
+* Updated from global requirements
+* Updated from global requirements
+* Multiple global efficacy
+* add name for audit, changes for python-watcherclient
+* Fix unnecessary retries during conflict
+* Use generic user for both zuul v2 and v3
+
+1.4.0
+-----
+
+* Updated from global requirements
+* Update audit\_template create help message
+* Fix gate-watcherclient-dsvm-functional-ubuntu-xenial job
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Fix to use "." to source script files
+* import content from cli-reference in openstack-manuals
+* Updated from global requirements
+* Updated from global requirements
+* Add the filed of description to shell command for action
+
+1.3.0
+-----
+
+* Update .gitignore because of doc migration
+* Fix Audit Update functional test
+* Update the documentation link for doc migration
+* Updated from global requirements
+* Update permissions for post\_test\_hook.sh
+* Update URLs in documents according to document migration
+* Updated from global requirements
+* Add support for cron syntax
+* Updated from global requirements
+* Fixed wrap from taking negative values
+* Add post\_test\_hook
+* Move existing content into the new standard structure
+* Fix for README.rst of tests
+* switch to openstackdocstheme
+* Updated from global requirements
+* Turn on warning-is-error in sphinx build
+* Enable some off-by-default checks
+* Updated from global requirements
+* Add CLI for Action Plan Cancel
+
+1.2.0
+-----
+
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Add 'rm -f .testrepository/times.dbm' command in testenv
+
+1.1.0
+-----
+
+* Updated from global requirements
+* Optimize the link address
+* Remove log translations
+* Indicating the location tests directory in oslo\_debug\_helper
+* Using assert methods instead of assertTrue
+* Updated from global requirements
+* [Fix gate]Update test requirement
+* Remove RST files located in doc/source/api
+* Remove support for py34
+* update help description about actionplan create
+* Using jsonutils instead of json
+* Updated from global requirements
+* Remove useless utf-8 coding
+* Add functional env to tox
+
+1.0.0
+-----
+
+* update '--detail' help in goal list
+* Updated from global requirements
+* Add functional tests to watcherclient
+* Support parents field along with planner changes
+* changes to make consistent with other openstack component
+* Use keystoneauth instead of keystoneclient
+* Remove unused files
+* Enable coverage report in console output
+* Add param 'goal' and 'strategy' in list()
+* Removes unnecessary utf-8 encoding
+* update audit create '--interval' description
+* Add unit for continuous audit's interval
+* Fix a typo in audittemplate help
+* use 'auto' instead of None
+* Add auto\_trigger support
+* Fix TOKENID format which should without dashed
+* too many digits after the decimal point
+
+0.27.0
+------
+
+* Remove readme reference because of sphinx error
+* Replace six.iteritems() with .items()
+* Updated from global requirements
+* Show team and repo badges on README
+* Updated from global requirements
+* Use uuidutils instead of uuid.uuid4()
+
+0.26.0
+------
+
+* Updated from global requirements
+* Remove obsolete object attributes
+* Fix a typo error in a help message in the client
+* Updated from global requirements
+* Remove unnecessary ')'
+* Add Python 3.5 classifier and venv
+* Add \_\_ne\_\_ built-in function
+* Updated from global requirements
+* Add support for Audit Scope
+* Add parameters in Audit creation attributes list
+* Updated from global requirements
+* Added support for Client creation from KS session
+* Updated from global requirements
+* Add fixtures to test-requirements
+* Add constraint target to tox.ini and remove 1 dep
+* Add service support
+* python-openstackclient ClientManager interface changed
+* Update home page link in cfg file
+* Clean imports in code
+
+0.25.0
+------
+
+* Add again parameters as Audit creation attributes
+* Updated from global requirements
+* Add strategy name in action plan fields
+* Updated from global requirements
+* remove redundant ')'
+* Add goal\_id, strategy\_id and host\_aggregate CLI options to audit
+* Optimiz the help information for audit type parameter
+* Updated from global requirements
+* Add scoring engine commands
+* Remove discover from test-requirements
+* Updated from global requirements
+* Updated from global requirements
+* Fix for importing osc-lib instead openstackclient
+* Updated from global requirements
+
+0.24.0
+------
+
+* Fix for error importing of exception class
+* Add support continuously-optimization
+* Remove the blank space between the function name and the parenthesis
+* Prints  '-' instead of 'None' when data is None
+* Enable strategy parameter
+* Fix field type to audit\_type
+* Add license file
+* Updated from global requirements
+* Remove tempest-lib
+* Updated from global requirements
+* Revert "Add support continuously-optimization"
+* Replaced UUID of goal with name
+* Remove useless index on root doc page
+* Updated CLI to display efficacy related fields
+* Updated from global requirements
+* Add support continuously-optimization
+
+0.23.0
+------
+
+* Update Watcher CLI documentation
+* Use goal name as strategy list filter
+* Replaced UUID of goal and strategy with name
+* Flatten the project structure
+* Switch Watcher CLI to an OSC-compatible version
+* OpenStackClient plugin for action
+* OpenStackClient plugin for action plan
+* OpenStackClient plugin for audit
+* OpenStackClient plugin for audit template
+* OpenStackClient plugin for strategy
+* OpenStackClient plugin for goal
+* Tidy up
+* Use the correct capitalization of OpenStack
+* Support for refactored /audit\_templates endpoint
+* Added Strategy support in Watcher CLI
+* Updated CLI for new /goals API
+* Add PrettyTable module
+* Fixed audit creation bug in CLI
+* Removed unused 'alarm' field
+* Add audit-template name checking in CLI
+* Updated from global requirements
+
+0.22.0
+------
+
+* Rename TRIGGERED state as PENDING
+* Updated from global requirements
+* Updated from global requirements
+* Replace deprecated LOG.warn with LOG.warning
+* Removed host\_aggregate filter for Audit Template
+* Removed useless '--name' in audit-template-list
+* Sync with openstack/requirements master branch
+
+0.21.0
+------
+
+* Updated STARTING to TRIGGERED
+* Remove argparse from requirements
+* Fix extraction of \_LI \_LW \_LE \_LC for translation
+* Update Watcher documentation in README
+* i18n - Make string translatable
+* Respect the import order template
+* Sync Action resource fields
+* Sync with oslo-incubator
+* use keystoneclient exceptions instead of oslo-incubator code
+* Drop py33 support
+
+0.20.0
+------
+
+* Remove py26 support
+* Update requirements from OS Global Requirements
+* bug and requirements fixes
+* Change stackforge to openstack
+* Update .gitreview for new namespace
+* update README.rst file
+* push initial version
+* Added .gitreview
diff -pruN 3.2.0-2/debian/changelog 3.3.0-0ubuntu1/debian/changelog
--- 3.2.0-2/debian/changelog	2021-08-16 09:05:04.000000000 +0000
+++ 3.3.0-0ubuntu1/debian/changelog	2021-12-01 21:05:37.000000000 +0000
@@ -1,113 +1,69 @@
-python-watcherclient (3.2.0-2) unstable; urgency=medium
+python-watcherclient (3.3.0-0ubuntu1) jammy; urgency=medium
 
-  * Upload to unstable.
+  * New upstream release for OpenStack Yoga.
+  * d/control: Bump debhelper compat to 13.
 
- -- Michal Arbet <michal.arbet@ultimum.io>  Mon, 16 Aug 2021 11:05:04 +0200
+ -- Corey Bryant <corey.bryant@canonical.com>  Wed, 01 Dec 2021 16:05:37 -0500
 
-python-watcherclient (3.2.0-1) experimental; urgency=medium
+python-watcherclient (3.2.0-0ubuntu1) hirsute; urgency=medium
 
-  * New upstream release.
-  * Debhelper 11.
-
- -- Thomas Goirand <zigo@debian.org>  Mon, 15 Mar 2021 21:13:36 +0100
-
-python-watcherclient (3.1.1-2) unstable; urgency=medium
-
-  * Uploading to unstable.
-  * Fixed debian/watch.
-  * Add a debian/salsa-ci.yml.
-  * Install the watcher bash-completion file.
-
- -- Thomas Goirand <zigo@debian.org>  Fri, 16 Oct 2020 17:36:36 +0200
-
-python-watcherclient (3.1.1-1) experimental; urgency=medium
-
-  * New upstream release.
-  * Fixed (build-)depends for this release.
-
- -- Thomas Goirand <zigo@debian.org>  Wed, 09 Sep 2020 22:58:49 +0200
+  [ Chris MacNaughton ]
+  * d/control: Update VCS paths for move to lp:~ubuntu-openstack-dev.
 
-python-watcherclient (3.0.0-2) unstable; urgency=medium
+  [ Corey Bryant ]
+  * New upstream release for OpenStack Wallaby.
 
-  * Uploading to unstable.
+ -- Corey Bryant <corey.bryant@canonical.com>  Wed, 17 Mar 2021 10:33:19 -0400
 
- -- Thomas Goirand <zigo@debian.org>  Sat, 09 May 2020 00:01:59 +0200
+python-watcherclient (3.1.1-0ubuntu1) groovy; urgency=medium
 
-python-watcherclient (3.0.0-1) experimental; urgency=medium
-
-  * New upstream release.
-  * Add python3-sphinxcontrib.apidoc as build-depends.
+  * New upstream release for OpenStack Victoria.
+  * d/control: Align (Build-)Depends with upstream.
 
- -- Thomas Goirand <zigo@debian.org>  Thu, 09 Apr 2020 23:43:10 +0200
+ -- Corey Bryant <corey.bryant@canonical.com>  Fri, 11 Sep 2020 16:38:32 -0400
 
-python-watcherclient (2.4.0-2) unstable; urgency=medium
+python-watcherclient (3.1.0-0ubuntu1) groovy; urgency=medium
 
-  [ Ondřej Nový ]
-  * Bump Standards-Version to 4.4.1.
-
-  [ Thomas Goirand ]
-  * Uploading to unstable.
+  * New upstream release for OpenStack Victoria.
+  * d/control: Align (Build-)Depends with upstream.
+  * d/control, d/copyright, d/rules: Update upstream git URL.
 
- -- Thomas Goirand <zigo@debian.org>  Mon, 21 Oct 2019 01:53:19 +0200
+ -- Corey Bryant <corey.bryant@canonical.com>  Wed, 29 Jul 2020 15:06:21 -0400
 
-python-watcherclient (2.4.0-1) experimental; urgency=medium
-
-  [ Ondřej Nový ]
-  * Use debhelper-compat instead of debian/compat.
-  * Bump Standards-Version to 4.4.0.
-
-  [ Thomas Goirand ]
-  * New upstream release.
-
- -- Thomas Goirand <zigo@debian.org>  Tue, 17 Sep 2019 10:06:03 +0200
-
-python-watcherclient (2.2.0-2) unstable; urgency=medium
-
-  * Uploading to unstable.
-
- -- Thomas Goirand <zigo@debian.org>  Wed, 17 Jul 2019 14:42:22 +0200
-
-python-watcherclient (2.2.0-1) experimental; urgency=medium
-
-  [ Ondřej Nový ]
-  * Running wrap-and-sort -bast
-  * d/changelog: Remove trailing whitespaces
-
-  [ Thomas Goirand ]
-  * New upstream release.
-  * Removed Python 2 support.
-  * Removed fix-py3-str-bytes-error.patch applied upstream.
+python-watcherclient (3.0.0-0ubuntu1) groovy; urgency=medium
 
- -- Thomas Goirand <zigo@debian.org>  Mon, 25 Mar 2019 21:54:36 +0100
+  * New upstream release for OpenStack Victoria.
+  * d/control: Align (Build-)Depends with upstream.
+  * d/control, d/rules, d/compat: Switch to debhelper compat 12 and pybuild.
+  * d/control: Update Standards-Version to 4.5.0.
 
-python-watcherclient (2.1.0-3) unstable; urgency=medium
+ -- Corey Bryant <corey.bryant@canonical.com>  Fri, 12 Jun 2020 14:45:44 -0400
 
-  * Add fix-py3-str-bytes-error.patch
+python-watcherclient (2.2.0-0ubuntu2) eoan; urgency=medium
 
- -- Michal Arbet <michal.arbet@ultimum.io>  Wed, 05 Sep 2018 13:37:30 +0200
+  * d/rules, d/control, d/python(3)-*: Drop Python 2 support.
 
-python-watcherclient (2.1.0-2) unstable; urgency=medium
+ -- Corey Bryant <corey.bryant@canonical.com>  Wed, 10 Jul 2019 14:08:25 -0400
 
-  * Uploading to unstable.
+python-watcherclient (2.2.0-0ubuntu1) disco; urgency=medium
 
- -- Michal Arbet <michal.arbet@ultimum.io>  Tue, 04 Sep 2018 22:37:06 +0200
+  * New upstream release for OpenStack Stein.
+  * d/control: Align (Build-)Depends with upstream.
+  * d/rules: Drop use of OS_TEST_PATH.
 
-python-watcherclient (2.1.0-1) experimental; urgency=medium
+ -- Corey Bryant <corey.bryant@canonical.com>  Wed, 14 Nov 2018 15:10:08 -0500
 
-  [ Ondřej Nový ]
-  * d/control: Use team+openstack@tracker.debian.org as maintainer
+python-watcherclient (2.1.0-0ubuntu1) cosmic; urgency=low
 
-  [ Michal Arbet ]
-  * New upstream version
-  * Switch doc generation to python3 sphinx
-  * Fix embedded-javascript-library lintian warning
-  * d/control: Fix (build-)depends for this release
-  * d/control: Add some deletion of files do dh_clean
-  * d/control: Fix executing unit tests
-  * d/copyright: Update file
-  * d/control: Add me to uploaders field
+  * Merge from Debian unstable.  Remaining changes:
+    - d/gbp.conf: Retain for pristine-tar.
+    - d/control: Enable autopkgtest-pkg-python testsuite.
+    - d/watch: Get tarball from tarballs.openstack.org.
+  * New upstream release for OpenStack Rocky.
+  * d/control: Align (Build-)Depends with upstream.
+  * d/rules: Set OS_TEST_PATH to unit tests path.
 
- -- Michal Arbet <michal.arbet@ultimum.io>  Wed, 22 Aug 2018 10:47:52 +0200
+ -- Corey Bryant <corey.bryant@canonical.com>  Fri, 03 Aug 2018 15:01:22 -0400
 
 python-watcherclient (1.6.0-3) unstable; urgency=medium
 
@@ -134,6 +90,31 @@ python-watcherclient (1.6.0-1) experimen
 
  -- Thomas Goirand <zigo@debian.org>  Tue, 13 Feb 2018 22:18:28 +0000
 
+python-watcherclient (1.6.0-0ubuntu1) bionic; urgency=medium
+
+  * New upstream release.
+  * d/control: Align (Build-)Depends with upstream.
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Tue, 13 Feb 2018 08:43:02 -0500
+
+python-watcherclient (1.5.0-0ubuntu1) bionic; urgency=medium
+
+  * New upstream release.
+  * d/*: wrap-and-sort -bast.
+  * d/control: Align (Build-)Depends with upstream.
+  * d/control: Update Standards-Version to 4.1.2.
+  * d/control: Bump debhelper compat to 10.
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Thu, 25 Jan 2018 09:25:31 -0500
+
+python-watcherclient (1.4.0-0ubuntu1) bionic; urgency=medium
+
+  * New upstream release.
+  * d/control: Align (Build-)Depends with upstream.
+  * d/p/drop-openstackdoctheme.patch: Dropped. No longer needed.
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Mon, 13 Nov 2017 13:49:45 -0500
+
 python-watcherclient (1.3.0-2) unstable; urgency=medium
 
   * Uploading to unstable.
@@ -161,6 +142,48 @@ python-watcherclient (1.3.0-1) experimen
 
  -- Thomas Goirand <zigo@debian.org>  Wed, 04 Oct 2017 22:56:15 +0200
 
+python-watcherclient (1.3.0-0ubuntu1) artful; urgency=medium
+
+  * d/watch: Get tarball from tarballs.openstack.org.
+  * New upstream release.
+  * d/control: Align (Build-)Depends with upstream.
+  * d/p/drop-openstackdoctheme.patch: Temporarily drop openstackdocstheme
+    sphinx extension until sphinx>=1.6.2 is available.
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Tue, 15 Aug 2017 15:34:57 -0400
+
+python-watcherclient (1.1.0-0ubuntu1) artful; urgency=medium
+
+  * d/watch: Use pypi.debian.net.
+  * New upstream release.
+  * d/control: Align (Build-)Depends with upstream.
+
+ -- James Page <james.page@ubuntu.com>  Fri, 02 Jun 2017 09:27:35 +0100
+
+python-watcherclient (1.0.0-0ubuntu1) zesty; urgency=medium
+
+  * New upstream release.
+  * d/control: Align (Build-)Depends with upstream.
+  * d/control: Only use unit tests when running unit tests.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Sun, 22 Jan 2017 10:38:28 -0500
+
+python-watcherclient (0.27.0-0ubuntu1) zesty; urgency=medium
+
+  * New upstream release.
+  * d/control: Align (Build-)Depends with upstream.
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Fri, 16 Dec 2016 11:51:48 -0500
+
+python-watcherclient (0.26.0-0ubuntu1) zesty; urgency=medium
+
+  * d/gbp.conf: Update gbp configuration file.
+  * d/control: Update Vcs-* links and maintainers.
+  * New upstream release.
+  * Align (Build-)Depends with upstream.
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Tue, 06 Dec 2016 08:07:34 -0500
+
 python-watcherclient (0.25.1-1) unstable; urgency=medium
 
   * Team upload.
@@ -202,3 +225,4 @@ python-watcherclient (0.23.0-1) experime
   * Initial release. (Closes: #826852)
 
  -- Thomas Goirand <zigo@debian.org>  Thu, 09 Jun 2016 15:27:58 +0200
+
diff -pruN 3.2.0-2/debian/control 3.3.0-0ubuntu1/debian/control
--- 3.2.0-2/debian/control	2021-08-16 09:04:55.000000000 +0000
+++ 3.3.0-0ubuntu1/debian/control	2021-12-01 21:05:37.000000000 +0000
@@ -1,51 +1,56 @@
 Source: python-watcherclient
 Section: python
 Priority: optional
-Maintainer: Debian OpenStack <team+openstack@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian OpenStack <openstack-devel@lists.alioth.debian.org>
 Uploaders:
  Thomas Goirand <zigo@debian.org>,
- Michal Arbet <michal.arbet@ultimum.io>,
 Build-Depends:
- debhelper-compat (= 11),
+ debhelper-compat (= 13),
  dh-python,
  openstack-pkg-tools,
  python3-all,
- python3-pbr,
+ python3-pbr (>= 3.1.1),
  python3-setuptools,
- python3-sphinx,
+ python3-sphinx (>= 2.0.0),
+ python3-sphinxcontrib.apidoc (>= 0.2.0),
 Build-Depends-Indep:
- python3-cliff,
- python3-coverage,
- python3-fixtures,
- python3-hacking,
- python3-keystoneauth1,
- python3-openstackclient,
- python3-openstackdocstheme,
- python3-osc-lib,
- python3-oslo.i18n,
- python3-oslo.utils,
- python3-oslotest,
- python3-prettytable,
- python3-six,
- python3-sphinxcontrib.apidoc,
- python3-stestr,
- python3-subunit,
- python3-tempest,
- python3-testscenarios,
- python3-testtools,
- python3-yaml,
+ python3-babel (>= 2.5.3),
+ python3-cliff (>= 2.11.0),
+ python3-coverage (>= 4.0),
+ python3-fixtures (>= 3.0.0),
+ python3-hacking (>= 0.12.0),
+ python3-keystoneauth1 (>= 3.4.0),
+ python3-mock (>= 2.0.0),
+ python3-openstackclient (>= 2.6.0),
+ python3-openstackdocstheme (>= 2.2.1),
+ python3-os-testr,
+ python3-osc-lib (>= 1.10.0),
+ python3-oslo.i18n (>= 3.20.0),
+ python3-oslo.serialization (>= 2.18.0),
+ python3-oslo.utils (>= 3.36.0),
+ python3-oslotest (>= 1:3.2.0),
+ python3-prettytable (>= 0.7.2),
+ python3-six (>= 1.11.0),
+ python3-stestr (>= 2.0.0),
+ python3-subunit (>= 1.0.0),
+ python3-tempest (>= 1:17.1.0),
+ python3-testrepository (>= 0.0.18),
+ python3-testscenarios (>= 0.4),
+ python3-testtools (>= 2.2.0),
+ python3-wheel (>= 0.24.0),
+ python3-yaml (>= 3.13),
  subunit,
-Standards-Version: 4.4.1
-Vcs-Browser: https://salsa.debian.org/openstack-team/clients/python-watcherclient
-Vcs-Git: https://salsa.debian.org/openstack-team/clients/python-watcherclient.git
-Homepage: https://github.com/openstack/python-watcherclient
+Standards-Version: 4.5.0
+Vcs-Browser: https://git.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/python-watcherclient
+Vcs-Git: https://git.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/python-watcherclient
+Homepage: https://opendev.org/openstack/python-watcherclient
+Testsuite: autopkgtest-pkg-python
 
 Package: python-watcherclient-doc
 Architecture: all
 Section: doc
 Depends:
- libjs-bootstrap,
- libjs-jquery,
  ${misc:Depends},
  ${sphinxdoc:Depends},
 Description: OpenStack Cloud Optimization as a Service - client doc
@@ -63,20 +68,21 @@ Description: OpenStack Cloud Optimizatio
 Package: python3-watcherclient
 Architecture: all
 Depends:
- python3-cliff,
- python3-keystoneauth1,
- python3-openstackclient,
- python3-osc-lib,
- python3-oslo.i18n,
- python3-oslo.utils,
- python3-pbr,
- python3-prettytable,
- python3-six,
- python3-yaml,
+ python3-babel (>= 2.5.3),
+ python3-cliff (>= 2.11.0),
+ python3-fixtures (>= 3.0.0),
+ python3-keystoneauth1 (>= 3.4.0),
+ python3-openstackclient (>= 2.6.0),
+ python3-osc-lib (>= 1.10.0),
+ python3-oslo.i18n (>= 3.20.0),
+ python3-oslo.serialization (>= 2.18.0),
+ python3-oslo.utils (>= 3.36.0),
+ python3-pbr (>= 3.1.1),
+ python3-prettytable (>= 0.7.2),
+ python3-six (>= 1.11.0),
+ python3-yaml (>= 3.13),
  ${misc:Depends},
  ${python3:Depends},
-Suggests:
- python-watcherclient-doc,
 Description: OpenStack Cloud Optimization as a Service client - Python 3.x
  OpenStack Watcher provides a flexible and scalable resource optimization
  service for multi-tenant OpenStack-based clouds. Watcher provides a complete
diff -pruN 3.2.0-2/debian/copyright 3.3.0-0ubuntu1/debian/copyright
--- 3.2.0-2/debian/copyright	2019-11-21 13:11:44.000000000 +0000
+++ 3.3.0-0ubuntu1/debian/copyright	2021-12-01 21:05:37.000000000 +0000
@@ -1,6 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: python-watcherclient
-Source: https://github.com/openstack/python-watcherclient
+Source: https://opendev.org/openstack/python-watcherclient
 
 Files: *
 Copyright: (c) 2011-2016, OpenStack Foundation <openstack-dev@lists.openstack.org>
@@ -15,10 +15,7 @@ Copyright: (c) 2011-2016, OpenStack Foun
            (c) 2011, Nebula, Inc.
            (c) 2014, The Cloudscaling Group, Inc.
            (c) 2016, NEC Corporation
-           (c) 2015-2016, b<>com
-           (c) 2016, Intel
-           (c) 2016-2018, Servionica
-           (c) 2016, Mirantis
+           (c) 2016, b<>com
 License: Apache-2
 
 Files: debian/*
diff -pruN 3.2.0-2/debian/gbp.conf 3.3.0-0ubuntu1/debian/gbp.conf
--- 3.2.0-2/debian/gbp.conf	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/debian/gbp.conf	2021-12-01 21:05:37.000000000 +0000
@@ -0,0 +1,7 @@
+[DEFAULT]
+debian-branch = master
+upstream-tag = %(version)s
+pristine-tar = True
+
+[buildpackage]
+export-dir = ../build-area
diff -pruN 3.2.0-2/debian/python3-watcherclient.install 3.3.0-0ubuntu1/debian/python3-watcherclient.install
--- 3.2.0-2/debian/python3-watcherclient.install	2019-11-21 13:11:44.000000000 +0000
+++ 3.3.0-0ubuntu1/debian/python3-watcherclient.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-/usr
diff -pruN 3.2.0-2/debian/python3-watcherclient.postrm 3.3.0-0ubuntu1/debian/python3-watcherclient.postrm
--- 3.2.0-2/debian/python3-watcherclient.postrm	2019-11-21 13:11:44.000000000 +0000
+++ 3.3.0-0ubuntu1/debian/python3-watcherclient.postrm	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "remove" ] || [ "$1" = "disappear" ] ; then
-	update-alternatives --remove watcher /usr/bin/python3-watcher
-fi
-
-#DEBHELPER#
-
-exit 0
diff -pruN 3.2.0-2/debian/python3-watcherclient.prerm 3.3.0-0ubuntu1/debian/python3-watcherclient.prerm
--- 3.2.0-2/debian/python3-watcherclient.prerm	2019-11-21 13:11:44.000000000 +0000
+++ 3.3.0-0ubuntu1/debian/python3-watcherclient.prerm	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "remove" ] ; then
-	update-alternatives --remove watcher /usr/bin/python3-watcher
-fi
-
-#DEBHELPER#
-
-exit 0
diff -pruN 3.2.0-2/debian/python-watcherclient-doc.links 3.3.0-0ubuntu1/debian/python-watcherclient-doc.links
--- 3.2.0-2/debian/python-watcherclient-doc.links	2019-11-21 13:38:18.000000000 +0000
+++ 3.3.0-0ubuntu1/debian/python-watcherclient-doc.links	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-usr/share/javascript/bootstrap/js/bootstrap.js usr/share/doc/python-watcherclient-doc/html/_static/js/bootstrap.js
-usr/share/javascript/bootstrap/js/bootstrap.min.js usr/share/doc/python-watcherclient-doc/html/_static/js/bootstrap.min.js
-usr/share/javascript/jquery/jquery.js usr/share/doc/python-watcherclient-doc/html/_static/js/jquery-3.2.1.js
-usr/share/javascript/jquery/jquery.min.js usr/share/doc/python-watcherclient-doc/html/_static/js/jquery-3.2.1.min.js
diff -pruN 3.2.0-2/debian/rules 3.3.0-0ubuntu1/debian/rules
--- 3.2.0-2/debian/rules	2021-08-16 09:04:55.000000000 +0000
+++ 3.3.0-0ubuntu1/debian/rules	2021-12-01 21:05:37.000000000 +0000
@@ -1,37 +1,46 @@
 #!/usr/bin/make -f
 
-UPSTREAM_GIT = https://github.com/openstack/python-watcherclient.git
+export PYBUILD_NAME=watcherclient
+
+UPSTREAM_GIT = https://opendev.org/openstack/python-watcherclient.git
 include /usr/share/openstack-pkg-tools/pkgos.make
 
 %:
-	dh $@ --buildsystem=python_distutils --with python3,sphinxdoc
-
-export PATH := $(CURDIR)/debian/tmp/usr/bin:$(PATH)
-
-override_dh_auto_clean:
-	rm -rf build .stestr .testrepository
-	rm -f AUTHORS ChangeLog
+	dh $@ --buildsystem=pybuild --with python3,sphinxdoc
 
 override_dh_auto_build:
-	echo "Do nothing..."
+	python3 setup.py build --force
 
 override_dh_auto_install:
-	for i in $(PYTHON3S) ; do \
-		python3 setup.py install -f --install-layout=deb --root=$(CURDIR)/debian/tmp ; \
-	done
-ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-	PYTHONPATH=$(CURDIR)/debian/python3-watcherclient/usr/lib/python3/dist-packages pkgos-dh_auto_test --no-py2 --test-path=./watcherclient/tests/unit
-endif
-	install -D -m 0644 tools/watcher.bash_completion $(CURDIR)/debian/python3-watcherclient-doc/usr/share/bash-completion/completions/watcher
+	pkgos-dh_auto_install --no-py2
+
+override_dh_python3:
+	dh_python3 --shebang=/usr/bin/python3
 
 override_dh_auto_test:
-	echo "Do nothing..."
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+	pkgos-dh_auto_test --no-py2 --test-path=./watcherclient/tests/unit
+endif
 
 override_dh_sphinxdoc:
 ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
-	python3 -m sphinx -b html doc/source $(CURDIR)/debian/python-watcherclient-doc/usr/share/doc/python-watcherclient-doc/html
-	dh_sphinxdoc -O--buildsystem=python_distutils
+	PYTHONPATH=. sphinx-build -b html doc/source $(CURDIR)/debian/python-watcherclient-doc/usr/share/doc/python-watcherclient-doc/html
+	dh_sphinxdoc -O--buildsystem=pybuild
 endif
 
-override_dh_python3:
-	dh_python3 --shebang=/usr/bin/python3
+override_dh_clean:
+	dh_clean -O--buildsystem=pybuild
+	rm -rf build
+
+override_dh_auto_clean:
+	python3 setup.py clean -a
+
+# Commands not to run
+override_dh_installcatalogs:
+override_dh_installemacsen override_dh_installifupdown:
+override_dh_installinfo override_dh_installmenu override_dh_installmime:
+override_dh_installmodules override_dh_installlogcheck:
+override_dh_installpam override_dh_installppp override_dh_installudev override_dh_installwm:
+override_dh_installxfonts override_dh_gconf override_dh_icons override_dh_perl override_dh_usrlocal:
+override_dh_installcron override_dh_installdebconf:
+override_dh_installlogrotate override_dh_installgsettings:
diff -pruN 3.2.0-2/debian/salsa-ci.yml 3.3.0-0ubuntu1/debian/salsa-ci.yml
--- 3.2.0-2/debian/salsa-ci.yml	2021-08-16 09:04:55.000000000 +0000
+++ 3.3.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 3.2.0-2/debian/watch 3.3.0-0ubuntu1/debian/watch
--- 3.2.0-2/debian/watch	2021-08-16 09:04:55.000000000 +0000
+++ 3.3.0-0ubuntu1/debian/watch	2021-12-01 21:05:37.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-watcherclient/tags .*/(\d[brc\d\.]+)\.tar\.gz
+opts="uversionmangle=s/\.(b|rc)/~$1/" \
+    http://tarballs.openstack.org/python-watcherclient/ python-watcherclient-(\d.*)\.tar\.gz
diff -pruN 3.2.0-2/doc/source/conf.py 3.3.0-0ubuntu1/doc/source/conf.py
--- 3.2.0-2/doc/source/conf.py	2020-10-14 01:52:37.000000000 +0000
+++ 3.3.0-0ubuntu1/doc/source/conf.py	2021-09-01 19:13:31.000000000 +0000
@@ -42,8 +42,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'python-watcherclient'
-copyright = u'OpenStack Foundation'
+project = 'python-watcherclient'
+copyright = 'OpenStack Foundation'
 
 # A list of ignored prefixes for module index sorting.
 modindex_common_prefix = ['watcherclient.']
@@ -79,8 +79,8 @@ latex_documents = [
     (
         'index',
         '%s.tex' % project,
-        u'%s Documentation' % project,
-        u'OpenStack Foundation', 'manual'
+        '%s Documentation' % project,
+        'OpenStack Foundation', 'manual'
     ),
 ]
 
diff -pruN 3.2.0-2/.gitignore 3.3.0-0ubuntu1/.gitignore
--- 3.2.0-2/.gitignore	2020-10-14 01:52:37.000000000 +0000
+++ 3.3.0-0ubuntu1/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-*.py[cod]
-
-# C extensions
-*.so
-
-# Packages
-*.egg
-*.egg-info
-.eggs
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
-lib
-lib64
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage*
-.tox
-nosetests.xml
-.stestr/
-.venv
-.testrepository/
-
-# Translations
-*.mo
-
-# Mr Developer
-.mr.developer.cfg
-.project
-.pydevproject
-
-# Complexity
-output/*.html
-output/*/index.html
-
-# Sphinx
-doc/build
-doc/source/reference/api
-
-# pbr generates these
-AUTHORS
-ChangeLog
-
-# Editors
-*~
-.*.swp
-.*sw?
-
-sftp-config.json
-/.idea/
-/cover/
-
-# Desktop Service Store
-*.DS_Store
-
-# Atom
-.remote-sync.json
diff -pruN 3.2.0-2/.gitreview 3.3.0-0ubuntu1/.gitreview
--- 3.2.0-2/.gitreview	2020-10-14 01:52:37.000000000 +0000
+++ 3.3.0-0ubuntu1/.gitreview	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[gerrit]
-host=review.opendev.org
-port=29418
-project=openstack/python-watcherclient.git
diff -pruN 3.2.0-2/PKG-INFO 3.3.0-0ubuntu1/PKG-INFO
--- 3.2.0-2/PKG-INFO	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/PKG-INFO	2021-09-01 19:14:05.654806100 +0000
@@ -0,0 +1,175 @@
+Metadata-Version: 1.2
+Name: python-watcherclient
+Version: 3.3.0
+Summary: Python client library for Watcher API
+Home-page: https://docs.openstack.org/python-watcherclient/latest/
+Author: OpenStack
+Author-email: openstack-discuss@lists.openstack.org
+License: UNKNOWN
+Description: ========================
+        Team and repository tags
+        ========================
+        
+        .. image:: https://governance.openstack.org/tc/badges/python-watcherclient.svg
+            :target: https://governance.openstack.org/tc/reference/tags/index.html
+        
+        .. Change things from this point on
+        
+        ====================
+        python-watcherclient
+        ====================
+        
+        Client for resource optimization service for OpenStack.
+        
+        OpenStack Watcher provides a flexible and scalable resource optimization
+        service for multi-tenant OpenStack-based clouds.
+        Watcher provides a complete optimization loop-including everything from a
+        metrics receiver, complex event processor and profiler, optimization processor
+        and an action plan applier. This provides a robust framework to realize a wide
+        range of cloud optimization goals, including the reduction of data center
+        operating costs, increased system performance via intelligent virtual machine
+        migration, increased energy efficiency and more!
+        
+        * Free software: Apache license
+        * Wiki: https://wiki.openstack.org/wiki/Watcher
+        * Source: https://opendev.org/openstack/python-watcherclient
+        * Bugs: https://bugs.launchpad.net/watcher
+        
+        Installation
+        ============
+        
+        Install the prerequisite packages
+        ---------------------------------
+        
+        On Ubuntu (tested on 14.04-64)
+        
+        .. code::
+        
+           sudo apt-get install python-dev libssl-dev python-pip git-core libmysqlclient-dev libffi-dev
+        
+        On Fedora-based distributions e.g., Fedora/RHEL/CentOS/Scientific Linux (tested on CentOS 6.5)
+        
+        .. code::
+        
+           sudo yum install python-virtualenv openssl-devel python-pip git gcc libffi-devel mysql-devel postgresql-devel
+        
+        On openSUSE-based distributions (SLES 12, openSUSE 13.1, Factory or Tumbleweed)
+        
+        .. code::
+        
+           sudo zypper install gcc git libmysqlclient-devel libopenssl-devel postgresql-devel python-devel python-pip
+        
+        Install the Watcher client
+        --------------------------
+        
+        You can install the Watcher CLI with the following command:
+        
+        .. code::
+        
+           sudo pip install python-watcherclient
+        
+        
+        You can also use the `OpenStack client <https://docs.openstack.org/python-openstackclient/latest/>`_
+        with Watcher (our watcher plugin for OpenStack client is included in the
+        python-watcherclient package). To install it, you have just to run this command:
+        
+        .. code::
+        
+           sudo pip install python-openstackclient
+        
+        Configuration
+        =============
+        
+        Create a **creds** file containing your OpenStack credentials:
+        
+        .. code::
+        
+           export OS_IDENTITY_API_VERSION=3
+           export OS_AUTH_URL=http://<your-keystone-server>:5000/v3
+           export OS_PROJECT_DOMAIN_ID=default
+           export OS_USER_DOMAIN_ID=default
+           export OS_USERNAME=admin
+           export OS_PASSWORD=<your-password>
+           export OS_PROJECT_NAME=<your-project-name>
+        
+        Source these credentials into your current shell session:
+        
+        .. code::
+        
+           # source creds
+        
+        You should be able to launch the following command which gets the list of
+        previously created Audit Templates:
+        
+        .. code::
+        
+           # watcher audittemplate list
+        
+        or::
+        
+           # openstack optimize audittemplate list
+           +--------------------------------+------+----------------------+----------+
+           | UUID                           | Name | Goal                 | Strategy |
+           +--------------------------------+------+----------------------+----------+
+           +--------------------------------+------+----------------------+----------+
+        
+        
+        You can view the entire list of available Watcher commands and options using
+        this command:
+        
+        .. code::
+        
+           # watcher help
+        
+        or::
+        
+           # openstack help optimize
+        
+        
+        Troubleshootings
+        ================
+        
+        If any watcher command fails, you can obtain more details with the **--debug**
+        option :
+        
+        .. code::
+        
+           # watcher --debug audittemplate list
+        
+        or::
+        
+           # openstack --debug optimize audittemplate list
+        
+        
+        Install the openstack CLI :
+        
+        .. code::
+        
+           # pip install python-openstackclient
+        
+        Make sure that your Openstack credentials are correct. If so, you should be able
+        to verify that the watcher user has been declared in your Openstack keystone :
+        
+        .. code::
+        
+           # openstack user list
+        
+        and that the watcher endpoints have been declared as well :
+        
+        .. code::
+        
+           # openstack endpoint list
+        
+        
+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 :: 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 3.2.0-2/python_watcherclient.egg-info/dependency_links.txt 3.3.0-0ubuntu1/python_watcherclient.egg-info/dependency_links.txt
--- 3.2.0-2/python_watcherclient.egg-info/dependency_links.txt	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/python_watcherclient.egg-info/dependency_links.txt	2021-09-01 19:14:05.000000000 +0000
@@ -0,0 +1 @@
+
diff -pruN 3.2.0-2/python_watcherclient.egg-info/entry_points.txt 3.3.0-0ubuntu1/python_watcherclient.egg-info/entry_points.txt
--- 3.2.0-2/python_watcherclient.egg-info/entry_points.txt	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/python_watcherclient.egg-info/entry_points.txt	2021-09-01 19:14:05.000000000 +0000
@@ -0,0 +1,66 @@
+[console_scripts]
+watcher = watcherclient.shell:main
+
+[openstack.cli.extension]
+infra_optim = watcherclient.osc.plugin
+
+[openstack.infra_optim.v1]
+optimize_action_list = watcherclient.v1.action_shell:ListAction
+optimize_action_show = watcherclient.v1.action_shell:ShowAction
+optimize_actionplan_cancel = watcherclient.v1.action_plan_shell:CancelActionPlan
+optimize_actionplan_delete = watcherclient.v1.action_plan_shell:DeleteActionPlan
+optimize_actionplan_list = watcherclient.v1.action_plan_shell:ListActionPlan
+optimize_actionplan_show = watcherclient.v1.action_plan_shell:ShowActionPlan
+optimize_actionplan_start = watcherclient.v1.action_plan_shell:StartActionPlan
+optimize_actionplan_update = watcherclient.v1.action_plan_shell:UpdateActionPlan
+optimize_audit_create = watcherclient.v1.audit_shell:CreateAudit
+optimize_audit_delete = watcherclient.v1.audit_shell:DeleteAudit
+optimize_audit_list = watcherclient.v1.audit_shell:ListAudit
+optimize_audit_show = watcherclient.v1.audit_shell:ShowAudit
+optimize_audit_update = watcherclient.v1.audit_shell:UpdateAudit
+optimize_audittemplate_create = watcherclient.v1.audit_template_shell:CreateAuditTemplate
+optimize_audittemplate_delete = watcherclient.v1.audit_template_shell:DeleteAuditTemplate
+optimize_audittemplate_list = watcherclient.v1.audit_template_shell:ListAuditTemplate
+optimize_audittemplate_show = watcherclient.v1.audit_template_shell:ShowAuditTemplate
+optimize_audittemplate_update = watcherclient.v1.audit_template_shell:UpdateAuditTemplate
+optimize_datamodel_list = watcherclient.v1.data_model_shell:ListDataModel
+optimize_goal_list = watcherclient.v1.goal_shell:ListGoal
+optimize_goal_show = watcherclient.v1.goal_shell:ShowGoal
+optimize_scoringengine_list = watcherclient.v1.scoring_engine_shell:ListScoringEngine
+optimize_scoringengine_show = watcherclient.v1.scoring_engine_shell:ShowScoringEngine
+optimize_service_list = watcherclient.v1.service_shell:ListService
+optimize_service_show = watcherclient.v1.service_shell:ShowService
+optimize_strategy_list = watcherclient.v1.strategy_shell:ListStrategy
+optimize_strategy_show = watcherclient.v1.strategy_shell:ShowStrategy
+optimize_strategy_state = watcherclient.v1.strategy_shell:StateStrategy
+
+[watcherclient.v1]
+action_list = watcherclient.v1.action_shell:ListAction
+action_show = watcherclient.v1.action_shell:ShowAction
+actionplan_cancel = watcherclient.v1.action_plan_shell:CancelActionPlan
+actionplan_delete = watcherclient.v1.action_plan_shell:DeleteActionPlan
+actionplan_list = watcherclient.v1.action_plan_shell:ListActionPlan
+actionplan_show = watcherclient.v1.action_plan_shell:ShowActionPlan
+actionplan_start = watcherclient.v1.action_plan_shell:StartActionPlan
+actionplan_update = watcherclient.v1.action_plan_shell:UpdateActionPlan
+audit_create = watcherclient.v1.audit_shell:CreateAudit
+audit_delete = watcherclient.v1.audit_shell:DeleteAudit
+audit_list = watcherclient.v1.audit_shell:ListAudit
+audit_show = watcherclient.v1.audit_shell:ShowAudit
+audit_update = watcherclient.v1.audit_shell:UpdateAudit
+audittemplate_create = watcherclient.v1.audit_template_shell:CreateAuditTemplate
+audittemplate_delete = watcherclient.v1.audit_template_shell:DeleteAuditTemplate
+audittemplate_list = watcherclient.v1.audit_template_shell:ListAuditTemplate
+audittemplate_show = watcherclient.v1.audit_template_shell:ShowAuditTemplate
+audittemplate_update = watcherclient.v1.audit_template_shell:UpdateAuditTemplate
+datamodel_list = watcherclient.v1.data_model_shell:ListDataModel
+goal_list = watcherclient.v1.goal_shell:ListGoal
+goal_show = watcherclient.v1.goal_shell:ShowGoal
+scoringengine_list = watcherclient.v1.scoring_engine_shell:ListScoringEngine
+scoringengine_show = watcherclient.v1.scoring_engine_shell:ShowScoringEngine
+service_list = watcherclient.v1.service_shell:ListService
+service_show = watcherclient.v1.service_shell:ShowService
+strategy_list = watcherclient.v1.strategy_shell:ListStrategy
+strategy_show = watcherclient.v1.strategy_shell:ShowStrategy
+strategy_state = watcherclient.v1.strategy_shell:StateStrategy
+
diff -pruN 3.2.0-2/python_watcherclient.egg-info/not-zip-safe 3.3.0-0ubuntu1/python_watcherclient.egg-info/not-zip-safe
--- 3.2.0-2/python_watcherclient.egg-info/not-zip-safe	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/python_watcherclient.egg-info/not-zip-safe	2021-09-01 19:14:05.000000000 +0000
@@ -0,0 +1 @@
+
diff -pruN 3.2.0-2/python_watcherclient.egg-info/pbr.json 3.3.0-0ubuntu1/python_watcherclient.egg-info/pbr.json
--- 3.2.0-2/python_watcherclient.egg-info/pbr.json	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/python_watcherclient.egg-info/pbr.json	2021-09-01 19:14:05.000000000 +0000
@@ -0,0 +1 @@
+{"git_version": "dc9b5cb", "is_release": true}
\ No newline at end of file
diff -pruN 3.2.0-2/python_watcherclient.egg-info/PKG-INFO 3.3.0-0ubuntu1/python_watcherclient.egg-info/PKG-INFO
--- 3.2.0-2/python_watcherclient.egg-info/PKG-INFO	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/python_watcherclient.egg-info/PKG-INFO	2021-09-01 19:14:05.000000000 +0000
@@ -0,0 +1,175 @@
+Metadata-Version: 1.2
+Name: python-watcherclient
+Version: 3.3.0
+Summary: Python client library for Watcher API
+Home-page: https://docs.openstack.org/python-watcherclient/latest/
+Author: OpenStack
+Author-email: openstack-discuss@lists.openstack.org
+License: UNKNOWN
+Description: ========================
+        Team and repository tags
+        ========================
+        
+        .. image:: https://governance.openstack.org/tc/badges/python-watcherclient.svg
+            :target: https://governance.openstack.org/tc/reference/tags/index.html
+        
+        .. Change things from this point on
+        
+        ====================
+        python-watcherclient
+        ====================
+        
+        Client for resource optimization service for OpenStack.
+        
+        OpenStack Watcher provides a flexible and scalable resource optimization
+        service for multi-tenant OpenStack-based clouds.
+        Watcher provides a complete optimization loop-including everything from a
+        metrics receiver, complex event processor and profiler, optimization processor
+        and an action plan applier. This provides a robust framework to realize a wide
+        range of cloud optimization goals, including the reduction of data center
+        operating costs, increased system performance via intelligent virtual machine
+        migration, increased energy efficiency and more!
+        
+        * Free software: Apache license
+        * Wiki: https://wiki.openstack.org/wiki/Watcher
+        * Source: https://opendev.org/openstack/python-watcherclient
+        * Bugs: https://bugs.launchpad.net/watcher
+        
+        Installation
+        ============
+        
+        Install the prerequisite packages
+        ---------------------------------
+        
+        On Ubuntu (tested on 14.04-64)
+        
+        .. code::
+        
+           sudo apt-get install python-dev libssl-dev python-pip git-core libmysqlclient-dev libffi-dev
+        
+        On Fedora-based distributions e.g., Fedora/RHEL/CentOS/Scientific Linux (tested on CentOS 6.5)
+        
+        .. code::
+        
+           sudo yum install python-virtualenv openssl-devel python-pip git gcc libffi-devel mysql-devel postgresql-devel
+        
+        On openSUSE-based distributions (SLES 12, openSUSE 13.1, Factory or Tumbleweed)
+        
+        .. code::
+        
+           sudo zypper install gcc git libmysqlclient-devel libopenssl-devel postgresql-devel python-devel python-pip
+        
+        Install the Watcher client
+        --------------------------
+        
+        You can install the Watcher CLI with the following command:
+        
+        .. code::
+        
+           sudo pip install python-watcherclient
+        
+        
+        You can also use the `OpenStack client <https://docs.openstack.org/python-openstackclient/latest/>`_
+        with Watcher (our watcher plugin for OpenStack client is included in the
+        python-watcherclient package). To install it, you have just to run this command:
+        
+        .. code::
+        
+           sudo pip install python-openstackclient
+        
+        Configuration
+        =============
+        
+        Create a **creds** file containing your OpenStack credentials:
+        
+        .. code::
+        
+           export OS_IDENTITY_API_VERSION=3
+           export OS_AUTH_URL=http://<your-keystone-server>:5000/v3
+           export OS_PROJECT_DOMAIN_ID=default
+           export OS_USER_DOMAIN_ID=default
+           export OS_USERNAME=admin
+           export OS_PASSWORD=<your-password>
+           export OS_PROJECT_NAME=<your-project-name>
+        
+        Source these credentials into your current shell session:
+        
+        .. code::
+        
+           # source creds
+        
+        You should be able to launch the following command which gets the list of
+        previously created Audit Templates:
+        
+        .. code::
+        
+           # watcher audittemplate list
+        
+        or::
+        
+           # openstack optimize audittemplate list
+           +--------------------------------+------+----------------------+----------+
+           | UUID                           | Name | Goal                 | Strategy |
+           +--------------------------------+------+----------------------+----------+
+           +--------------------------------+------+----------------------+----------+
+        
+        
+        You can view the entire list of available Watcher commands and options using
+        this command:
+        
+        .. code::
+        
+           # watcher help
+        
+        or::
+        
+           # openstack help optimize
+        
+        
+        Troubleshootings
+        ================
+        
+        If any watcher command fails, you can obtain more details with the **--debug**
+        option :
+        
+        .. code::
+        
+           # watcher --debug audittemplate list
+        
+        or::
+        
+           # openstack --debug optimize audittemplate list
+        
+        
+        Install the openstack CLI :
+        
+        .. code::
+        
+           # pip install python-openstackclient
+        
+        Make sure that your Openstack credentials are correct. If so, you should be able
+        to verify that the watcher user has been declared in your Openstack keystone :
+        
+        .. code::
+        
+           # openstack user list
+        
+        and that the watcher endpoints have been declared as well :
+        
+        .. code::
+        
+           # openstack endpoint list
+        
+        
+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 :: 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 3.2.0-2/python_watcherclient.egg-info/requires.txt 3.3.0-0ubuntu1/python_watcherclient.egg-info/requires.txt
--- 3.2.0-2/python_watcherclient.egg-info/requires.txt	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/python_watcherclient.egg-info/requires.txt	2021-09-01 19:14:05.000000000 +0000
@@ -0,0 +1,9 @@
+PyYAML>=3.13
+cliff!=2.9.0,>=2.11.0
+keystoneauth1>=3.4.0
+osc-lib>=1.10.0
+oslo.i18n>=3.20.0
+oslo.serialization!=2.19.1,>=2.18.0
+oslo.utils>=3.36.0
+pbr!=2.1.0,>=3.1.1
+six>=1.11.0
diff -pruN 3.2.0-2/python_watcherclient.egg-info/SOURCES.txt 3.3.0-0ubuntu1/python_watcherclient.egg-info/SOURCES.txt
--- 3.2.0-2/python_watcherclient.egg-info/SOURCES.txt	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/python_watcherclient.egg-info/SOURCES.txt	2021-09-01 19:14:05.000000000 +0000
@@ -0,0 +1,105 @@
+.coveragerc
+.stestr.conf
+.zuul.yaml
+AUTHORS
+CONTRIBUTING.rst
+ChangeLog
+HACKING.rst
+LICENSE
+README.rst
+lower-constraints.txt
+requirements.txt
+setup.cfg
+setup.py
+test-requirements.txt
+tox.ini
+doc/requirements.txt
+doc/source/conf.py
+doc/source/contributing.rst
+doc/source/index.rst
+doc/source/installation.rst
+doc/source/cli/details.rst
+doc/source/cli/index.rst
+doc/source/cli/openstack_cli.rst
+doc/source/cli/watcher.rst
+doc/source/reference/api_v1.rst
+doc/source/reference/index.rst
+python_watcherclient.egg-info/PKG-INFO
+python_watcherclient.egg-info/SOURCES.txt
+python_watcherclient.egg-info/dependency_links.txt
+python_watcherclient.egg-info/entry_points.txt
+python_watcherclient.egg-info/not-zip-safe
+python_watcherclient.egg-info/pbr.json
+python_watcherclient.egg-info/requires.txt
+python_watcherclient.egg-info/top_level.txt
+releasenotes/notes/drop-py-2-7-f7078b44cf99cae1.yaml
+tools/watcher.bash_completion
+watcherclient/__init__.py
+watcherclient/_i18n.py
+watcherclient/client.py
+watcherclient/exceptions.py
+watcherclient/shell.py
+watcherclient/version.py
+watcherclient/common/__init__.py
+watcherclient/common/api_versioning.py
+watcherclient/common/base.py
+watcherclient/common/command.py
+watcherclient/common/httpclient.py
+watcherclient/common/utils.py
+watcherclient/common/apiclient/__init__.py
+watcherclient/common/apiclient/base.py
+watcherclient/common/apiclient/exceptions.py
+watcherclient/locale/watcherclient.pot
+watcherclient/locale/fr/LC_MESSAGES/watcherclient.po
+watcherclient/osc/__init__.py
+watcherclient/osc/plugin.py
+watcherclient/tests/__init__.py
+watcherclient/tests/unit/__init__.py
+watcherclient/tests/unit/keystone_client_fixtures.py
+watcherclient/tests/unit/test_client.py
+watcherclient/tests/unit/test_import.py
+watcherclient/tests/unit/test_utils.py
+watcherclient/tests/unit/utils.py
+watcherclient/tests/unit/common/__init__.py
+watcherclient/tests/unit/common/test_api_versioning.py
+watcherclient/tests/unit/v1/__init__.py
+watcherclient/tests/unit/v1/base.py
+watcherclient/tests/unit/v1/test_action.py
+watcherclient/tests/unit/v1/test_action_plan.py
+watcherclient/tests/unit/v1/test_action_plan_shell.py
+watcherclient/tests/unit/v1/test_action_shell.py
+watcherclient/tests/unit/v1/test_audit.py
+watcherclient/tests/unit/v1/test_audit_shell.py
+watcherclient/tests/unit/v1/test_audit_template.py
+watcherclient/tests/unit/v1/test_audit_template_shell.py
+watcherclient/tests/unit/v1/test_data_model.py
+watcherclient/tests/unit/v1/test_data_model_shell.py
+watcherclient/tests/unit/v1/test_goal.py
+watcherclient/tests/unit/v1/test_goal_shell.py
+watcherclient/tests/unit/v1/test_scoring_engine.py
+watcherclient/tests/unit/v1/test_scoring_engine_shell.py
+watcherclient/tests/unit/v1/test_service.py
+watcherclient/tests/unit/v1/test_service_shell.py
+watcherclient/tests/unit/v1/test_strategy.py
+watcherclient/tests/unit/v1/test_strategy_shell.py
+watcherclient/v1/__init__.py
+watcherclient/v1/action.py
+watcherclient/v1/action_plan.py
+watcherclient/v1/action_plan_shell.py
+watcherclient/v1/action_shell.py
+watcherclient/v1/audit.py
+watcherclient/v1/audit_shell.py
+watcherclient/v1/audit_template.py
+watcherclient/v1/audit_template_shell.py
+watcherclient/v1/client.py
+watcherclient/v1/data_model.py
+watcherclient/v1/data_model_shell.py
+watcherclient/v1/goal.py
+watcherclient/v1/goal_shell.py
+watcherclient/v1/resource_fields.py
+watcherclient/v1/scoring_engine.py
+watcherclient/v1/scoring_engine_shell.py
+watcherclient/v1/service.py
+watcherclient/v1/service_shell.py
+watcherclient/v1/strategy.py
+watcherclient/v1/strategy_shell.py
\ No newline at end of file
diff -pruN 3.2.0-2/python_watcherclient.egg-info/top_level.txt 3.3.0-0ubuntu1/python_watcherclient.egg-info/top_level.txt
--- 3.2.0-2/python_watcherclient.egg-info/top_level.txt	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/python_watcherclient.egg-info/top_level.txt	2021-09-01 19:14:05.000000000 +0000
@@ -0,0 +1 @@
+watcherclient
diff -pruN 3.2.0-2/setup.cfg 3.3.0-0ubuntu1/setup.cfg
--- 3.2.0-2/setup.cfg	2020-10-14 01:52:37.000000000 +0000
+++ 3.3.0-0ubuntu1/setup.cfg	2021-09-01 19:14:05.654806100 +0000
@@ -1,115 +1,115 @@
 [metadata]
 name = python-watcherclient
 summary = Python client library for Watcher API
-description-file =
-    README.rst
+description_file = 
+	README.rst
 author = OpenStack
-author-email = openstack-discuss@lists.openstack.org
-home-page =  https://docs.openstack.org/python-watcherclient/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 :: 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/python-watcherclient/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 :: 3
+	Programming Language :: Python :: 3.6
+	Programming Language :: Python :: 3.7
+	Programming Language :: Python :: 3.8
 
 [files]
-packages =
-    watcherclient
+packages = 
+	watcherclient
 
 [entry_points]
-console_scripts =
-    watcher = watcherclient.shell:main
-
-openstack.cli.extension =
-    infra_optim = watcherclient.osc.plugin
-
-# Entry points for the 'openstack' command
-openstack.infra_optim.v1 =
-    optimize_goal_show = watcherclient.v1.goal_shell:ShowGoal
-    optimize_goal_list = watcherclient.v1.goal_shell:ListGoal
-
-    optimize_strategy_show = watcherclient.v1.strategy_shell:ShowStrategy
-    optimize_strategy_list = watcherclient.v1.strategy_shell:ListStrategy
-    optimize_strategy_state = watcherclient.v1.strategy_shell:StateStrategy
-
-    optimize_audittemplate_show = watcherclient.v1.audit_template_shell:ShowAuditTemplate
-    optimize_audittemplate_list = watcherclient.v1.audit_template_shell:ListAuditTemplate
-    optimize_audittemplate_create = watcherclient.v1.audit_template_shell:CreateAuditTemplate
-    optimize_audittemplate_update = watcherclient.v1.audit_template_shell:UpdateAuditTemplate
-    optimize_audittemplate_delete = watcherclient.v1.audit_template_shell:DeleteAuditTemplate
-
-    optimize_audit_show = watcherclient.v1.audit_shell:ShowAudit
-    optimize_audit_list = watcherclient.v1.audit_shell:ListAudit
-    optimize_audit_create = watcherclient.v1.audit_shell:CreateAudit
-    optimize_audit_update = watcherclient.v1.audit_shell:UpdateAudit
-    optimize_audit_delete = watcherclient.v1.audit_shell:DeleteAudit
-
-    optimize_actionplan_show = watcherclient.v1.action_plan_shell:ShowActionPlan
-    optimize_actionplan_delete = watcherclient.v1.action_plan_shell:DeleteActionPlan
-    optimize_actionplan_list = watcherclient.v1.action_plan_shell:ListActionPlan
-    optimize_actionplan_update = watcherclient.v1.action_plan_shell:UpdateActionPlan
-    optimize_actionplan_start = watcherclient.v1.action_plan_shell:StartActionPlan
-    optimize_actionplan_cancel = watcherclient.v1.action_plan_shell:CancelActionPlan
-
-    optimize_action_show = watcherclient.v1.action_shell:ShowAction
-    optimize_action_list = watcherclient.v1.action_shell:ListAction
-
-    optimize_scoringengine_show = watcherclient.v1.scoring_engine_shell:ShowScoringEngine
-    optimize_scoringengine_list = watcherclient.v1.scoring_engine_shell:ListScoringEngine
-
-    optimize_service_show = watcherclient.v1.service_shell:ShowService
-    optimize_service_list = watcherclient.v1.service_shell:ListService
-
-    optimize_datamodel_list = watcherclient.v1.data_model_shell:ListDataModel
-
-# The same as above but used by the 'watcher' command
-watcherclient.v1 =
-    goal_show = watcherclient.v1.goal_shell:ShowGoal
-    goal_list = watcherclient.v1.goal_shell:ListGoal
-
-    strategy_show = watcherclient.v1.strategy_shell:ShowStrategy
-    strategy_list = watcherclient.v1.strategy_shell:ListStrategy
-    strategy_state = watcherclient.v1.strategy_shell:StateStrategy
-
-    audittemplate_show = watcherclient.v1.audit_template_shell:ShowAuditTemplate
-    audittemplate_list = watcherclient.v1.audit_template_shell:ListAuditTemplate
-    audittemplate_create = watcherclient.v1.audit_template_shell:CreateAuditTemplate
-    audittemplate_update = watcherclient.v1.audit_template_shell:UpdateAuditTemplate
-    audittemplate_delete = watcherclient.v1.audit_template_shell:DeleteAuditTemplate
-
-    audit_show = watcherclient.v1.audit_shell:ShowAudit
-    audit_list = watcherclient.v1.audit_shell:ListAudit
-    audit_create = watcherclient.v1.audit_shell:CreateAudit
-    audit_update = watcherclient.v1.audit_shell:UpdateAudit
-    audit_delete = watcherclient.v1.audit_shell:DeleteAudit
-
-    actionplan_show = watcherclient.v1.action_plan_shell:ShowActionPlan
-    actionplan_list = watcherclient.v1.action_plan_shell:ListActionPlan
-    actionplan_update = watcherclient.v1.action_plan_shell:UpdateActionPlan
-    actionplan_start = watcherclient.v1.action_plan_shell:StartActionPlan
-    actionplan_delete = watcherclient.v1.action_plan_shell:DeleteActionPlan
-    actionplan_cancel = watcherclient.v1.action_plan_shell:CancelActionPlan
-
-    action_show = watcherclient.v1.action_shell:ShowAction
-    action_list = watcherclient.v1.action_shell:ListAction
-
-    scoringengine_show = watcherclient.v1.scoring_engine_shell:ShowScoringEngine
-    scoringengine_list = watcherclient.v1.scoring_engine_shell:ListScoringEngine
-
-    service_show = watcherclient.v1.service_shell:ShowService
-    service_list = watcherclient.v1.service_shell:ListService
-
-    datamodel_list = watcherclient.v1.data_model_shell:ListDataModel
+console_scripts = 
+	watcher = watcherclient.shell:main
+openstack.cli.extension = 
+	infra_optim = watcherclient.osc.plugin
+openstack.infra_optim.v1 = 
+	optimize_goal_show = watcherclient.v1.goal_shell:ShowGoal
+	optimize_goal_list = watcherclient.v1.goal_shell:ListGoal
+	
+	optimize_strategy_show = watcherclient.v1.strategy_shell:ShowStrategy
+	optimize_strategy_list = watcherclient.v1.strategy_shell:ListStrategy
+	optimize_strategy_state = watcherclient.v1.strategy_shell:StateStrategy
+	
+	optimize_audittemplate_show = watcherclient.v1.audit_template_shell:ShowAuditTemplate
+	optimize_audittemplate_list = watcherclient.v1.audit_template_shell:ListAuditTemplate
+	optimize_audittemplate_create = watcherclient.v1.audit_template_shell:CreateAuditTemplate
+	optimize_audittemplate_update = watcherclient.v1.audit_template_shell:UpdateAuditTemplate
+	optimize_audittemplate_delete = watcherclient.v1.audit_template_shell:DeleteAuditTemplate
+	
+	optimize_audit_show = watcherclient.v1.audit_shell:ShowAudit
+	optimize_audit_list = watcherclient.v1.audit_shell:ListAudit
+	optimize_audit_create = watcherclient.v1.audit_shell:CreateAudit
+	optimize_audit_update = watcherclient.v1.audit_shell:UpdateAudit
+	optimize_audit_delete = watcherclient.v1.audit_shell:DeleteAudit
+	
+	optimize_actionplan_show = watcherclient.v1.action_plan_shell:ShowActionPlan
+	optimize_actionplan_delete = watcherclient.v1.action_plan_shell:DeleteActionPlan
+	optimize_actionplan_list = watcherclient.v1.action_plan_shell:ListActionPlan
+	optimize_actionplan_update = watcherclient.v1.action_plan_shell:UpdateActionPlan
+	optimize_actionplan_start = watcherclient.v1.action_plan_shell:StartActionPlan
+	optimize_actionplan_cancel = watcherclient.v1.action_plan_shell:CancelActionPlan
+	
+	optimize_action_show = watcherclient.v1.action_shell:ShowAction
+	optimize_action_list = watcherclient.v1.action_shell:ListAction
+	
+	optimize_scoringengine_show = watcherclient.v1.scoring_engine_shell:ShowScoringEngine
+	optimize_scoringengine_list = watcherclient.v1.scoring_engine_shell:ListScoringEngine
+	
+	optimize_service_show = watcherclient.v1.service_shell:ShowService
+	optimize_service_list = watcherclient.v1.service_shell:ListService
+	
+	optimize_datamodel_list = watcherclient.v1.data_model_shell:ListDataModel
+watcherclient.v1 = 
+	goal_show = watcherclient.v1.goal_shell:ShowGoal
+	goal_list = watcherclient.v1.goal_shell:ListGoal
+	
+	strategy_show = watcherclient.v1.strategy_shell:ShowStrategy
+	strategy_list = watcherclient.v1.strategy_shell:ListStrategy
+	strategy_state = watcherclient.v1.strategy_shell:StateStrategy
+	
+	audittemplate_show = watcherclient.v1.audit_template_shell:ShowAuditTemplate
+	audittemplate_list = watcherclient.v1.audit_template_shell:ListAuditTemplate
+	audittemplate_create = watcherclient.v1.audit_template_shell:CreateAuditTemplate
+	audittemplate_update = watcherclient.v1.audit_template_shell:UpdateAuditTemplate
+	audittemplate_delete = watcherclient.v1.audit_template_shell:DeleteAuditTemplate
+	
+	audit_show = watcherclient.v1.audit_shell:ShowAudit
+	audit_list = watcherclient.v1.audit_shell:ListAudit
+	audit_create = watcherclient.v1.audit_shell:CreateAudit
+	audit_update = watcherclient.v1.audit_shell:UpdateAudit
+	audit_delete = watcherclient.v1.audit_shell:DeleteAudit
+	
+	actionplan_show = watcherclient.v1.action_plan_shell:ShowActionPlan
+	actionplan_list = watcherclient.v1.action_plan_shell:ListActionPlan
+	actionplan_update = watcherclient.v1.action_plan_shell:UpdateActionPlan
+	actionplan_start = watcherclient.v1.action_plan_shell:StartActionPlan
+	actionplan_delete = watcherclient.v1.action_plan_shell:DeleteActionPlan
+	actionplan_cancel = watcherclient.v1.action_plan_shell:CancelActionPlan
+	
+	action_show = watcherclient.v1.action_shell:ShowAction
+	action_list = watcherclient.v1.action_shell:ListAction
+	
+	scoringengine_show = watcherclient.v1.scoring_engine_shell:ShowScoringEngine
+	scoringengine_list = watcherclient.v1.scoring_engine_shell:ListScoringEngine
+	
+	service_show = watcherclient.v1.service_shell:ShowService
+	service_list = watcherclient.v1.service_shell:ListService
+	
+	datamodel_list = watcherclient.v1.data_model_shell:ListDataModel
 
 [pbr]
 autodoc_index_modules = True
-autodoc_exclude_modules =
-  watcherclient.tests.*
+autodoc_exclude_modules = 
+	watcherclient.tests.*
 api_doc_dir = reference/api
+
+[egg_info]
+tag_build = 
+tag_date = 0
+
diff -pruN 3.2.0-2/tox.ini 3.3.0-0ubuntu1/tox.ini
--- 3.2.0-2/tox.ini	2020-10-14 01:52:37.000000000 +0000
+++ 3.3.0-0ubuntu1/tox.ini	2021-09-01 19:13:31.000000000 +0000
@@ -1,6 +1,6 @@
 [tox]
-minversion = 2.0
-envlist = py36,py38,pep8
+minversion = 3.18.0
+envlist = py3,pep8
 skipsdist = True
 
 [testenv]
@@ -11,10 +11,10 @@ install_command = pip install {opts} {pa
 setenv =
    VIRTUAL_ENV={envdir}
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
-whitelist_externals =
+allowlist_externals =
   rm
 commands = rm -f .testrepository/times.dbm
            # The --test-path is defined in .stestr.conf
@@ -43,7 +43,7 @@ commands =
 [testenv:docs]
 basepython = python3
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -W -b html doc/source doc/build/html
 
@@ -52,7 +52,7 @@ commands = sphinx-build -W -b html doc/s
 basepython = python3
 envdir = {toxworkdir}/docs
 deps = {[testenv:docs]deps}
-whitelist_externals =
+allowlist_externals =
   rm
   make
 commands =
@@ -78,11 +78,3 @@ commands = python setup.py bdist_wheel
 
 [hacking]
 import_exceptions = watcherclient._i18n
-
-[testenv:lower-constraints]
-basepython = python3
-install_command = pip install -U {opts} {packages}
-deps =
-  -c{toxinidir}/lower-constraints.txt
-  -r{toxinidir}/test-requirements.txt
-  -r{toxinidir}/requirements.txt
diff -pruN 3.2.0-2/.zuul.yaml 3.3.0-0ubuntu1/.zuul.yaml
--- 3.2.0-2/.zuul.yaml	2020-10-14 01:52:37.000000000 +0000
+++ 3.3.0-0ubuntu1/.zuul.yaml	2021-09-01 19:13:31.000000000 +0000
@@ -1,8 +1,7 @@
 - project:
     templates:
       - openstack-cover-jobs
-      - openstack-lower-constraints-jobs
-      - openstack-python3-wallaby-jobs
+      - openstack-python3-xena-jobs
       - publish-openstack-docs-pti
       - check-requirements
       - openstackclient-plugin-jobs
