diff -pruN 3.2.1-2/AUTHORS 3.3.0-0ubuntu1/AUTHORS
--- 3.2.1-2/AUTHORS	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/AUTHORS	2020-12-02 10:40:10.000000000 +0000
@@ -0,0 +1,101 @@
+Adrien Vergé <adrien.verge@numergy.com>
+Alexander Ignatov <aignatov@mirantis.com>
+Alexander Kuznetsov <akuznetsov@mirantis.com>
+Alina Nesterova <zemuvier@gmail.com>
+Andreas Jaeger <aj@suse.com>
+Andreas Jaeger <aj@suse.de>
+Andrew Lazarev <alazarev@mirantis.com>
+Andrey Pavlov <apavlov@mirantis.com>
+Chad Roberts <croberts@redhat.com>
+Charles Short <zulcss@gmail.com>
+Chen <dstbtgagt@foxmail.com>
+Christian Berendt <berendt@b1-systems.de>
+Cyril Roelandt <cyril.roelandt@enovance.com>
+Davanum Srinivas <davanum@gmail.com>
+Denis Egorenko <degorenko@mirantis.com>
+Dmitry Mescheryakov <dmescheryakov@mirantis.com>
+Doug Hellmann <doug@doughellmann.com>
+Ethan Gafford <egafford@redhat.com>
+Flavio Percoco <flaper87@gmail.com>
+Ghanshyam Mann <gmann@ghanshyammann.com>
+Hangdong Zhang <hdzhang@fiberhome.com>
+Hervé Beraud <hberaud@redhat.com>
+Ivan Udovichenko <iudovichenko@mirantis.com>
+Iwona Kotlarska <iwona260909@gmail.com>
+James E. Blair <jeblair@hp.com>
+Jamie Lennox <jamielennox@redhat.com>
+Jaxon Wang <jxwang92@gmail.com>
+Jeremy Freudberg <jeremyfreudberg@gmail.com>
+Jeremy Liu <liujiong@gohighsec.com>
+Jeremy Stanley <fungi@yuggoth.org>
+KATO Tomoyuki <kato.tomoyuki@jp.fujitsu.com>
+Khanh-Toan Tran <khanh-toan.tran@cloudwatt.com>
+Li, Chen <chen.li@intel.com>
+Longgeek <longgeek@thstack.com>
+Luigi Toscano <ltoscano@redhat.com>
+Matthew Farrellee <matt@redhat.com>
+Michael Ionkin <mionkin@mirantis.com>
+Michael McCune <mimccune@redhat.com>
+Mikhail Lelyakin <mlelyakin@mirantis.com>
+Mina Park <mina922.park@samsung.com>
+Minkyung Maisy Kim <mk90.kim@samsung.com>
+Monty Taylor <mordred@inaugust.com>
+Ngo Quoc Cuong <cuongnq@vn.fujitsu.com>
+Nguyen Hai <nguyentrihai93@gmail.com>
+Nikita Konovalov <nkonovalov@mirantis.com>
+Nikolay Mahotkin <nmakhotkin@mirantis.com>
+Ondřej Nový <ondrej.novy@firma.seznam.cz>
+OpenStack Release Bot <infra-root@openstack.org>
+Pavlo Shchelokovskyy <pshchelokovskyy@mirantis.com>
+PavlovAndrey <apavlov@mirantis.com>
+Petr Kovar <pkovar@redhat.com>
+Pritesh Kothari <pritesh.kothari@cisco.com>
+Renat Akhmerov <rakhmerov@mirantis.com>
+Rui Chen <chenrui.momo@gmail.com>
+Sean McGinnis <sean.mcginnis@gmail.com>
+Sergey Galkin <sgalkin@mirantis.com>
+Sergey Lukjanov <slukjanov@mirantis.com>
+Sergey Reshetnyak <reshetniaksv@gmail.com>
+Sergey Reshetnyak <sreshetniak@mirantis.com>
+Shrirang Phadke <shrirang.phadke@izeltech.com>
+Shu Yingya <yingya.shu@easystack.cn>
+Steve Martinelli <stevemar@ca.ibm.com>
+Swapnil Kulkarni (coolsvap) <me@coolsvap.net>
+Tang Chen <chen.tang@easystack.cn>
+Telles Nobrega <tellesmvn@lsd.ufcg.edu.br>
+Telles Nobrega <tenobreg@redhat.com>
+Tetiana Lashchova <tlashchova@mirantis.com>
+Thomas Bechtold <tbechtold@suse.com>
+Thomas Goirand <zigo@debian.org>
+Tony Breeds <tony@bakeyournoodle.com>
+Trevor McKay <tmckay@redhat.com>
+Vieri <15050873171@163.com>
+Vitaly Gridnev <vgridnev@mirantis.com>
+Vu Cong Tuan <tuanvc@vn.fujitsu.com>
+Yaroslav Lobankov <ylobankov@mirantis.com>
+Zhiqiang Fan <aji.zqfan@gmail.com>
+bhagyashris <bhagyashri.shewale@nttdata.com>
+caishan <caishan1993@foxmail.com>
+chioleong <chio-fai-sam.leong@hp.com>
+daohanli <dhli5759@fiberhome.com>
+henriquetruta <henrique@lsd.ufcg.edu.br>
+jiasen.lin <jiasen.lin@easystack.cn>
+kangyufei <kangyf@inspur.com>
+kavithahr <kavitha.r@nectechnologies.in>
+llg8212 <lilinguo@huawei.com>
+luhuichun <huichun.lu@intel.com>
+malei <malei@maleideMacBook-Pro.local>
+qingszhao <zhao.daqing@99cloud.net>
+ricolin <rico.l@inwinstack.com>
+ricolin <rico.lin@easystack.cn>
+shu-mutou <shu-mutou@rf.jp.nec.com>
+ting.wang <ting.wang@easystack.cn>
+venkatamahesh <venkatamaheshkotha@gmail.com>
+wu.chunyang <wu.chunyang@99cloud.net>
+wu.chunyang <wuchunyang@yovole.com>
+wu.shiming <wushiming@yovole.com>
+yankee <yankeefu1991@hotmail.com>
+yuhara.motoki <yuhara.motoki@lab.ntt.co.jp>
+zemuvier <zemuvier@gmail.com>
+zhouyunfeng <zhouyunfeng@inspur.com>
+zhu.rong <zhu.rong@99cloud.net>
diff -pruN 3.2.1-2/ChangeLog 3.3.0-0ubuntu1/ChangeLog
--- 3.2.1-2/ChangeLog	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/ChangeLog	2020-12-02 10:40:10.000000000 +0000
@@ -0,0 +1,820 @@
+CHANGES
+=======
+
+3.3.0
+-----
+
+* Remove install unnecessary packages
+* Add Python3 wallaby unit tests
+* Update master for stable/victoria
+
+3.2.1
+-----
+
+* [goal] Migrating testing to Ubuntu Focal
+* Remove Babel requirement
+* drop mock from lower-constraints
+
+3.2.0
+-----
+
+* Switch to newer openstackdocstheme and reno versions
+* Fix hacking min version to 3.0.1
+* Bump default tox env from py37 to py38
+* Add py38 package metadata
+* Ussuri contributor docs community goal
+* Use unittest.mock instead of third party mock
+* Remove pypy job
+* Add Python3 victoria unit tests
+* Update master for stable/ussuri
+
+3.1.0
+-----
+
+* Cleanup py27 support
+* Update hacking for Python3
+* Fix the "image register" command (OSC 5.2.0 regression)
+
+3.0.0
+-----
+
+* fix: typo in tox minversion option
+* [ussuri][goal] Drop python 2.7 support and testing
+* Switch to Ussuri jobs
+* Update master for stable/train
+
+2.3.0
+-----
+
+* py3: use the train test template and other updates
+* Update sphinx from current requirements
+* Py3: fix the OSC download job binary command
+* Replace git.openstack.org URLs with opendev.org URLs
+* OpenDev Migration Patch
+* Update master for stable/stein
+* Add py37 and API v2 jobs (scenario, tempest)
+
+2.2.0
+-----
+
+* Add missing APIv2 features to client, OSC
+
+2.1.0
+-----
+
+* Preparing OSC for APIv2
+* Add Python 3.6 classifier to setup.cfg
+* add python 3.6 unit test job
+* Update devel info: mailing list
+* Use templates for cover and lower-constraints
+* add python 3.6 unit test job
+* switch documentation job to new PTI
+* import zuul job settings from project-config
+* Update reno for stable/rocky
+
+2.0.0
+-----
+
+* Clean S3 data source create/update
+* Support of S3 data sources in OSC
+* Adding boot from volume to osc
+* Adding boot from volume
+* Correct a missed job\_execution->job
+* Fix the cover tox target (switch to stestr)
+* Revert "Fix the cover tox target (switch to stestr)"
+* Allow S3 credentials in data source create
+* Rework saharaclient authentication
+* Reflect response fixes for jobs/jobs templates
+* Fix the cover tox target (switch to stestr)
+* Switch to using stestr
+* Add release note link in README
+* Reflect change to multiple clusters creation
+* Support of the improved force-delete in client
+* Remove PyPI downloads
+* fix tox python3 overrides
+* Fix build with Sphinx 1.7.x
+* Trivial: Update pypi url to new url
+
+1.6.0
+-----
+
+* Tox: cleanup usage of py34, remove a now-useless section
+* Updated from global requirements
+* add lower-constraints job
+* Remove outdated tools and files
+* Updated from global requirements
+* Follow the new PTI for document build
+* Migration to Storyboard (2)
+* Migration to Storyboard
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Native Zuul v3 jobs
+* Update reno for stable/queens
+
+1.5.0
+-----
+
+* Auto-document members properly
+* APIv2 support in client
+* Updated from global requirements
+* Modify home page in setup.cfg
+* Updated from global requirements
+* Updated from global requirements
+* Support of S3 binaries in OSC
+* Fix misleading docstring
+* Properly document job binary "extra"
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Remove -U from pip install
+* Avoid tox\_install.sh for constraints support
+* Remove setting of version/release from releasenotes
+
+1.4.0
+-----
+
+* Updated from global requirements
+* Updated from global requirements
+* Add export of node group templates to CLI
+* Add export of cluster templates
+* Fix KeyError in "cluster scale" command
+* Updated from global requirements
+* [ut] replace .testr.conf with .stestr.conf
+* Updated from global requirements
+* Reorganize the documentation following the new structure
+* Updated from global requirements
+* Add import of node group templates
+* Add import of Cluster Templates
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Adding volume\_mount\_prefix parameter
+* Add export of node group templates
+* Update reno for stable/pike
+
+1.3.0
+-----
+
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Clone sahara hacking checks to saharaclient
+* Update and optimize documentation links
+* Updated from global requirements
+* doc: migrate to openstackdocstheme
+* doc: enable warning-is-error and fix warnings
+* Remove log translations
+* Use 'project' instead of 'tenant'
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Fix html\_last\_updated\_fmt for Python3
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+
+1.2.0
+-----
+
+* Updated from global requirements
+* Replace six.iteritems() with .items()
+* Updated from global requirements
+* Fix a bug in jobs.py
+* PYthon 3.5 is added
+* Updated from global requirements
+* [Fix gate]Update test requirement
+* Updated from global requirements
+* Spelling replaced from "ot" to "of"
+* Fixed log messages
+* Updated from global requirements
+* Updated from global requirements
+* Set client module \_\_version\_\_
+* Update reno for stable/ocata
+
+1.1.0
+-----
+
+* Updated from global requirements
+* [trivial] Fix spelling
+* Updated from global requirements
+* Enable coverage report in console output
+* Add Constraints support
+* Replace logging with oslo\_log
+* Updated from global requirements
+* Updated from global requirements
+* Show team and repo badges on README
+* Updated from global requirements
+
+1.0.0
+-----
+
+* Updated from global requirements
+* Updated from global requirements
+* Provide the cluster info about WebUI
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Add plug-in summary for osc doc
+* Enable release notes translation
+* Optimize command job-binary-download
+* Raise exception in command "plugin configs get"
+* remove old cli commands
+* Return error\_code in command "job binary download"
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Add newline to strings in stdout/stderr.write()
+* Updated from global requirements
+* Updated from global requirements
+* standardize release note page ordering
+* Update reno for stable/newton
+* Fix doc build if git is absent
+
+0.18.0
+------
+
+* Updated from global requirements
+* Updated from global requirements
+
+0.17.0
+------
+
+* Add sorting ability to Python-saharaclient
+* Designate integration
+* Updated from global requirements
+
+0.16.0
+------
+
+* Updated from global requirements
+* Add pagination ability to Python-saharaclient
+* Remove discover from test-requirements
+* Updated from global requirements
+* include storm.pyleus in job types
+* Updated from global requirements
+* support event logs for CLI
+* plugin's api update support
+* Updated from global requirements
+* Remove unused functional tests
+* Updated from global requirements
+* Updated from global requirements
+* Add openstackclient dependency back
+* Use osc\_lib instead of cliff
+* Updated from global requirements
+* Updated from global requirements
+* Use osc-lib instead of openstackclient
+* Updated from global requirements
+* Remove incorrectly used "# flake8: noqa"
+* print statment has become a function in py3
+* Updated from global requirements
+* avoid additional requirement for building docs
+* Migrate functional tests to openstack-client
+
+0.15.0
+------
+
+* Change plugin version 'version' parameter to 'plugin-version'
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Replace tempest\_lib with tempest.lib
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Remove integration tests from saharaclient
+* Update reno for stable/mitaka
+* Updated from global requirements
+
+0.13.0
+------
+
+* Remove unused pngmath Sphinx extension
+* Fixing updates via CLI
+* Fixing cluster creation with neutron network via CLI
+* Use ostestr instead of the custom pretty\_tox.sh
+* Adding "health verification --show" CLI call
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Add debug testenv in tox
+
+0.12.0
+------
+
+* Keystoneclient to keystoneauth migration
+* Updated from global requirements
+* verifications impl for saharaclient
+* Adding release notes for saharaclient
+* Updated from global requirements
+* Adding ability to unset fields with update calls
+* Updated from global requirements
+* Replace deprecated library function os.popen() with subprocess
+* Updated from global requirements
+* Remove argparse dependency from requirements.txt file
+* Adding release notes for saharaclient
+* Fixing cluster scaling via CLI
+* Updated from global requirements
+* Updated from global requirements
+* Drop py33 support
+* Updated from global requirements
+* Deprecated tox -downloadcache option removed
+* Updated from global requirements
+* Add releasenotes to sahara client
+* Updated from global requirements
+* Remove py26 support
+* remove netaddr from requirements
+* Delete python bytecode before every test run
+* Updated from global requirements
+* Updated from global requirements
+* Adding indications of results after delete operations
+* Adding ability to get plugin processes via CLI
+* Updated from global requirements
+* Replacing hard coded cluster status using utils in sahara-client
+* Updated from global requirements
+* Fixing data source update in CLI
+* Adding ability to provide name or ID of the flavor in CLI
+* Updated from global requirements
+* Enabling DeprecationWarning if session is not provided
+* Adding sphinx extension for CLI docs autogeneration
+* Last sync from oslo-incubator
+* Adding autogenerated saharaclient API docs
+* Adding Sahara CLI overview to docs and fixing warnings
+* Images CLI improvement
+* Making desc parameter of update\_image optional
+* Deprecation of the Sahara CLI
+* Allowing for shares to be edited on an existing cluster
+* Fix bypass-url for CLI
+* Fixing updates for CLI
+* Add \*.log to gitignore
+* Adding get\_resource\_id method to CLI utils
+* Adding Job Binaries support to CLI
+* Updated from global requirements
+* Adding Jobs support to CLI
+* Updated from global requirements
+* Making parameters of job binaries create optional
+* Adding Job Types support to CLI
+* Adding Job Templates support to CLI
+* Making parameters of job executions create optional
+* Making parameters of job create optional
+* Updated from global requirements
+* Adding Clusters support to CLI
+* Adding Cluster Templates support to CLI
+* Adding Node Group Templates support to CLI
+* Changing public/protected options handling
+* Improve readme contents
+* Updated from global requirements
+* Updated from global requirements
+* Add the mising requriements
+* Updated from global requirements
+* Updated from global requirements
+* Adding Images support to CLI
+* Fix functional tests in gate
+* Fixed problem with tags update
+* Added volume\_mount\_prefix for node group templates
+* Adding update and minor fixes to Data Sources CLI
+* print usage when no argument is specified for python3
+* Fixing cluster and node group template updates
+* Adding sahara\_url and endpoint\_type to OpenstackClient CLI
+* Adding return of updated image for update\_image, update\_tags
+* Updated from global requirements
+* Fix functional tests in saharaclient
+* Remove duplicate .coverage in .gitignore file
+* Shows reason of failure in base.get
+* Remove \`data source update\` from setup.cfg
+* Change ignore-errors to ignore\_errors
+* Adding missed public/protected support for jobs creation
+* Updating saharaclient api docs
+
+0.11.0
+------
+
+* Updated from global requirements
+* Support updates and ACL for objects
+* Updated from global requirements
+* Updated from global requirements
+* Improve help strings
+* Fixing query string for multiple opts
+* Updated from global requirements
+* Adding Data Sources support to CLI
+
+0.10.1
+------
+
+* Fix backward compat issue for job interfaces
+* Add initial commit for integration with Openstackclient
+
+0.10.0
+------
+
+* Updated from global requirements
+* API to mount manila shares to clusters
+* Add support OS\_ENDPOINT\_TYPE env variable to CLI
+* Add support of use\_autoconfig field
+* Add to\_dict() method to Resource class
+* Updated from global requirements
+* Add cluster-scale command to the CLI
+* Adding interface argument for job template and job
+* Fix \_get\_by\_id\_or\_name method
+* Updated from global requirements
+* Updated from global requirements
+* Allow multiple clusters creation
+* Sorting 'job-list' output by start\_time
+* Including 'start\_time' column at 'sahara job-list' command
+* Updated from global requirements
+* pass environment variables of proxy to tox
+* Updated from global requirements
+* Updated from global requirements
+
+0.9.1
+-----
+
+* Adding job binary editing to library and CLI
+* Pass OpenStack environment variables to client tests
+* Adding data source editing to library and CLI
+* Updated from global requirements
+* Adding node group template editing to CLI
+* Adding cluster template editing to CLI
+* Updated from global requirements
+* Drop use of 'oslo' namespace package
+* Updated from global requirements
+* Try getting old service type if session used
+* Add .coveragerc to saharaclient
+* Update README to work with release tools
+
+0.9.0
+-----
+
+* Uncap library requirements for liberty
+* Add regions support to saharaclient
+* Provide user-agent in saharaclient
+* Mark saharaclient as being a universal wheel
+* Add CONTRIBUTING.rst
+* Port to Python 3
+* add --name option to assign name to job-binary-internal
+* Rework authentication
+* Add support for job-types-list
+* Add post\_test\_hook for functional tests
+* Copy functional tests from tempest CLI
+* Updated from global requirements
+* Add support for show\_events parameter
+* Added support of instance locality
+
+0.8.0
+-----
+
+* Removed cluster validation on client side
+* Add how to participate doc
+* Added --bypass-url support for keystone 3
+* Updated from global requirements
+* Remove strutils from openstack/common
+* Remove importutils from openstack-common.conf
+* Pass service type argument in Sahara CLI
+* Fixed work with 'data\_processing' service spelling
+* Added support of is\_proxy\_gateway field for node group
+* Pass endpoint\_type to Sahara client constructor
+* Use pretty-tox for better test output
+* Update apiclient.exceptions oslo-incubator module
+* Update apiclient.auth oslo-incubator module
+* Update \_i18n oslo-incubator module
+* Remove unused uuidutils dep
+* Remove obsolete gettextutils
+* Remove unused apiclient oslo files
+* apiclient.auth is required since d02f0e1d (21 sep 2014)
+* Add find\_unique base manager method
+* Add ability to get events from saharaclient
+* Using oslo\_\* instead of oslo.\*
+* Updated from global requirements
+* Added SSL-related parameters to the client
+* Added ability to pass image\_id for node group
+* Fix output of supported api versions
+* Use requests-mock for mocking
+* Remove cyclic dependency
+* Fix for sahara CLI
+* Enable W292 and E123
+* Move to hacking 0.10
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Workflow documentation is now in infra-manual
+* Update oslo-incubator importutils
+* Update oslo-incubator apiclient.exceptions
+* Update oslo-incubator cliutils
+* Updating oslo-incubator
+* Update oslo-incubator strutils
+* Set default service\_type to "data-processing" in client
+* Added unit tests for python bindings
+
+0.7.6
+-----
+
+* Replacing data\_processing with data-processing
+* Adding support for query filtering to list() calls
+* Fixed old style class declaration
+* Add Support for Keystone V3 CLI
+
+0.7.5
+-----
+
+* Add volume\_type support to node group templates
+* Support Cinder availability zones
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Support Nova availability zones
+* Fix arguments order in assertEqual
+* Use base utils from oslo-incubator instead copy-pasted from nova
+
+0.7.4
+-----
+
+* Updated from global requirements
+
+0.7.3
+-----
+
+* Fixed backward compatibility of sahara client
+
+0.7.2
+-----
+
+* Sync oslo cliutils module
+* Sync oslo apiclient.exceptions module
+* Updated from global requirements
+* Sync oslo strutils module
+* [client] Fixed pep8 and py27 tasks on tox 1.7.2
+* Add warn re sorting requirements
+* Add doc8 tox env
+* Work toward Python 3.4 support and testing
+* Fix duplicate help strings
+
+0.7.1
+-----
+
+* Updated from global requirements
+* Added hadling of non-json response from Sahara
+* Updated from global requirements
+* Updated from global requirements
+* Added support of security groups management
+* Updated from global requirements
+* Updated from global requirements
+* updating link to Sahara docs
+* Add oslo.i18n lib to requirements
+* Update oslo-incubator cliutils module
+* Update oslo-incubator apiclient module
+* Update oslo-incubator strutils module
+* Update oslo-incubator gettextutils module
+* Update oslo-incubator apiclient.exceptions module
+* Remove docutils pin
+* Jar files for pig and mapreduce EDP tests
+* Update code for new hacking/pep8/flake8 global requirements
+* Make Cluster Template accept default\_image\_id field
+* Fixes ambiguous cli output between "None" and NoneType
+* Updated from global requirements
+* Remove vim editor configuration from comments
+* Updated from global requirements
+* Updated from global requirements
+* Don't set json content type for non-json data
+* Updated from global requirements
+* Added new hacking version to requirements
+* Updated from global requirements
+* Remove excutils from openstack-common.conf
+* Updated from global requirements
+* Fix network passing for cluster-template-create
+* removed unused methods from nova.utils
+* Update oslo-incubator cliutils
+* Update oslo-incubator apiclient.exceptions
+* Update oslo-incubator importutils
+* Update oslo-incubator strutils (and gettextutils)
+* Remove timeutils from openstack-common.conf
+* Updated from global requirements
+* use strutils.to\_slug() instead of utils.slugify()
+* replace string format arguments with function parameters
+* Add help string to job-create
+* Updated from global requirements
+* Add EDP jobs to cli integration tests
+* Add cli cluster creation and teardown test
+* Updated from global requirements
+* Updated from global requirements
+* Stub integration tests for vanilla, vanilla2 and hdp plugins
+* Restructure tests directory in preparation for cli integration tests
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+
+0.7.0
+-----
+
+* Remove savanna aliases
+* Add README file
+
+0.6.0
+-----
+
+* Implement "sahara --version"
+* Change internal variables and classes to 'sahara'
+* Change packaging references to python-saharaclient
+* Swap the saharaclient and savannaclient directories
+* Change client doc references to sahara
+* Change the enduser facing apects of the shell
+* Update .gitreview to point on updated repo
+* Make savanna able to be executed/used as sahara
+* Add excutils and timeutils to openstack/common
+* Update oslo-incubator cliutils module
+* Update oslo-incubator apiclient.exceptions modules
+* Add missed PrettyTable requirement
+* Updated from global requirements
+
+0.5.0
+-----
+
+* Args should be passed as a list on job creation
+* Check for presence of 'credentials' before filtering
+* Check for presence of 'extra' before filtering
+* Updated from global requirements
+* Improve help strings
+* Api Exception improvement
+* Update oslo-incubator cliutils module
+* Update oslo-incubator apiclient.exceptions module
+* update oslo-incubator strutils module
+* Update oslo-incubator gettextutils module
+* Update oslo-incubator importutils module
+* Add importutils module
+* Fix typo in doc string
+* Move client docs to the client
+* Add savannaclient/version.py to store version info
+* Make the single entrypoint for client
+* Remove dependent module py3kcompat
+* Removed copy\_if\_defined function from ClusterManager
+* print\_list(): do not call decode() on a text string
+* Some improvements in tox.ini
+* Sync with global requirements
+* Changed base Resource class to prevent changing of passed arguments
+* Add --name option to image unregister & tag cmds
+* Remove job\_exec\_data argument
+* Add --name option to appropriate delete commands
+* Add --name option to appropriate show commands
+* Add space to name for consistency
+* Map neutron\_management\_network to net\_id in CLI
+* Add job-create to CLI
+* Add job-template-create to CLI
+* Fixed issue when savanna url is not provided
+* Update oslo-incubator cliutils module
+* Update oslo-incubator strutils module
+* Make --bypass-url default to env(BYPASS\_URL)
+* Refactor display of a job
+* Updated from global requirements
+* Refactor display of job template
+* Add job-binary-create to CLI
+* Refactor display of a job binary
+* Send credentials only when they are provided
+* Add data-source-create to CLI
+* Refactor display of a single data-source
+* Add job-binary-data-create to CLI
+* Refactor display of job-binary-data elements
+* Add job-delete to CLI
+* Add job-show to CLI
+* Add job-list to CLI
+* Add job-template-delete to CLI
+* Add job-template-show to CLI
+* Add job-template-list to CLI
+* Add job-binary-delete to CLI
+* Add job-binary-show to CLI
+* Add job-binary-list to CLI
+* Add job-binary-data-delete to CLI
+* Add job-binary-data-list to CLI
+* Add data-source-delete to CLI
+* Add data-source-show to CLI
+* Add data-source-list to CLI
+* Fix default service-type name in help
+* Add cluster-create to CLI
+* Add cluster-template-create to CLI
+* Add node-group-template-create to CLI
+* Add --json option to cluster-show
+* Add --json option to cluster-template-show
+* Add --json option to node-group-template-show
+* Refactor display of cluster
+* Refactor display of cluster template
+* Refactor display of node group template
+* Add cluster-template-show command to CLI
+* Add node-group-template-show command to CLI
+* Make plugin commands singular
+* Force wrap line for cluster-show
+* Remove version from setup.cfg
+
+0.4.1
+-----
+
+* JobExecutionsManager.create() should handle input\_id/output\_id == None
+* Clean up versions display in plugins-show
+* Clean up printing of image details
+* Allow passing extra args to JobExecutionsManager.create()
+* Add pretty printing of node group fields
+* Add some pretty printing for list fields
+* Add initial cluster-template-\* commands to CLI
+* Add initial node-group-template-\* commands to CLI
+* Add initial cluster-\* commands to CLI
+* Add initial image-\* commands to CLI
+* Update oslo-incubator apiclient module
+* Update oslo-incubator py3kcompat module
+* Update oslo-incubator gettextutils module
+* Add run\_test.sh for running tests
+* Python 3: use six.iteritems() instead of iteritems()
+* Python3: use six.moves.urllib.parse instead of urlparse
+* Add basic tests for savanna CLI
+* Add initial Savanna CLI
+* Adding the ability to modify node group templates
+* Adding the ability to modify cluster templates
+* Removal of AUTHORS file from repo
+* Removing vim headers from savannaclient
+* Fix call to catalog.get during endpoint discovery
+* Client creation refactoring
+
+0.4.0
+-----
+
+* Enforce keystone service endpoint URL for auth
+* Run tests using testrepository
+* Bump client version to 0.4.0
+* Revert "Support building wheels (PEP-427)"
+* Add unregister\_image(id) call
+* Bump version to 2014.1
+* Support building wheels (PEP-427)
+* Add HACKING.rst with link to the style guidelines
+* Hacking contains all needed requirements
+* Updated from global requirements
+* Adding support for downloading a job binary
+* py33 and pypy added to the envlist
+* Unused pylint requirement removed
+* Sync with global requirements
+
+0.3
+---
+
+* Add lower bound for the six dep
+
+0.3.rc4
+-------
+
+* Fixed UI bug with broken plugins page
+* Added transient field for cluster
+
+0.3.rc3
+-------
+
+* Set upper limit for requests library
+
+0.3.rc2
+-------
+
+* Adding Jeremy Stanley to AUTHORS
+* Remove timeout argument
+* Update .gitreview file following repository move
+* Sync with global requirements
+
+0.3.rc1
+-------
+
+* Support for keystone v3
+* Removed oslo.config and oslo-incubator
+
+0.3a3
+-----
+
+* Fix config handling for Node Group Templates
+
+0.3a2
+-----
+
+* Bump oslo.config to >=1.2.0
+* Fix Node Groups handling on creation
+* Fix job\_binary\_internals creation
+* Fix job\_binary\_internals creation
+* Get job configs call for sync dashboard
+
+0.3a1
+-----
+
+* Sync with dashboard
+* Remove version pbr pins from setup\_requires
+* Sync requiremnts with global requirements
+* Adjusting json resource names
+* Fix to requirements.txt
+* Adjust client to account API changes for EDP
+* Added converting project name to project id
+* Added authentication by tenant name
+* Create methods return object while object creation
+* Added support for Job Binaries and Job Executions API
+* Now create methods return a new object
+* Added API for job, data\_source and job\_origin
+* Update pbr and sync requirements
+* Python Savanna Client initial implementation
+* Added .gitreview
diff -pruN 3.2.1-2/debian/changelog 3.3.0-0ubuntu1/debian/changelog
--- 3.2.1-2/debian/changelog	2020-10-16 15:13:50.000000000 +0000
+++ 3.3.0-0ubuntu1/debian/changelog	2020-12-03 15:00:30.000000000 +0000
@@ -1,101 +1,88 @@
-python-saharaclient (3.2.1-2) unstable; urgency=medium
+python-saharaclient (3.3.0-0ubuntu1) hirsute; urgency=medium
 
-  * Uploading to unstable.
-  * Fixed debian/watch.
-  * Add a debian/salsa-ci.yml.
+  * d/control: Update VCS paths for move to lp:~ubuntu-openstack-dev.
+  * New upstream release for OpenStack Wallaby.
 
- -- Thomas Goirand <zigo@debian.org>  Fri, 16 Oct 2020 17:13:50 +0200
+ -- Chris MacNaughton <chris.macnaughton@ubuntu.com>  Thu, 03 Dec 2020 15:00:30 +0000
 
-python-saharaclient (3.2.1-1) experimental; urgency=medium
+python-saharaclient (3.2.1-0ubuntu1) groovy; urgency=medium
 
-  * New upstream release.
-  * Removed python3-babel from build-depends.
+  * New upstream release for OpenStack Victoria.
 
- -- Thomas Goirand <zigo@debian.org>  Mon, 14 Sep 2020 22:39:24 +0200
+ -- Corey Bryant <corey.bryant@canonical.com>  Fri, 18 Sep 2020 12:37:35 -0400
 
-python-saharaclient (3.2.0-1) experimental; urgency=medium
+python-saharaclient (3.2.0-0ubuntu1) groovy; urgency=medium
 
-  * New upstream release.
-  * Removed python3-mock from build-depends.
+  * New upstream release for OpenStack Victoria.
+  * d/control: Align (Build-)Depends with upstream.
 
- -- Thomas Goirand <zigo@debian.org>  Thu, 10 Sep 2020 12:24:06 +0200
+ -- Chris MacNaughton <chris.macnaughton@canonical.com>  Wed, 29 Jul 2020 14:12:48 +0000
 
-python-saharaclient (3.1.0-2) unstable; urgency=medium
+python-saharaclient (3.1.0-0ubuntu1) focal; urgency=medium
 
-  * Uploading to unstable.
+  * New upstream release for OpenStack Ussuri.
+  * d/control: Align (Build-)Depends with upstream.
+  * d/rules: Switch to pybuild.
 
- -- Thomas Goirand <zigo@debian.org>  Fri, 08 May 2020 23:34:58 +0200
+ -- Corey Bryant <corey.bryant@canonical.com>  Fri, 10 Apr 2020 10:04:49 -0400
 
-python-saharaclient (3.1.0-1) experimental; urgency=medium
+python-saharaclient (3.0.0-0ubuntu1) focal; urgency=medium
 
-  * New upstream release.
+  * New upstream release for OpenStack Ussuri.
 
- -- Thomas Goirand <zigo@debian.org>  Thu, 09 Apr 2020 21:21:52 +0200
+ -- Corey Bryant <corey.bryant@canonical.com>  Wed, 11 Mar 2020 16:35:26 -0400
 
-python-saharaclient (2.3.0-2) unstable; urgency=medium
+python-saharaclient (2.3.0-0ubuntu1) eoan; urgency=medium
 
-  [ Ondřej Nový ]
-  * Bump Standards-Version to 4.4.1.
+  * New upstream release for OpenStack Train.
 
-  [ Thomas Goirand ]
-  * Uploading to unstable.
+ -- James Page <james.page@ubuntu.com>  Thu, 26 Sep 2019 10:38:05 +0100
 
- -- Thomas Goirand <zigo@debian.org>  Mon, 21 Oct 2019 01:46:37 +0200
+python-saharaclient (2.2.1-0ubuntu1) eoan; urgency=medium
 
-python-saharaclient (2.3.0-1) experimental; urgency=medium
+  * New upstream release for OpenStack Train.
 
-  [ Ondřej Nový ]
-  * Running wrap-and-sort -bast.
-  * Use debhelper-compat instead of debian/compat.
-  * Bump Standards-Version to 4.4.0.
+ -- Corey Bryant <corey.bryant@canonical.com>  Tue, 30 Jul 2019 15:51:30 -0400
 
-  [ Thomas Goirand ]
-  * New upstream release.
-
- -- Thomas Goirand <zigo@debian.org>  Tue, 17 Sep 2019 09:15:45 +0200
-
-python-saharaclient (2.2.0-2) unstable; urgency=medium
-
-  * Uploading to unstable.
+python-saharaclient (2.2.0-0ubuntu2) eoan; urgency=medium
 
- -- Thomas Goirand <zigo@debian.org>  Wed, 17 Jul 2019 14:27:08 +0200
+  * d/control: Drop BDI's on python-* packages.
+  * d/control: Drop python-saharaclient binary package.
+  * d/rules: Tweak to stop build and install of Python 2 parts.
 
-python-saharaclient (2.2.0-1) experimental; urgency=medium
+ -- Sahid Orentino Ferdjaoui <sahid.ferdjaoui@canonical.com>  Thu, 11 Jul 2019 14:28:51 +0200
 
-  [ Ondřej Nový ]
-  * Use 'python3 -m sphinx' instead of sphinx-build for building docs
+python-saharaclient (2.2.0-0ubuntu1) disco; urgency=medium
 
-  [ Thomas Goirand ]
-  * New upstream release.
-  * Removed Python 2 support.
+  * New upstream release for OpenStack Stein.
 
- -- Thomas Goirand <zigo@debian.org>  Sat, 23 Mar 2019 22:21:36 +0100
+ -- Corey Bryant <corey.bryant@canonical.com>  Wed, 13 Mar 2019 14:37:40 -0400
 
-python-saharaclient (2.0.0-2.1) unstable; urgency=medium
+python-saharaclient (2.1.0-0ubuntu1) disco; urgency=medium
 
-  * Non-maintainer upload.
-  * Remove obsolete alternatives on upgrade.  (Closes: #910224)
+  * New upstream release for OpenStack Stein.
+  * d/control: Align (Build-)Depends with upstream.
 
- -- Andreas Beckmann <anbe@debian.org>  Mon, 11 Mar 2019 12:08:08 +0100
+ -- Corey Bryant <corey.bryant@canonical.com>  Wed, 30 Jan 2019 10:16:12 -0500
 
-python-saharaclient (2.0.0-2) unstable; urgency=medium
+python-saharaclient (2.0.0-0ubuntu1) cosmic; urgency=medium
 
-  * Uploading to unstable.
+  * New upstream release for OpenStack Rocky.
+  * d/control: Align (Build-)Depends with upstream.
+  * d/p/fix-sphinx-Directive-import.patch: Dropped. Fixed in upstream release.
 
- -- Thomas Goirand <zigo@debian.org>  Tue, 04 Sep 2018 22:45:05 +0200
+ -- Corey Bryant <corey.bryant@canonical.com>  Fri, 03 Aug 2018 11:33:16 -0400
 
-python-saharaclient (2.0.0-1) experimental; urgency=medium
+python-saharaclient (1.6.0-0ubuntu1) cosmic; urgency=low
 
-  [ Ondřej Nový ]
-  * d/control: Use team+openstack@tracker.debian.org as maintainer
-
-  [ Thomas Goirand ]
+  * Merge from Debian unstable.  Remaining changes:
+    - d/gbp.conf: Retain for gbp and pristine-tar config.
+    - d/control: Enable autopkgtest-pkg-python testsuite.
+    - d/watch: Get tarball from tarballs.openstack.org.
   * New upstream release.
-  * Fixed (build-)depends for this release.
-  * Building sphinx doc with Python 3.
-  * Removed fix-sphinx-Directive-import.patch applied upstream.
+  * d/control: Align (Build-)Depends with upstream.
 
- -- Thomas Goirand <zigo@debian.org>  Wed, 22 Aug 2018 13:34:53 +0200
+ -- Corey Bryant <corey.bryant@canonical.com>  Tue, 12 Jun 2018 14:52:29 -0400
 
 python-saharaclient (1.5.0-4) unstable; urgency=medium
 
@@ -130,6 +117,25 @@ python-saharaclient (1.5.0-1) experiment
 
  -- Thomas Goirand <zigo@debian.org>  Tue, 13 Feb 2018 21:32:30 +0000
 
+python-saharaclient (1.5.0-0ubuntu1) bionic; urgency=medium
+
+  * New upstream release.
+  * d/control: Bump debhelper compat to 10.
+  * d/p/drop-openstackdoctheme.patch: Dropped. No longer needed.
+  * d/control: Align (Build-)Depends with upstream.
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Tue, 13 Feb 2018 08:41:24 -0500
+
+python-saharaclient (1.4.0-0ubuntu1) bionic; urgency=medium
+
+  * New upstream release.
+  * d/control: Align (Build-)Depends with upstream.
+  * d/*: wrap-and-sort -bast.
+  * d/control: Update Standards-Version to 4.1.2.
+  * d/control: Switch to stestr for running tests.
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Fri, 08 Dec 2017 13:45:48 -0500
+
 python-saharaclient (1.3.0-4) unstable; urgency=medium
 
   * Add missing build-depends on python3-hacking (Closes: #880860).
@@ -177,6 +183,115 @@ python-saharaclient (1.3.0-1) experiment
 
  -- Thomas Goirand <zigo@debian.org>  Tue, 03 Oct 2017 23:24:44 +0200
 
+python-saharaclient (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.
+  * d/control: Add python(3)-pep8 to BDs.
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Tue, 15 Aug 2017 14:13:27 -0400
+
+python-saharaclient (1.2.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:23:34 +0100
+
+python-saharaclient (1.1.0-0ubuntu2) zesty; urgency=medium
+
+  * debian/control: Clean up dependencies. 
+
+ -- Chuck Short <zulcss@ubuntu.com>  Sat, 04 Feb 2017 08:34:32 -0500
+
+python-saharaclient (1.1.0-0ubuntu1) zesty; urgency=medium
+
+  * New upstream release. 
+  * debian/control: Bump dependencies.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Tue, 24 Jan 2017 08:37:09 -0500
+
+python-saharaclient (1.0.0-0ubuntu2) zesty; urgency=medium
+
+  * Remove prerm/postinst/postrm since no binaries are installed. 
+
+ -- Chuck Short <zulcss@ubuntu.com>  Thu, 10 Nov 2016 08:40:28 -0500
+
+python-saharaclient (1.0.0-0ubuntu1) 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/changelog: Bump version dependencies.
+  * debian/patches/drop-doc-conf-git.patch: Dropped, emits a warning
+    if the git command is not run.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Wed, 09 Nov 2016 14:28:43 -0500
+
+python-saharaclient (0.18.0-0ubuntu1) yakkety; urgency=medium
+
+  * New upstream release.
+  * d/control: Align (Build-)Depends with upstream.
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Thu, 01 Sep 2016 11:31:52 -0400
+
+python-saharaclient (0.15.0-1) experimental; urgency=medium
+
+  [ Ivan Udovichenko ]
+  * d/*.postinst,*.postrm,*.prerm: Update alternatives of saharaclient binaries.
+
+  [ Thomas Goirand ]
+  * New upstream release.
+  * Fixed (build-)depends for this release.
+  * Using pkgos-dh_auto_{test,install} from openstack-pkg-tools >= 52~.
+  * Removed remove-failing-unit-discovery.patch.
+  * Standards-Version is now 3.9.8.
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 13 Jul 2016 10:31:48 +0200
+
+python-saharaclient (0.14.0-2) unstable; urgency=medium
+
+  * Uploading to unstable.
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 04 Apr 2016 12:43:42 +0000
+
+python-saharaclient (0.14.0-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Thomas Goirand <zigo@debian.org>  Sat, 02 Apr 2016 15:26:29 +0200
+
+python-saharaclient (0.13.0-2) experimental; urgency=medium
+
+  * Downgrade openstackclient (build-)depends to 2.0.0 to avoid dependency
+    loop.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 03 Mar 2016 04:32:51 +0000
+
+python-saharaclient (0.13.0-1) experimental; urgency=medium
+
+  [ Corey Bryant ]
+  * New upstream release.
+  * d/control: Align (Build-)Depends with upstream.
+  * d/control: Add python-sphinx-argparse to Build-Depends.
+  * d/control, d/rules: Add Python3 support.
+  * d/p/drop-doc-conf-git.patch: Drop git from sphinx config file
+    file as git repository is not avialable during package builds.
+
+  [ Thomas Goirand ]
+  * Standards-Version: 3.9.7 (no change).
+  * HTTPS VCS URLs.
+  * Fixed debian/copyright ordering.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 03 Mar 2016 04:23:38 +0000
+
 python-saharaclient (0.11.1-3) unstable; urgency=medium
 
   * Removed files failing unit test discovery with newer novaclient:
@@ -245,3 +360,4 @@ python-saharaclient (0.6.0-1) experiment
   * Initial release (Closes: #742478).
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 24 Mar 2014 14:58:19 +0800
+
diff -pruN 3.2.1-2/debian/compat 3.3.0-0ubuntu1/debian/compat
--- 3.2.1-2/debian/compat	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/debian/compat	2020-12-03 15:00:30.000000000 +0000
@@ -0,0 +1 @@
+10
diff -pruN 3.2.1-2/debian/control 3.3.0-0ubuntu1/debian/control
--- 3.2.1-2/debian/control	2020-10-16 15:13:50.000000000 +0000
+++ 3.3.0-0ubuntu1/debian/control	2020-12-03 15:00:30.000000000 +0000
@@ -1,40 +1,47 @@
 Source: python-saharaclient
 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>,
  Corey Bryant <corey.bryant@canonical.com>,
 Build-Depends:
- debhelper-compat (= 10),
+ debhelper (>= 10),
  dh-python,
- openstack-pkg-tools,
+ openstack-pkg-tools (>= 66~),
  python3-all,
- python3-pbr,
+ python3-pbr (>= 2.0.0),
  python3-setuptools,
- python3-sphinx <!nodoc>,
+ python3-sphinx (>= 2.0.0),
 Build-Depends-Indep:
- python3-coverage,
- python3-hacking,
- python3-keystoneauth1,
- python3-openstackclient,
- python3-openstackdocstheme <!nodoc>,
- python3-osc-lib,
- python3-oslo.i18n,
- python3-oslo.log,
- python3-oslo.serialization,
- python3-oslo.utils,
- python3-oslotest,
+ python3-babel (>= 2.3.4),
+ python3-coverage (>= 4.0),
+ python3-hacking (>= 1.1.0),
+ python3-keystoneauth1 (>= 3.4.0),
+ python3-mock (>= 2.0.0),
+ python3-openstackclient (>= 5.2.0),
+ python3-openstackdocstheme (>= 2.2.1),
+ python3-os-testr (>= 1.0.0),
+ python3-osc-lib (>= 2.0.0),
+ python3-oslo.i18n (>= 3.15.3),
+ python3-oslo.log (>= 3.36.0),
+ python3-oslo.serialization (>= 2.18.0),
+ python3-oslo.utils (>= 3.33.0),
+ python3-oslotest (>= 1:3.2.0),
+ python3-stestr (>= 1.0.0),
  python3-pep8,
- python3-requests,
- python3-requests-mock,
- python3-six,
- python3-stestr,
- subunit,
-Standards-Version: 4.4.1
-Vcs-Browser: https://salsa.debian.org/openstack-team/clients/python-saharaclient
-Vcs-Git: https://salsa.debian.org/openstack-team/clients/python-saharaclient.git
+ python3-reno (>= 2.11.2),
+ python3-requests (>= 2.14.2),
+ python3-requests-mock (>= 1.2.0),
+ python3-six (>= 1.10.0),
+ python3-subunit,
+ python3-testrepository (>= 0.0.18),
+Standards-Version: 4.1.3
+Vcs-Browser: https://git.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/python-saharaclient
+Vcs-Git: https://git.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/python-saharaclient
 Homepage: https://github.com/openstack/python-saharaclient
+Testsuite: autopkgtest-pkg-python
 
 Package: python-saharaclient-doc
 Build-Profiles: <!nodoc>
@@ -56,16 +63,17 @@ Description: Client library for Openstac
 Package: python3-saharaclient
 Architecture: all
 Depends:
- python3-keystoneauth1,
- python3-openstackclient,
- python3-osc-lib,
- python3-oslo.i18n,
- python3-oslo.log,
- python3-oslo.serialization,
- python3-oslo.utils,
- python3-pbr,
- python3-requests,
- python3-six,
+ python3-babel (>= 2.3.4),
+ python3-keystoneauth1 (>= 3.4.0),
+ python3-openstackclient (>= 5.2.0),
+ python3-osc-lib (>= 2.0.0),
+ python3-oslo.i18n (>= 3.15.3),
+ python3-oslo.log (>= 3.36.0),
+ python3-oslo.serialization (>= 2.18.0),
+ python3-oslo.utils (>= 3.33.0),
+ python3-pbr (>= 2.0.0),
+ python3-requests (>= 2.14.2),
+ python3-six (>= 1.10.0),
  ${misc:Depends},
  ${python3:Depends},
 Description: Client library for Openstack Sahara API server - Python 3.x module
diff -pruN 3.2.1-2/debian/gbp.conf 3.3.0-0ubuntu1/debian/gbp.conf
--- 3.2.1-2/debian/gbp.conf	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/debian/gbp.conf	2020-12-03 15:00:30.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.1-2/debian/rules 3.3.0-0ubuntu1/debian/rules
--- 3.2.1-2/debian/rules	2020-10-16 15:13:50.000000000 +0000
+++ 3.3.0-0ubuntu1/debian/rules	2020-12-03 15:00:30.000000000 +0000
@@ -1,15 +1,11 @@
 #!/usr/bin/make -f
 
+export PYBUILD_NAME=python-saharaclient
+
 include /usr/share/openstack-pkg-tools/pkgos.make
 
 %:
-	dh $@ --buildsystem=python_distutils --with python3,sphinxdoc
-
-override_dh_auto_clean:
-	rm -rf doc/build
-
-override_dh_auto_build:
-	echo "Do nothing..."
+	dh $@ --buildsystem=pybuild --with python3,sphinxdoc
 
 override_dh_auto_install:
 	pkgos-dh_auto_install --no-py2
@@ -20,14 +16,28 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD
 endif
 
 override_dh_installman:
-ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
-	PYTHONPATH=. python3 -m sphinx -b man doc/source doc/build/man
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+	PYTHONPATH=. sphinx-build -b man doc/source doc/build/man
 	cp doc/build/man/saharaclient.1 doc/build/man/sahara.1
-	dh_installman -O--buildsystem=python_distutils
+	dh_installman -O--buildsystem=pybuild
 endif
 
 override_dh_sphinxdoc:
 ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
-	PYTHONPATH=. python3 -m sphinx -b html doc/source $(CURDIR)/debian/python-saharaclient-doc/usr/share/doc/python-saharaclient-doc/html
-	dh_sphinxdoc -O--buildsystem=python_distutils
+	PYTHONPATH=. sphinx-build -b html doc/source $(CURDIR)/debian/python-saharaclient-doc/usr/share/doc/python-saharaclient-doc/html
+	dh_sphinxdoc -O--buildsystem=pybuild
 endif
+
+override_dh_clean:
+	dh_clean -O--buildsystem=pybuild
+	rm -rf doc/build
+
+# 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:
diff -pruN 3.2.1-2/debian/salsa-ci.yml 3.3.0-0ubuntu1/debian/salsa-ci.yml
--- 3.2.1-2/debian/salsa-ci.yml	2020-10-16 15:13:50.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.1-2/debian/watch 3.3.0-0ubuntu1/debian/watch
--- 3.2.1-2/debian/watch	2020-10-16 15:13:50.000000000 +0000
+++ 3.3.0-0ubuntu1/debian/watch	2020-12-03 15:00:30.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-saharaclient/tags .*/(\d[brc\d\.]+)\.tar\.gz
+opts="uversionmangle=s/\.(b|rc)/~$1/" \
+    http://tarballs.openstack.org/python-saharaclient/ python-saharaclient-(\d.*)\.tar\.gz
diff -pruN 3.2.1-2/.gitignore 3.3.0-0ubuntu1/.gitignore
--- 3.2.1-2/.gitignore	2020-09-08 15:19:05.000000000 +0000
+++ 3.3.0-0ubuntu1/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-*.py[co]
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-var
-sdist
-develop-eggs
-.installed.cfg
-pip-log.txt
-.tox
-*.mo
-.mr.developer.cfg
-.DS_Store
-Thumbs.db
-.venv
-.idea
-.stestr
-out
-target
-*.iml
-*.ipr
-*.iws
-*.db
-.coverage
-nosetests.xml
-pylint-report.txt
-ChangeLog
-cscope.out
-.testrepository
-AUTHORS
-cover
-doc/html
-doc/source/apidoc
-doc/build
-*.log
-# Files created by releasenotes build
-releasenotes/build
diff -pruN 3.2.1-2/.gitreview 3.3.0-0ubuntu1/.gitreview
--- 3.2.1-2/.gitreview	2020-09-08 15:19:05.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-saharaclient.git
diff -pruN 3.2.1-2/PKG-INFO 3.3.0-0ubuntu1/PKG-INFO
--- 3.2.1-2/PKG-INFO	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/PKG-INFO	2020-12-02 10:40:11.066988200 +0000
@@ -0,0 +1,68 @@
+Metadata-Version: 1.2
+Name: python-saharaclient
+Version: 3.3.0
+Summary: Client library for Sahara API
+Home-page: https://docs.openstack.org/python-saharaclient/latest/
+Author: OpenStack
+Author-email: openstack-discuss@lists.openstack.org
+License: Apache License, Version 2.0
+Description: ========================
+        Team and repository tags
+        ========================
+        
+        .. image:: https://governance.openstack.org/tc/badges/python-saharaclient.svg
+            :target: https://governance.openstack.org/tc/reference/tags/index.html
+        
+        .. Change things from this point on
+        
+        Python bindings to the OpenStack Sahara API
+        ===========================================
+        
+        .. image:: https://img.shields.io/pypi/v/python-saharaclient.svg
+            :target: https://pypi.org/project/python-saharaclient/
+            :alt: Latest Version
+        
+        This is a client for the OpenStack Sahara API. There's a Python API (the
+        ``saharaclient`` module), and a command-line script (``sahara``). Each
+        implements the OpenStack Sahara API. You can find documentation for both
+        Python bindings and CLI in `Docs`_.
+        
+        Development takes place via the usual OpenStack processes as outlined
+        in the `developer guide
+        <https://docs.openstack.org/infra/manual/developers.html>`_.
+        
+        .. _Docs: https://docs.openstack.org/python-saharaclient/latest/
+        
+        * License: Apache License, Version 2.0
+        * `PyPi`_ - package installation
+        * `Online Documentation`_
+        * `Blueprints`_ - feature specifications
+        * `Bugs`_ - stories and issue tracking
+        * `Source`_
+        * `Specs`_
+        * `How to Contribute`_
+        
+        .. _PyPi: https://pypi.org/project/python-saharaclient
+        .. _Online Documentation: https://docs.openstack.org/python-saharaclient/latest/
+        .. _Blueprints: http://specs.openstack.org/openstack/sahara-specs/
+        .. _Bugs: https://storyboard.openstack.org/#!/project/934
+        .. _Source: https://opendev.org/openstack/python-saharaclient
+        .. _How to Contribute: https://docs.openstack.org/infra/manual/developers.html
+        .. _Specs: https://specs.openstack.org/openstack/sahara-specs/
+        .. _Release Notes: https://docs.openstack.org/releasenotes/python-saharaclient
+        
+        
+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 3.2.1-2/python_saharaclient.egg-info/dependency_links.txt 3.3.0-0ubuntu1/python_saharaclient.egg-info/dependency_links.txt
--- 3.2.1-2/python_saharaclient.egg-info/dependency_links.txt	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/python_saharaclient.egg-info/dependency_links.txt	2020-12-02 10:40:10.000000000 +0000
@@ -0,0 +1 @@
+
diff -pruN 3.2.1-2/python_saharaclient.egg-info/entry_points.txt 3.3.0-0ubuntu1/python_saharaclient.egg-info/entry_points.txt
--- 3.2.1-2/python_saharaclient.egg-info/entry_points.txt	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/python_saharaclient.egg-info/entry_points.txt	2020-12-02 10:40:10.000000000 +0000
@@ -0,0 +1,118 @@
+[openstack.cli.extension]
+data_processing = saharaclient.osc.plugin
+
+[openstack.data_processing.v1]
+dataprocessing_cluster_create = saharaclient.osc.v1.clusters:CreateCluster
+dataprocessing_cluster_delete = saharaclient.osc.v1.clusters:DeleteCluster
+dataprocessing_cluster_list = saharaclient.osc.v1.clusters:ListClusters
+dataprocessing_cluster_scale = saharaclient.osc.v1.clusters:ScaleCluster
+dataprocessing_cluster_show = saharaclient.osc.v1.clusters:ShowCluster
+dataprocessing_cluster_template_create = saharaclient.osc.v1.cluster_templates:CreateClusterTemplate
+dataprocessing_cluster_template_delete = saharaclient.osc.v1.cluster_templates:DeleteClusterTemplate
+dataprocessing_cluster_template_export = saharaclient.osc.v1.cluster_templates:ExportClusterTemplate
+dataprocessing_cluster_template_import = saharaclient.osc.v1.cluster_templates:ImportClusterTemplate
+dataprocessing_cluster_template_list = saharaclient.osc.v1.cluster_templates:ListClusterTemplates
+dataprocessing_cluster_template_show = saharaclient.osc.v1.cluster_templates:ShowClusterTemplate
+dataprocessing_cluster_template_update = saharaclient.osc.v1.cluster_templates:UpdateClusterTemplate
+dataprocessing_cluster_update = saharaclient.osc.v1.clusters:UpdateCluster
+dataprocessing_cluster_verification = saharaclient.osc.v1.clusters:VerificationUpdateCluster
+dataprocessing_data_source_create = saharaclient.osc.v1.data_sources:CreateDataSource
+dataprocessing_data_source_delete = saharaclient.osc.v1.data_sources:DeleteDataSource
+dataprocessing_data_source_list = saharaclient.osc.v1.data_sources:ListDataSources
+dataprocessing_data_source_show = saharaclient.osc.v1.data_sources:ShowDataSource
+dataprocessing_data_source_update = saharaclient.osc.v1.data_sources:UpdateDataSource
+dataprocessing_image_list = saharaclient.osc.v1.images:ListImages
+dataprocessing_image_register = saharaclient.osc.v1.images:RegisterImage
+dataprocessing_image_show = saharaclient.osc.v1.images:ShowImage
+dataprocessing_image_tags_add = saharaclient.osc.v1.images:AddImageTags
+dataprocessing_image_tags_remove = saharaclient.osc.v1.images:RemoveImageTags
+dataprocessing_image_tags_set = saharaclient.osc.v1.images:SetImageTags
+dataprocessing_image_unregister = saharaclient.osc.v1.images:UnregisterImage
+dataprocessing_job_binary_create = saharaclient.osc.v1.job_binaries:CreateJobBinary
+dataprocessing_job_binary_delete = saharaclient.osc.v1.job_binaries:DeleteJobBinary
+dataprocessing_job_binary_download = saharaclient.osc.v1.job_binaries:DownloadJobBinary
+dataprocessing_job_binary_list = saharaclient.osc.v1.job_binaries:ListJobBinaries
+dataprocessing_job_binary_show = saharaclient.osc.v1.job_binaries:ShowJobBinary
+dataprocessing_job_binary_update = saharaclient.osc.v1.job_binaries:UpdateJobBinary
+dataprocessing_job_delete = saharaclient.osc.v1.jobs:DeleteJob
+dataprocessing_job_execute = saharaclient.osc.v1.jobs:ExecuteJob
+dataprocessing_job_list = saharaclient.osc.v1.jobs:ListJobs
+dataprocessing_job_show = saharaclient.osc.v1.jobs:ShowJob
+dataprocessing_job_template_create = saharaclient.osc.v1.job_templates:CreateJobTemplate
+dataprocessing_job_template_delete = saharaclient.osc.v1.job_templates:DeleteJobTemplate
+dataprocessing_job_template_list = saharaclient.osc.v1.job_templates:ListJobTemplates
+dataprocessing_job_template_show = saharaclient.osc.v1.job_templates:ShowJobTemplate
+dataprocessing_job_template_update = saharaclient.osc.v1.job_templates:UpdateJobTemplate
+dataprocessing_job_type_configs_get = saharaclient.osc.v1.job_types:GetJobTypeConfigs
+dataprocessing_job_type_list = saharaclient.osc.v1.job_types:ListJobTypes
+dataprocessing_job_update = saharaclient.osc.v1.jobs:UpdateJob
+dataprocessing_node_group_template_create = saharaclient.osc.v1.node_group_templates:CreateNodeGroupTemplate
+dataprocessing_node_group_template_delete = saharaclient.osc.v1.node_group_templates:DeleteNodeGroupTemplate
+dataprocessing_node_group_template_export = saharaclient.osc.v1.node_group_templates:ExportNodeGroupTemplate
+dataprocessing_node_group_template_import = saharaclient.osc.v1.node_group_templates:ImportNodeGroupTemplate
+dataprocessing_node_group_template_list = saharaclient.osc.v1.node_group_templates:ListNodeGroupTemplates
+dataprocessing_node_group_template_show = saharaclient.osc.v1.node_group_templates:ShowNodeGroupTemplate
+dataprocessing_node_group_template_update = saharaclient.osc.v1.node_group_templates:UpdateNodeGroupTemplate
+dataprocessing_plugin_configs_get = saharaclient.osc.v1.plugins:GetPluginConfigs
+dataprocessing_plugin_list = saharaclient.osc.v1.plugins:ListPlugins
+dataprocessing_plugin_show = saharaclient.osc.v1.plugins:ShowPlugin
+dataprocessing_plugin_update = saharaclient.osc.v1.plugins:UpdatePlugin
+
+[openstack.data_processing.v2]
+dataprocessing_cluster_create = saharaclient.osc.v2.clusters:CreateCluster
+dataprocessing_cluster_delete = saharaclient.osc.v2.clusters:DeleteCluster
+dataprocessing_cluster_list = saharaclient.osc.v2.clusters:ListClusters
+dataprocessing_cluster_scale = saharaclient.osc.v2.clusters:ScaleCluster
+dataprocessing_cluster_show = saharaclient.osc.v2.clusters:ShowCluster
+dataprocessing_cluster_template_create = saharaclient.osc.v2.cluster_templates:CreateClusterTemplate
+dataprocessing_cluster_template_delete = saharaclient.osc.v2.cluster_templates:DeleteClusterTemplate
+dataprocessing_cluster_template_export = saharaclient.osc.v2.cluster_templates:ExportClusterTemplate
+dataprocessing_cluster_template_import = saharaclient.osc.v2.cluster_templates:ImportClusterTemplate
+dataprocessing_cluster_template_list = saharaclient.osc.v2.cluster_templates:ListClusterTemplates
+dataprocessing_cluster_template_show = saharaclient.osc.v2.cluster_templates:ShowClusterTemplate
+dataprocessing_cluster_template_update = saharaclient.osc.v2.cluster_templates:UpdateClusterTemplate
+dataprocessing_cluster_update = saharaclient.osc.v2.clusters:UpdateCluster
+dataprocessing_cluster_update_keypair = saharaclient.osc.v2.clusters:UpdateKeypairCluster
+dataprocessing_cluster_verification = saharaclient.osc.v2.clusters:VerificationUpdateCluster
+dataprocessing_data_source_create = saharaclient.osc.v2.data_sources:CreateDataSource
+dataprocessing_data_source_delete = saharaclient.osc.v2.data_sources:DeleteDataSource
+dataprocessing_data_source_list = saharaclient.osc.v2.data_sources:ListDataSources
+dataprocessing_data_source_show = saharaclient.osc.v2.data_sources:ShowDataSource
+dataprocessing_data_source_update = saharaclient.osc.v2.data_sources:UpdateDataSource
+dataprocessing_image_list = saharaclient.osc.v2.images:ListImages
+dataprocessing_image_register = saharaclient.osc.v2.images:RegisterImage
+dataprocessing_image_show = saharaclient.osc.v2.images:ShowImage
+dataprocessing_image_tags_add = saharaclient.osc.v2.images:AddImageTags
+dataprocessing_image_tags_remove = saharaclient.osc.v2.images:RemoveImageTags
+dataprocessing_image_tags_set = saharaclient.osc.v2.images:SetImageTags
+dataprocessing_image_unregister = saharaclient.osc.v2.images:UnregisterImage
+dataprocessing_job_binary_create = saharaclient.osc.v2.job_binaries:CreateJobBinary
+dataprocessing_job_binary_delete = saharaclient.osc.v2.job_binaries:DeleteJobBinary
+dataprocessing_job_binary_download = saharaclient.osc.v2.job_binaries:DownloadJobBinary
+dataprocessing_job_binary_list = saharaclient.osc.v2.job_binaries:ListJobBinaries
+dataprocessing_job_binary_show = saharaclient.osc.v2.job_binaries:ShowJobBinary
+dataprocessing_job_binary_update = saharaclient.osc.v2.job_binaries:UpdateJobBinary
+dataprocessing_job_delete = saharaclient.osc.v2.jobs:DeleteJob
+dataprocessing_job_execute = saharaclient.osc.v2.jobs:ExecuteJob
+dataprocessing_job_list = saharaclient.osc.v2.jobs:ListJobs
+dataprocessing_job_show = saharaclient.osc.v2.jobs:ShowJob
+dataprocessing_job_template_create = saharaclient.osc.v2.job_templates:CreateJobTemplate
+dataprocessing_job_template_delete = saharaclient.osc.v2.job_templates:DeleteJobTemplate
+dataprocessing_job_template_list = saharaclient.osc.v2.job_templates:ListJobTemplates
+dataprocessing_job_template_show = saharaclient.osc.v2.job_templates:ShowJobTemplate
+dataprocessing_job_template_update = saharaclient.osc.v2.job_templates:UpdateJobTemplate
+dataprocessing_job_type_configs_get = saharaclient.osc.v2.job_types:GetJobTypeConfigs
+dataprocessing_job_type_list = saharaclient.osc.v2.job_types:ListJobTypes
+dataprocessing_job_update = saharaclient.osc.v2.jobs:UpdateJob
+dataprocessing_node_group_template_create = saharaclient.osc.v2.node_group_templates:CreateNodeGroupTemplate
+dataprocessing_node_group_template_delete = saharaclient.osc.v2.node_group_templates:DeleteNodeGroupTemplate
+dataprocessing_node_group_template_export = saharaclient.osc.v2.node_group_templates:ExportNodeGroupTemplate
+dataprocessing_node_group_template_import = saharaclient.osc.v2.node_group_templates:ImportNodeGroupTemplate
+dataprocessing_node_group_template_list = saharaclient.osc.v2.node_group_templates:ListNodeGroupTemplates
+dataprocessing_node_group_template_show = saharaclient.osc.v2.node_group_templates:ShowNodeGroupTemplate
+dataprocessing_node_group_template_update = saharaclient.osc.v2.node_group_templates:UpdateNodeGroupTemplate
+dataprocessing_plugin_configs_get = saharaclient.osc.v2.plugins:GetPluginConfigs
+dataprocessing_plugin_list = saharaclient.osc.v2.plugins:ListPlugins
+dataprocessing_plugin_show = saharaclient.osc.v2.plugins:ShowPlugin
+dataprocessing_plugin_update = saharaclient.osc.v2.plugins:UpdatePlugin
+
diff -pruN 3.2.1-2/python_saharaclient.egg-info/not-zip-safe 3.3.0-0ubuntu1/python_saharaclient.egg-info/not-zip-safe
--- 3.2.1-2/python_saharaclient.egg-info/not-zip-safe	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/python_saharaclient.egg-info/not-zip-safe	2020-12-02 10:40:10.000000000 +0000
@@ -0,0 +1 @@
+
diff -pruN 3.2.1-2/python_saharaclient.egg-info/pbr.json 3.3.0-0ubuntu1/python_saharaclient.egg-info/pbr.json
--- 3.2.1-2/python_saharaclient.egg-info/pbr.json	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/python_saharaclient.egg-info/pbr.json	2020-12-02 10:40:10.000000000 +0000
@@ -0,0 +1 @@
+{"git_version": "401e663", "is_release": true}
\ No newline at end of file
diff -pruN 3.2.1-2/python_saharaclient.egg-info/PKG-INFO 3.3.0-0ubuntu1/python_saharaclient.egg-info/PKG-INFO
--- 3.2.1-2/python_saharaclient.egg-info/PKG-INFO	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/python_saharaclient.egg-info/PKG-INFO	2020-12-02 10:40:10.000000000 +0000
@@ -0,0 +1,68 @@
+Metadata-Version: 1.2
+Name: python-saharaclient
+Version: 3.3.0
+Summary: Client library for Sahara API
+Home-page: https://docs.openstack.org/python-saharaclient/latest/
+Author: OpenStack
+Author-email: openstack-discuss@lists.openstack.org
+License: Apache License, Version 2.0
+Description: ========================
+        Team and repository tags
+        ========================
+        
+        .. image:: https://governance.openstack.org/tc/badges/python-saharaclient.svg
+            :target: https://governance.openstack.org/tc/reference/tags/index.html
+        
+        .. Change things from this point on
+        
+        Python bindings to the OpenStack Sahara API
+        ===========================================
+        
+        .. image:: https://img.shields.io/pypi/v/python-saharaclient.svg
+            :target: https://pypi.org/project/python-saharaclient/
+            :alt: Latest Version
+        
+        This is a client for the OpenStack Sahara API. There's a Python API (the
+        ``saharaclient`` module), and a command-line script (``sahara``). Each
+        implements the OpenStack Sahara API. You can find documentation for both
+        Python bindings and CLI in `Docs`_.
+        
+        Development takes place via the usual OpenStack processes as outlined
+        in the `developer guide
+        <https://docs.openstack.org/infra/manual/developers.html>`_.
+        
+        .. _Docs: https://docs.openstack.org/python-saharaclient/latest/
+        
+        * License: Apache License, Version 2.0
+        * `PyPi`_ - package installation
+        * `Online Documentation`_
+        * `Blueprints`_ - feature specifications
+        * `Bugs`_ - stories and issue tracking
+        * `Source`_
+        * `Specs`_
+        * `How to Contribute`_
+        
+        .. _PyPi: https://pypi.org/project/python-saharaclient
+        .. _Online Documentation: https://docs.openstack.org/python-saharaclient/latest/
+        .. _Blueprints: http://specs.openstack.org/openstack/sahara-specs/
+        .. _Bugs: https://storyboard.openstack.org/#!/project/934
+        .. _Source: https://opendev.org/openstack/python-saharaclient
+        .. _How to Contribute: https://docs.openstack.org/infra/manual/developers.html
+        .. _Specs: https://specs.openstack.org/openstack/sahara-specs/
+        .. _Release Notes: https://docs.openstack.org/releasenotes/python-saharaclient
+        
+        
+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 3.2.1-2/python_saharaclient.egg-info/requires.txt 3.3.0-0ubuntu1/python_saharaclient.egg-info/requires.txt
--- 3.2.1-2/python_saharaclient.egg-info/requires.txt	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/python_saharaclient.egg-info/requires.txt	2020-12-02 10:40:10.000000000 +0000
@@ -0,0 +1,10 @@
+keystoneauth1>=3.4.0
+osc-lib>=2.0.0
+oslo.i18n>=3.15.3
+oslo.log>=3.36.0
+oslo.serialization!=2.19.1,>=2.18.0
+oslo.utils>=3.33.0
+pbr!=2.1.0,>=2.0.0
+python-openstackclient>=5.2.0
+requests>=2.14.2
+six>=1.10.0
diff -pruN 3.2.1-2/python_saharaclient.egg-info/SOURCES.txt 3.3.0-0ubuntu1/python_saharaclient.egg-info/SOURCES.txt
--- 3.2.1-2/python_saharaclient.egg-info/SOURCES.txt	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/python_saharaclient.egg-info/SOURCES.txt	2020-12-02 10:40:11.000000000 +0000
@@ -0,0 +1,184 @@
+.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/ext/__init__.py
+doc/ext/cli.py
+doc/ext/ext.py
+doc/ext/parser.py
+doc/source/conf.py
+doc/source/index.rst
+doc/source/_templates/sidebarlinks.html
+doc/source/_theme_rtd/layout.html
+doc/source/_theme_rtd/theme.conf
+doc/source/cli/index.rst
+doc/source/cli/intro.rst
+doc/source/cli/reference.rst
+doc/source/contributor/contributing.rst
+doc/source/contributor/index.rst
+doc/source/reference/index.rst
+doc/source/reference/pythonclient.rst
+doc/source/reference/pythonclient_v2.rst
+python_saharaclient.egg-info/PKG-INFO
+python_saharaclient.egg-info/SOURCES.txt
+python_saharaclient.egg-info/dependency_links.txt
+python_saharaclient.egg-info/entry_points.txt
+python_saharaclient.egg-info/not-zip-safe
+python_saharaclient.egg-info/pbr.json
+python_saharaclient.egg-info/requires.txt
+python_saharaclient.egg-info/top_level.txt
+releasenotes/notes/.placeholder
+releasenotes/notes/api-v2-features-650eb8cc0f50a729.yaml
+releasenotes/notes/autogenerated-api-docs-3bc8513e63bfe610.yaml
+releasenotes/notes/autogenerated-cli-docs-c1e89ec6ea66c4a9.yaml
+releasenotes/notes/cli-deprecation-da0e7b6dfe77af52.yaml
+releasenotes/notes/designate-integration-16c59a6b57dbcfa4.yaml
+releasenotes/notes/drop-py2-7-862abe2ec0c32c5f.yaml
+releasenotes/notes/event-logs-c6d286e25dc7d9b1.yaml
+releasenotes/notes/experimental-v2-support-67ccf699e056ed78.yaml
+releasenotes/notes/fields-unset-068db4c3e680c37d.yaml
+releasenotes/notes/fix-job-binary-download-py3-5592eca2345305bd.yaml
+releasenotes/notes/fix-osc-520-regression-a92dff38f04e6a57.yaml
+releasenotes/notes/implement-pagination-2ba52769d240a3ce.yaml
+releasenotes/notes/job-binary-create-optional-bc0f9ee6426c5659.yaml
+releasenotes/notes/job-create-optional-034307a6b5db2cf2.yaml
+releasenotes/notes/job-execution-create-optional-1014a403e5ffa7ac.yaml
+releasenotes/notes/job-job-template-apiv2-change-93ffbf2b1360cddc.yaml
+releasenotes/notes/multiple-clusters-change-69a15f00597739d7.yaml
+releasenotes/notes/new-cli-6119bf8a4fb24ab6.yaml
+releasenotes/notes/osc-apiv2-4079c8cdb839ae42.yaml
+releasenotes/notes/plugin-api-f650c26a030b7df8.yaml
+releasenotes/notes/remove-functional-tests-c4b9d43c2c32d121.yaml
+releasenotes/notes/remove-old-cli-commands-06b9936ce044dd0f.yaml
+releasenotes/notes/remove-py26-dad75fc8d602b3c5.yaml
+releasenotes/notes/remove-py33-8364cb4805391750.yaml
+releasenotes/notes/rename_version_to_plugin-version-20cfe17530446391.yaml
+releasenotes/notes/rework-auth-c3e13a68a935671e.yaml
+releasenotes/notes/shares-update-d6f7e28acd27aa7f.yaml
+releasenotes/notes/start-using-reno-1f3418c11785c9ab.yaml
+releasenotes/notes/tags-update-c794416bcc035cb8.yaml
+releasenotes/notes/update-image-optional-f83c5746d88507cd.yaml
+releasenotes/notes/volume-mount-prefix-b6ef396a357cddd0.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/rocky.rst
+releasenotes/source/stein.rst
+releasenotes/source/train.rst
+releasenotes/source/unreleased.rst
+releasenotes/source/ussuri.rst
+releasenotes/source/victoria.rst
+releasenotes/source/_static/.placeholder
+releasenotes/source/_templates/.placeholder
+saharaclient/__init__.py
+saharaclient/_i18n.py
+saharaclient/client.py
+saharaclient/version.py
+saharaclient/api/__init__.py
+saharaclient/api/base.py
+saharaclient/api/client.py
+saharaclient/api/cluster_templates.py
+saharaclient/api/clusters.py
+saharaclient/api/data_sources.py
+saharaclient/api/helpers.py
+saharaclient/api/images.py
+saharaclient/api/job_binaries.py
+saharaclient/api/job_binary_internals.py
+saharaclient/api/job_executions.py
+saharaclient/api/job_types.py
+saharaclient/api/jobs.py
+saharaclient/api/node_group_templates.py
+saharaclient/api/parameters.py
+saharaclient/api/plugins.py
+saharaclient/api/v2/__init__.py
+saharaclient/api/v2/job_templates.py
+saharaclient/api/v2/jobs.py
+saharaclient/osc/__init__.py
+saharaclient/osc/plugin.py
+saharaclient/osc/utils.py
+saharaclient/osc/v1/__init__.py
+saharaclient/osc/v1/cluster_templates.py
+saharaclient/osc/v1/clusters.py
+saharaclient/osc/v1/data_sources.py
+saharaclient/osc/v1/images.py
+saharaclient/osc/v1/job_binaries.py
+saharaclient/osc/v1/job_templates.py
+saharaclient/osc/v1/job_types.py
+saharaclient/osc/v1/jobs.py
+saharaclient/osc/v1/node_group_templates.py
+saharaclient/osc/v1/plugins.py
+saharaclient/osc/v2/__init__.py
+saharaclient/osc/v2/cluster_templates.py
+saharaclient/osc/v2/clusters.py
+saharaclient/osc/v2/data_sources.py
+saharaclient/osc/v2/images.py
+saharaclient/osc/v2/job_binaries.py
+saharaclient/osc/v2/job_templates.py
+saharaclient/osc/v2/job_types.py
+saharaclient/osc/v2/jobs.py
+saharaclient/osc/v2/node_group_templates.py
+saharaclient/osc/v2/plugins.py
+saharaclient/tests/__init__.py
+saharaclient/tests/hacking/__init__.py
+saharaclient/tests/hacking/checks.py
+saharaclient/tests/hacking/commit_message.py
+saharaclient/tests/hacking/logging_checks.py
+saharaclient/tests/unit/__init__.py
+saharaclient/tests/unit/base.py
+saharaclient/tests/unit/test_base.py
+saharaclient/tests/unit/test_cluster_templates.py
+saharaclient/tests/unit/test_clusters.py
+saharaclient/tests/unit/test_data_sources.py
+saharaclient/tests/unit/test_hacking.py
+saharaclient/tests/unit/test_images.py
+saharaclient/tests/unit/test_job_binaries.py
+saharaclient/tests/unit/test_job_binary_internals.py
+saharaclient/tests/unit/test_job_executions.py
+saharaclient/tests/unit/test_job_types.py
+saharaclient/tests/unit/test_jobs.py
+saharaclient/tests/unit/test_manager.py
+saharaclient/tests/unit/test_node_group_templates.py
+saharaclient/tests/unit/test_plugins.py
+saharaclient/tests/unit/test_resource.py
+saharaclient/tests/unit/osc/__init__.py
+saharaclient/tests/unit/osc/test_plugin.py
+saharaclient/tests/unit/osc/v1/__init__.py
+saharaclient/tests/unit/osc/v1/fakes.py
+saharaclient/tests/unit/osc/v1/test_cluster_templates.py
+saharaclient/tests/unit/osc/v1/test_clusters.py
+saharaclient/tests/unit/osc/v1/test_data_sources.py
+saharaclient/tests/unit/osc/v1/test_images.py
+saharaclient/tests/unit/osc/v1/test_job_binaries.py
+saharaclient/tests/unit/osc/v1/test_job_templates.py
+saharaclient/tests/unit/osc/v1/test_job_types.py
+saharaclient/tests/unit/osc/v1/test_jobs.py
+saharaclient/tests/unit/osc/v1/test_node_group_templates.py
+saharaclient/tests/unit/osc/v1/test_plugins.py
+saharaclient/tests/unit/osc/v1/test_utils.py
+saharaclient/tests/unit/osc/v2/__init__.py
+saharaclient/tests/unit/osc/v2/test_cluster_templates.py
+saharaclient/tests/unit/osc/v2/test_clusters.py
+saharaclient/tests/unit/osc/v2/test_data_sources.py
+saharaclient/tests/unit/osc/v2/test_images.py
+saharaclient/tests/unit/osc/v2/test_job_binaries.py
+saharaclient/tests/unit/osc/v2/test_job_templates.py
+saharaclient/tests/unit/osc/v2/test_job_types.py
+saharaclient/tests/unit/osc/v2/test_jobs.py
+saharaclient/tests/unit/osc/v2/test_node_group_templates.py
+saharaclient/tests/unit/osc/v2/test_plugins.py
\ No newline at end of file
diff -pruN 3.2.1-2/python_saharaclient.egg-info/top_level.txt 3.3.0-0ubuntu1/python_saharaclient.egg-info/top_level.txt
--- 3.2.1-2/python_saharaclient.egg-info/top_level.txt	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/python_saharaclient.egg-info/top_level.txt	2020-12-02 10:40:10.000000000 +0000
@@ -0,0 +1 @@
+saharaclient
diff -pruN 3.2.1-2/releasenotes/source/index.rst 3.3.0-0ubuntu1/releasenotes/source/index.rst
--- 3.2.1-2/releasenotes/source/index.rst	2020-09-08 15:19:05.000000000 +0000
+++ 3.3.0-0ubuntu1/releasenotes/source/index.rst	2020-12-02 10:39:41.000000000 +0000
@@ -6,6 +6,7 @@
    :maxdepth: 1
 
    unreleased
+   victoria
    ussuri
    train
    stein
diff -pruN 3.2.1-2/releasenotes/source/victoria.rst 3.3.0-0ubuntu1/releasenotes/source/victoria.rst
--- 3.2.1-2/releasenotes/source/victoria.rst	1970-01-01 00:00:00.000000000 +0000
+++ 3.3.0-0ubuntu1/releasenotes/source/victoria.rst	2020-12-02 10:39:41.000000000 +0000
@@ -0,0 +1,6 @@
+=============================
+Victoria Series Release Notes
+=============================
+
+.. release-notes::
+   :branch: stable/victoria
diff -pruN 3.2.1-2/setup.cfg 3.3.0-0ubuntu1/setup.cfg
--- 3.2.1-2/setup.cfg	2020-09-08 15:19:05.000000000 +0000
+++ 3.3.0-0ubuntu1/setup.cfg	2020-12-02 10:40:11.066988200 +0000
@@ -1,164 +1,167 @@
 [metadata]
 name = python-saharaclient
 summary = Client library for Sahara API
-description-file =
-    README.rst
+description-file = 
+	README.rst
 license = Apache License, Version 2.0
 author = OpenStack
 author-email = openstack-discuss@lists.openstack.org
 home-page = https://docs.openstack.org/python-saharaclient/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
+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 =
-    saharaclient
+packages = 
+	saharaclient
 
 [entry_points]
-openstack.cli.extension =
-    data_processing = saharaclient.osc.plugin
+openstack.cli.extension = 
+	data_processing = saharaclient.osc.plugin
+openstack.data_processing.v1 = 
+	dataprocessing_plugin_list = saharaclient.osc.v1.plugins:ListPlugins
+	dataprocessing_plugin_show = saharaclient.osc.v1.plugins:ShowPlugin
+	dataprocessing_plugin_configs_get = saharaclient.osc.v1.plugins:GetPluginConfigs
+	dataprocessing_plugin_update = saharaclient.osc.v1.plugins:UpdatePlugin
+	
+	dataprocessing_data_source_create = saharaclient.osc.v1.data_sources:CreateDataSource
+	dataprocessing_data_source_list = saharaclient.osc.v1.data_sources:ListDataSources
+	dataprocessing_data_source_show = saharaclient.osc.v1.data_sources:ShowDataSource
+	dataprocessing_data_source_delete = saharaclient.osc.v1.data_sources:DeleteDataSource
+	dataprocessing_data_source_update = saharaclient.osc.v1.data_sources:UpdateDataSource
+	
+	dataprocessing_image_list = saharaclient.osc.v1.images:ListImages
+	dataprocessing_image_show = saharaclient.osc.v1.images:ShowImage
+	dataprocessing_image_register = saharaclient.osc.v1.images:RegisterImage
+	dataprocessing_image_unregister = saharaclient.osc.v1.images:UnregisterImage
+	dataprocessing_image_tags_add = saharaclient.osc.v1.images:AddImageTags
+	dataprocessing_image_tags_remove = saharaclient.osc.v1.images:RemoveImageTags
+	dataprocessing_image_tags_set = saharaclient.osc.v1.images:SetImageTags
+	
+	dataprocessing_node_group_template_create = saharaclient.osc.v1.node_group_templates:CreateNodeGroupTemplate
+	dataprocessing_node_group_template_list = saharaclient.osc.v1.node_group_templates:ListNodeGroupTemplates
+	dataprocessing_node_group_template_show = saharaclient.osc.v1.node_group_templates:ShowNodeGroupTemplate
+	dataprocessing_node_group_template_update = saharaclient.osc.v1.node_group_templates:UpdateNodeGroupTemplate
+	dataprocessing_node_group_template_delete = saharaclient.osc.v1.node_group_templates:DeleteNodeGroupTemplate
+	dataprocessing_node_group_template_import = saharaclient.osc.v1.node_group_templates:ImportNodeGroupTemplate
+	dataprocessing_node_group_template_export = saharaclient.osc.v1.node_group_templates:ExportNodeGroupTemplate
+	
+	dataprocessing_cluster_template_create = saharaclient.osc.v1.cluster_templates:CreateClusterTemplate
+	dataprocessing_cluster_template_list = saharaclient.osc.v1.cluster_templates:ListClusterTemplates
+	dataprocessing_cluster_template_show = saharaclient.osc.v1.cluster_templates:ShowClusterTemplate
+	dataprocessing_cluster_template_update = saharaclient.osc.v1.cluster_templates:UpdateClusterTemplate
+	dataprocessing_cluster_template_delete = saharaclient.osc.v1.cluster_templates:DeleteClusterTemplate
+	dataprocessing_cluster_template_import = saharaclient.osc.v1.cluster_templates:ImportClusterTemplate
+	dataprocessing_cluster_template_export = saharaclient.osc.v1.cluster_templates:ExportClusterTemplate
+	
+	dataprocessing_cluster_create = saharaclient.osc.v1.clusters:CreateCluster
+	dataprocessing_cluster_list = saharaclient.osc.v1.clusters:ListClusters
+	dataprocessing_cluster_show = saharaclient.osc.v1.clusters:ShowCluster
+	dataprocessing_cluster_update = saharaclient.osc.v1.clusters:UpdateCluster
+	dataprocessing_cluster_delete = saharaclient.osc.v1.clusters:DeleteCluster
+	dataprocessing_cluster_scale = saharaclient.osc.v1.clusters:ScaleCluster
+	dataprocessing_cluster_verification = saharaclient.osc.v1.clusters:VerificationUpdateCluster
+	
+	dataprocessing_job_template_create = saharaclient.osc.v1.job_templates:CreateJobTemplate
+	dataprocessing_job_template_list = saharaclient.osc.v1.job_templates:ListJobTemplates
+	dataprocessing_job_template_show = saharaclient.osc.v1.job_templates:ShowJobTemplate
+	dataprocessing_job_template_update = saharaclient.osc.v1.job_templates:UpdateJobTemplate
+	dataprocessing_job_template_delete = saharaclient.osc.v1.job_templates:DeleteJobTemplate
+	
+	dataprocessing_job_type_list = saharaclient.osc.v1.job_types:ListJobTypes
+	dataprocessing_job_type_configs_get = saharaclient.osc.v1.job_types:GetJobTypeConfigs
+	
+	dataprocessing_job_execute = saharaclient.osc.v1.jobs:ExecuteJob
+	dataprocessing_job_list = saharaclient.osc.v1.jobs:ListJobs
+	dataprocessing_job_show = saharaclient.osc.v1.jobs:ShowJob
+	dataprocessing_job_update = saharaclient.osc.v1.jobs:UpdateJob
+	dataprocessing_job_delete = saharaclient.osc.v1.jobs:DeleteJob
+	
+	dataprocessing_job_binary_create = saharaclient.osc.v1.job_binaries:CreateJobBinary
+	dataprocessing_job_binary_list = saharaclient.osc.v1.job_binaries:ListJobBinaries
+	dataprocessing_job_binary_show = saharaclient.osc.v1.job_binaries:ShowJobBinary
+	dataprocessing_job_binary_update = saharaclient.osc.v1.job_binaries:UpdateJobBinary
+	dataprocessing_job_binary_delete = saharaclient.osc.v1.job_binaries:DeleteJobBinary
+	dataprocessing_job_binary_download = saharaclient.osc.v1.job_binaries:DownloadJobBinary
+openstack.data_processing.v2 = 
+	dataprocessing_node_group_template_create = saharaclient.osc.v2.node_group_templates:CreateNodeGroupTemplate
+	dataprocessing_node_group_template_list = saharaclient.osc.v2.node_group_templates:ListNodeGroupTemplates
+	dataprocessing_node_group_template_show = saharaclient.osc.v2.node_group_templates:ShowNodeGroupTemplate
+	dataprocessing_node_group_template_update = saharaclient.osc.v2.node_group_templates:UpdateNodeGroupTemplate
+	dataprocessing_node_group_template_delete = saharaclient.osc.v2.node_group_templates:DeleteNodeGroupTemplate
+	dataprocessing_node_group_template_import = saharaclient.osc.v2.node_group_templates:ImportNodeGroupTemplate
+	dataprocessing_node_group_template_export = saharaclient.osc.v2.node_group_templates:ExportNodeGroupTemplate
+	
+	dataprocessing_plugin_list = saharaclient.osc.v2.plugins:ListPlugins
+	dataprocessing_plugin_show = saharaclient.osc.v2.plugins:ShowPlugin
+	dataprocessing_plugin_configs_get = saharaclient.osc.v2.plugins:GetPluginConfigs
+	dataprocessing_plugin_update = saharaclient.osc.v2.plugins:UpdatePlugin
+	
+	dataprocessing_data_source_create = saharaclient.osc.v2.data_sources:CreateDataSource
+	dataprocessing_data_source_list = saharaclient.osc.v2.data_sources:ListDataSources
+	dataprocessing_data_source_show = saharaclient.osc.v2.data_sources:ShowDataSource
+	dataprocessing_data_source_delete = saharaclient.osc.v2.data_sources:DeleteDataSource
+	dataprocessing_data_source_update = saharaclient.osc.v2.data_sources:UpdateDataSource
+	
+	dataprocessing_image_list = saharaclient.osc.v2.images:ListImages
+	dataprocessing_image_show = saharaclient.osc.v2.images:ShowImage
+	dataprocessing_image_register = saharaclient.osc.v2.images:RegisterImage
+	dataprocessing_image_unregister = saharaclient.osc.v2.images:UnregisterImage
+	dataprocessing_image_tags_add = saharaclient.osc.v2.images:AddImageTags
+	dataprocessing_image_tags_remove = saharaclient.osc.v2.images:RemoveImageTags
+	dataprocessing_image_tags_set = saharaclient.osc.v2.images:SetImageTags
+	
+	dataprocessing_cluster_template_create = saharaclient.osc.v2.cluster_templates:CreateClusterTemplate
+	dataprocessing_cluster_template_list = saharaclient.osc.v2.cluster_templates:ListClusterTemplates
+	dataprocessing_cluster_template_show = saharaclient.osc.v2.cluster_templates:ShowClusterTemplate
+	dataprocessing_cluster_template_update = saharaclient.osc.v2.cluster_templates:UpdateClusterTemplate
+	dataprocessing_cluster_template_delete = saharaclient.osc.v2.cluster_templates:DeleteClusterTemplate
+	dataprocessing_cluster_template_import = saharaclient.osc.v2.cluster_templates:ImportClusterTemplate
+	dataprocessing_cluster_template_export = saharaclient.osc.v2.cluster_templates:ExportClusterTemplate
+	
+	dataprocessing_cluster_create = saharaclient.osc.v2.clusters:CreateCluster
+	dataprocessing_cluster_list = saharaclient.osc.v2.clusters:ListClusters
+	dataprocessing_cluster_show = saharaclient.osc.v2.clusters:ShowCluster
+	dataprocessing_cluster_update = saharaclient.osc.v2.clusters:UpdateCluster
+	dataprocessing_cluster_delete = saharaclient.osc.v2.clusters:DeleteCluster
+	dataprocessing_cluster_scale = saharaclient.osc.v2.clusters:ScaleCluster
+	dataprocessing_cluster_verification = saharaclient.osc.v2.clusters:VerificationUpdateCluster
+	dataprocessing_cluster_update_keypair = saharaclient.osc.v2.clusters:UpdateKeypairCluster
+	
+	dataprocessing_job_template_create = saharaclient.osc.v2.job_templates:CreateJobTemplate
+	dataprocessing_job_template_list = saharaclient.osc.v2.job_templates:ListJobTemplates
+	dataprocessing_job_template_show = saharaclient.osc.v2.job_templates:ShowJobTemplate
+	dataprocessing_job_template_update = saharaclient.osc.v2.job_templates:UpdateJobTemplate
+	dataprocessing_job_template_delete = saharaclient.osc.v2.job_templates:DeleteJobTemplate
+	
+	dataprocessing_job_type_list = saharaclient.osc.v2.job_types:ListJobTypes
+	dataprocessing_job_type_configs_get = saharaclient.osc.v2.job_types:GetJobTypeConfigs
+	
+	dataprocessing_job_execute = saharaclient.osc.v2.jobs:ExecuteJob
+	dataprocessing_job_list = saharaclient.osc.v2.jobs:ListJobs
+	dataprocessing_job_show = saharaclient.osc.v2.jobs:ShowJob
+	dataprocessing_job_update = saharaclient.osc.v2.jobs:UpdateJob
+	dataprocessing_job_delete = saharaclient.osc.v2.jobs:DeleteJob
+	
+	dataprocessing_job_binary_create = saharaclient.osc.v2.job_binaries:CreateJobBinary
+	dataprocessing_job_binary_list = saharaclient.osc.v2.job_binaries:ListJobBinaries
+	dataprocessing_job_binary_show = saharaclient.osc.v2.job_binaries:ShowJobBinary
+	dataprocessing_job_binary_update = saharaclient.osc.v2.job_binaries:UpdateJobBinary
+	dataprocessing_job_binary_delete = saharaclient.osc.v2.job_binaries:DeleteJobBinary
+	dataprocessing_job_binary_download = saharaclient.osc.v2.job_binaries:DownloadJobBinary
+
+[egg_info]
+tag_build = 
+tag_date = 0
 
-openstack.data_processing.v1 =
-    dataprocessing_plugin_list = saharaclient.osc.v1.plugins:ListPlugins
-    dataprocessing_plugin_show = saharaclient.osc.v1.plugins:ShowPlugin
-    dataprocessing_plugin_configs_get = saharaclient.osc.v1.plugins:GetPluginConfigs
-    dataprocessing_plugin_update = saharaclient.osc.v1.plugins:UpdatePlugin
-
-    dataprocessing_data_source_create = saharaclient.osc.v1.data_sources:CreateDataSource
-    dataprocessing_data_source_list = saharaclient.osc.v1.data_sources:ListDataSources
-    dataprocessing_data_source_show = saharaclient.osc.v1.data_sources:ShowDataSource
-    dataprocessing_data_source_delete = saharaclient.osc.v1.data_sources:DeleteDataSource
-    dataprocessing_data_source_update = saharaclient.osc.v1.data_sources:UpdateDataSource
-
-    dataprocessing_image_list = saharaclient.osc.v1.images:ListImages
-    dataprocessing_image_show = saharaclient.osc.v1.images:ShowImage
-    dataprocessing_image_register = saharaclient.osc.v1.images:RegisterImage
-    dataprocessing_image_unregister = saharaclient.osc.v1.images:UnregisterImage
-    dataprocessing_image_tags_add = saharaclient.osc.v1.images:AddImageTags
-    dataprocessing_image_tags_remove = saharaclient.osc.v1.images:RemoveImageTags
-    dataprocessing_image_tags_set = saharaclient.osc.v1.images:SetImageTags
-
-    dataprocessing_node_group_template_create = saharaclient.osc.v1.node_group_templates:CreateNodeGroupTemplate
-    dataprocessing_node_group_template_list = saharaclient.osc.v1.node_group_templates:ListNodeGroupTemplates
-    dataprocessing_node_group_template_show = saharaclient.osc.v1.node_group_templates:ShowNodeGroupTemplate
-    dataprocessing_node_group_template_update = saharaclient.osc.v1.node_group_templates:UpdateNodeGroupTemplate
-    dataprocessing_node_group_template_delete = saharaclient.osc.v1.node_group_templates:DeleteNodeGroupTemplate
-    dataprocessing_node_group_template_import = saharaclient.osc.v1.node_group_templates:ImportNodeGroupTemplate
-    dataprocessing_node_group_template_export = saharaclient.osc.v1.node_group_templates:ExportNodeGroupTemplate
-
-    dataprocessing_cluster_template_create = saharaclient.osc.v1.cluster_templates:CreateClusterTemplate
-    dataprocessing_cluster_template_list = saharaclient.osc.v1.cluster_templates:ListClusterTemplates
-    dataprocessing_cluster_template_show = saharaclient.osc.v1.cluster_templates:ShowClusterTemplate
-    dataprocessing_cluster_template_update = saharaclient.osc.v1.cluster_templates:UpdateClusterTemplate
-    dataprocessing_cluster_template_delete = saharaclient.osc.v1.cluster_templates:DeleteClusterTemplate
-    dataprocessing_cluster_template_import = saharaclient.osc.v1.cluster_templates:ImportClusterTemplate
-    dataprocessing_cluster_template_export = saharaclient.osc.v1.cluster_templates:ExportClusterTemplate
-
-    dataprocessing_cluster_create = saharaclient.osc.v1.clusters:CreateCluster
-    dataprocessing_cluster_list = saharaclient.osc.v1.clusters:ListClusters
-    dataprocessing_cluster_show = saharaclient.osc.v1.clusters:ShowCluster
-    dataprocessing_cluster_update = saharaclient.osc.v1.clusters:UpdateCluster
-    dataprocessing_cluster_delete = saharaclient.osc.v1.clusters:DeleteCluster
-    dataprocessing_cluster_scale = saharaclient.osc.v1.clusters:ScaleCluster
-    dataprocessing_cluster_verification = saharaclient.osc.v1.clusters:VerificationUpdateCluster
-
-    dataprocessing_job_template_create = saharaclient.osc.v1.job_templates:CreateJobTemplate
-    dataprocessing_job_template_list = saharaclient.osc.v1.job_templates:ListJobTemplates
-    dataprocessing_job_template_show = saharaclient.osc.v1.job_templates:ShowJobTemplate
-    dataprocessing_job_template_update = saharaclient.osc.v1.job_templates:UpdateJobTemplate
-    dataprocessing_job_template_delete = saharaclient.osc.v1.job_templates:DeleteJobTemplate
-
-    dataprocessing_job_type_list = saharaclient.osc.v1.job_types:ListJobTypes
-    dataprocessing_job_type_configs_get = saharaclient.osc.v1.job_types:GetJobTypeConfigs
-
-    dataprocessing_job_execute = saharaclient.osc.v1.jobs:ExecuteJob
-    dataprocessing_job_list = saharaclient.osc.v1.jobs:ListJobs
-    dataprocessing_job_show = saharaclient.osc.v1.jobs:ShowJob
-    dataprocessing_job_update = saharaclient.osc.v1.jobs:UpdateJob
-    dataprocessing_job_delete = saharaclient.osc.v1.jobs:DeleteJob
-
-    dataprocessing_job_binary_create = saharaclient.osc.v1.job_binaries:CreateJobBinary
-    dataprocessing_job_binary_list = saharaclient.osc.v1.job_binaries:ListJobBinaries
-    dataprocessing_job_binary_show = saharaclient.osc.v1.job_binaries:ShowJobBinary
-    dataprocessing_job_binary_update = saharaclient.osc.v1.job_binaries:UpdateJobBinary
-    dataprocessing_job_binary_delete = saharaclient.osc.v1.job_binaries:DeleteJobBinary
-    dataprocessing_job_binary_download = saharaclient.osc.v1.job_binaries:DownloadJobBinary
-
-openstack.data_processing.v2 =
-    dataprocessing_node_group_template_create = saharaclient.osc.v2.node_group_templates:CreateNodeGroupTemplate
-    dataprocessing_node_group_template_list = saharaclient.osc.v2.node_group_templates:ListNodeGroupTemplates
-    dataprocessing_node_group_template_show = saharaclient.osc.v2.node_group_templates:ShowNodeGroupTemplate
-    dataprocessing_node_group_template_update = saharaclient.osc.v2.node_group_templates:UpdateNodeGroupTemplate
-    dataprocessing_node_group_template_delete = saharaclient.osc.v2.node_group_templates:DeleteNodeGroupTemplate
-    dataprocessing_node_group_template_import = saharaclient.osc.v2.node_group_templates:ImportNodeGroupTemplate
-    dataprocessing_node_group_template_export = saharaclient.osc.v2.node_group_templates:ExportNodeGroupTemplate
-
-    dataprocessing_plugin_list = saharaclient.osc.v2.plugins:ListPlugins
-    dataprocessing_plugin_show = saharaclient.osc.v2.plugins:ShowPlugin
-    dataprocessing_plugin_configs_get = saharaclient.osc.v2.plugins:GetPluginConfigs
-    dataprocessing_plugin_update = saharaclient.osc.v2.plugins:UpdatePlugin
-
-    dataprocessing_data_source_create = saharaclient.osc.v2.data_sources:CreateDataSource
-    dataprocessing_data_source_list = saharaclient.osc.v2.data_sources:ListDataSources
-    dataprocessing_data_source_show = saharaclient.osc.v2.data_sources:ShowDataSource
-    dataprocessing_data_source_delete = saharaclient.osc.v2.data_sources:DeleteDataSource
-    dataprocessing_data_source_update = saharaclient.osc.v2.data_sources:UpdateDataSource
-
-    dataprocessing_image_list = saharaclient.osc.v2.images:ListImages
-    dataprocessing_image_show = saharaclient.osc.v2.images:ShowImage
-    dataprocessing_image_register = saharaclient.osc.v2.images:RegisterImage
-    dataprocessing_image_unregister = saharaclient.osc.v2.images:UnregisterImage
-    dataprocessing_image_tags_add = saharaclient.osc.v2.images:AddImageTags
-    dataprocessing_image_tags_remove = saharaclient.osc.v2.images:RemoveImageTags
-    dataprocessing_image_tags_set = saharaclient.osc.v2.images:SetImageTags
-
-    dataprocessing_cluster_template_create = saharaclient.osc.v2.cluster_templates:CreateClusterTemplate
-    dataprocessing_cluster_template_list = saharaclient.osc.v2.cluster_templates:ListClusterTemplates
-    dataprocessing_cluster_template_show = saharaclient.osc.v2.cluster_templates:ShowClusterTemplate
-    dataprocessing_cluster_template_update = saharaclient.osc.v2.cluster_templates:UpdateClusterTemplate
-    dataprocessing_cluster_template_delete = saharaclient.osc.v2.cluster_templates:DeleteClusterTemplate
-    dataprocessing_cluster_template_import = saharaclient.osc.v2.cluster_templates:ImportClusterTemplate
-    dataprocessing_cluster_template_export = saharaclient.osc.v2.cluster_templates:ExportClusterTemplate
-
-    dataprocessing_cluster_create = saharaclient.osc.v2.clusters:CreateCluster
-    dataprocessing_cluster_list = saharaclient.osc.v2.clusters:ListClusters
-    dataprocessing_cluster_show = saharaclient.osc.v2.clusters:ShowCluster
-    dataprocessing_cluster_update = saharaclient.osc.v2.clusters:UpdateCluster
-    dataprocessing_cluster_delete = saharaclient.osc.v2.clusters:DeleteCluster
-    dataprocessing_cluster_scale = saharaclient.osc.v2.clusters:ScaleCluster
-    dataprocessing_cluster_verification = saharaclient.osc.v2.clusters:VerificationUpdateCluster
-    dataprocessing_cluster_update_keypair = saharaclient.osc.v2.clusters:UpdateKeypairCluster
-
-    dataprocessing_job_template_create = saharaclient.osc.v2.job_templates:CreateJobTemplate
-    dataprocessing_job_template_list = saharaclient.osc.v2.job_templates:ListJobTemplates
-    dataprocessing_job_template_show = saharaclient.osc.v2.job_templates:ShowJobTemplate
-    dataprocessing_job_template_update = saharaclient.osc.v2.job_templates:UpdateJobTemplate
-    dataprocessing_job_template_delete = saharaclient.osc.v2.job_templates:DeleteJobTemplate
-
-    dataprocessing_job_type_list = saharaclient.osc.v2.job_types:ListJobTypes
-    dataprocessing_job_type_configs_get = saharaclient.osc.v2.job_types:GetJobTypeConfigs
-
-    dataprocessing_job_execute = saharaclient.osc.v2.jobs:ExecuteJob
-    dataprocessing_job_list = saharaclient.osc.v2.jobs:ListJobs
-    dataprocessing_job_show = saharaclient.osc.v2.jobs:ShowJob
-    dataprocessing_job_update = saharaclient.osc.v2.jobs:UpdateJob
-    dataprocessing_job_delete = saharaclient.osc.v2.jobs:DeleteJob
-
-    dataprocessing_job_binary_create = saharaclient.osc.v2.job_binaries:CreateJobBinary
-    dataprocessing_job_binary_list = saharaclient.osc.v2.job_binaries:ListJobBinaries
-    dataprocessing_job_binary_show = saharaclient.osc.v2.job_binaries:ShowJobBinary
-    dataprocessing_job_binary_update = saharaclient.osc.v2.job_binaries:UpdateJobBinary
-    dataprocessing_job_binary_delete = saharaclient.osc.v2.job_binaries:DeleteJobBinary
-    dataprocessing_job_binary_download = saharaclient.osc.v2.job_binaries:DownloadJobBinary
diff -pruN 3.2.1-2/tox.ini 3.3.0-0ubuntu1/tox.ini
--- 3.2.1-2/tox.ini	2020-09-08 15:19:05.000000000 +0000
+++ 3.3.0-0ubuntu1/tox.ini	2020-12-02 10:39:41.000000000 +0000
@@ -62,7 +62,6 @@ commands = {posargs}
 [testenv:docs]
 deps =
     -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
-    -r{toxinidir}/requirements.txt
     -r{toxinidir}/doc/requirements.txt
 commands =
   rm -rf doc/build
@@ -71,7 +70,6 @@ commands =
 [testenv:releasenotes]
 deps =
     -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
-    -r{toxinidir}/requirements.txt
     -r{toxinidir}/doc/requirements.txt
 commands =
   rm -rf releasenotes/build
diff -pruN 3.2.1-2/.zuul.yaml 3.3.0-0ubuntu1/.zuul.yaml
--- 3.2.1-2/.zuul.yaml	2020-09-08 15:19:05.000000000 +0000
+++ 3.3.0-0ubuntu1/.zuul.yaml	2020-12-02 10:39:41.000000000 +0000
@@ -2,7 +2,7 @@
     templates:
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
-      - openstack-python3-victoria-jobs
+      - openstack-python3-wallaby-jobs
       - publish-openstack-docs-pti
       - check-requirements
       - release-notes-jobs-python3
