diff -pruN 2.3.0-2/AUTHORS 2.4.0-0ubuntu1/AUTHORS
--- 2.3.0-2/AUTHORS	1970-01-01 00:00:00.000000000 +0000
+++ 2.4.0-0ubuntu1/AUTHORS	2021-08-19 12:34:26.000000000 +0000
@@ -0,0 +1,34 @@
+Andreas Jaeger <aj@suse.com>
+Cao Xuan Hoang <hoangcx@vn.fujitsu.com>
+ChangBo Guo(gcb) <eric.guo@easystack.cn>
+Chuck Short <chuck.short@canonical.com>
+Corey Bryant <corey.bryant@canonical.com>
+Daniel Bengtsson <dbengt@redhat.com>
+Davanum Srinivas <davanum@gmail.com>
+Doug Hellmann <doug@doughellmann.com>
+Elod Illes <elod.illes@est.tech>
+Hervé Beraud <hberaud@redhat.com>
+Janonymous <janonymous.codevulture@gmail.com>
+Joshua Harlow <harlowja@gmail.com>
+Joshua Harlow <harlowja@yahoo-inc.com>
+Le Hou <houl7@chinaunicom.cn>
+Ondřej Nový <ondrej.novy@firma.seznam.cz>
+OpenStack Release Bot <infra-root@openstack.org>
+Riccardo Pittau <elfosardo@gmail.com>
+Ronald Bradford <ronald.bradford@gmail.com>
+Ruby Loo <rloo@yahoo-inc.com>
+Sean McGinnis <sean.mcginnis@gmail.com>
+Stephen Finucane <stephenfin@redhat.com>
+Swapnil Kulkarni (coolsvap) <me@coolsvap.net>
+Tom Cocozzello <tjcocozz@us.ibm.com>
+Tony Breeds <tony@bakeyournoodle.com>
+Vu Cong Tuan <tuanvc@vn.fujitsu.com>
+gecong1973 <ge.cong@zte.com.cn>
+jacky06 <zhang.min@99cloud.net>
+kangyufei <kangyf@inspur.com>
+melissaml <ma.lei@99cloud.net>
+nizam <abdul.nizamuddin@nectechnologies.in>
+pengyuesheng <pengyuesheng@gohighsec.com>
+sonu.kumar <sonu.kumar@nectechnologies.in>
+venkatamahesh <venkatamaheshkotha@gmail.com>
+wu.shiming <wushiming@yovole.com>
diff -pruN 2.3.0-2/automaton.egg-info/dependency_links.txt 2.4.0-0ubuntu1/automaton.egg-info/dependency_links.txt
--- 2.3.0-2/automaton.egg-info/dependency_links.txt	1970-01-01 00:00:00.000000000 +0000
+++ 2.4.0-0ubuntu1/automaton.egg-info/dependency_links.txt	2021-08-19 12:34:26.000000000 +0000
@@ -0,0 +1 @@
+
diff -pruN 2.3.0-2/automaton.egg-info/not-zip-safe 2.4.0-0ubuntu1/automaton.egg-info/not-zip-safe
--- 2.3.0-2/automaton.egg-info/not-zip-safe	1970-01-01 00:00:00.000000000 +0000
+++ 2.4.0-0ubuntu1/automaton.egg-info/not-zip-safe	2021-08-19 12:34:26.000000000 +0000
@@ -0,0 +1 @@
+
diff -pruN 2.3.0-2/automaton.egg-info/pbr.json 2.4.0-0ubuntu1/automaton.egg-info/pbr.json
--- 2.3.0-2/automaton.egg-info/pbr.json	1970-01-01 00:00:00.000000000 +0000
+++ 2.4.0-0ubuntu1/automaton.egg-info/pbr.json	2021-08-19 12:34:26.000000000 +0000
@@ -0,0 +1 @@
+{"git_version": "0461d8e", "is_release": true}
\ No newline at end of file
diff -pruN 2.3.0-2/automaton.egg-info/PKG-INFO 2.4.0-0ubuntu1/automaton.egg-info/PKG-INFO
--- 2.3.0-2/automaton.egg-info/PKG-INFO	1970-01-01 00:00:00.000000000 +0000
+++ 2.4.0-0ubuntu1/automaton.egg-info/PKG-INFO	2021-08-19 12:34:26.000000000 +0000
@@ -0,0 +1,46 @@
+Metadata-Version: 1.2
+Name: automaton
+Version: 2.4.0
+Summary: Friendly state machines for python.
+Home-page: https://docs.openstack.org/automaton/latest/
+Author: OpenStack
+Author-email: openstack-discuss@lists.openstack.org
+License: UNKNOWN
+Description: =========
+        Automaton
+        =========
+        
+        .. image:: https://img.shields.io/pypi/v/automaton.svg
+            :target: https://pypi.org/project/automaton/
+            :alt: Latest Version
+        
+        .. image:: https://img.shields.io/pypi/dm/automaton.svg
+            :target: https://pypi.org/project/automaton/
+            :alt: Downloads
+        
+        Friendly state machines for python. The goal of this library is to provide
+        well documented state machine classes and associated utilities. The state
+        machine pattern (or the implemented variation there-of) is a commonly
+        used pattern and has a multitude of various usages. Some of the usages
+        for this library include providing state & transition validation and
+        running/scheduling/analyzing the execution of tasks.
+        
+        * Free software: Apache license
+        * Documentation: https://docs.openstack.org/automaton/latest/
+        * Source: https://opendev.org/openstack/automaton
+        * Bugs: https://bugs.launchpad.net/automaton
+        
+        
+Platform: UNKNOWN
+Classifier: Development Status :: 3 - Alpha
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: POSIX
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Topic :: Software Development :: Libraries
+Requires-Python: >=3.6
diff -pruN 2.3.0-2/automaton.egg-info/requires.txt 2.4.0-0ubuntu1/automaton.egg-info/requires.txt
--- 2.3.0-2/automaton.egg-info/requires.txt	1970-01-01 00:00:00.000000000 +0000
+++ 2.4.0-0ubuntu1/automaton.egg-info/requires.txt	2021-08-19 12:34:26.000000000 +0000
@@ -0,0 +1,2 @@
+PrettyTable>=0.7.2
+pbr!=2.1.0,>=2.0.0
diff -pruN 2.3.0-2/automaton.egg-info/SOURCES.txt 2.4.0-0ubuntu1/automaton.egg-info/SOURCES.txt
--- 2.3.0-2/automaton.egg-info/SOURCES.txt	1970-01-01 00:00:00.000000000 +0000
+++ 2.4.0-0ubuntu1/automaton.egg-info/SOURCES.txt	2021-08-19 12:34:26.000000000 +0000
@@ -0,0 +1,58 @@
+.coveragerc
+.pre-commit-config.yaml
+.stestr.conf
+.zuul.yaml
+AUTHORS
+CONTRIBUTING.rst
+ChangeLog
+HACKING.rst
+LICENSE
+README.rst
+bindep.txt
+requirements.txt
+setup.cfg
+setup.py
+test-requirements.txt
+tox.ini
+automaton/__init__.py
+automaton/_utils.py
+automaton/exceptions.py
+automaton/machines.py
+automaton/runners.py
+automaton.egg-info/PKG-INFO
+automaton.egg-info/SOURCES.txt
+automaton.egg-info/dependency_links.txt
+automaton.egg-info/not-zip-safe
+automaton.egg-info/pbr.json
+automaton.egg-info/requires.txt
+automaton.egg-info/top_level.txt
+automaton/converters/__init__.py
+automaton/converters/pydot.py
+automaton/tests/__init__.py
+automaton/tests/test_fsm.py
+doc/requirements.txt
+doc/source/conf.py
+doc/source/index.rst
+doc/source/contributor/index.rst
+doc/source/install/index.rst
+doc/source/reference/index.rst
+doc/source/user/examples.rst
+doc/source/user/features.rst
+doc/source/user/history.rst
+doc/source/user/index.rst
+releasenotes/notes/.placeholder
+releasenotes/notes/drop-python-2-7-73d3113c69d724d6.yaml
+releasenotes/source/conf.py
+releasenotes/source/index.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/wallaby.rst
+releasenotes/source/_static/.placeholder
+releasenotes/source/_templates/.placeholder
\ No newline at end of file
diff -pruN 2.3.0-2/automaton.egg-info/top_level.txt 2.4.0-0ubuntu1/automaton.egg-info/top_level.txt
--- 2.3.0-2/automaton.egg-info/top_level.txt	1970-01-01 00:00:00.000000000 +0000
+++ 2.4.0-0ubuntu1/automaton.egg-info/top_level.txt	2021-08-19 12:34:26.000000000 +0000
@@ -0,0 +1 @@
+automaton
diff -pruN 2.3.0-2/ChangeLog 2.4.0-0ubuntu1/ChangeLog
--- 2.3.0-2/ChangeLog	1970-01-01 00:00:00.000000000 +0000
+++ 2.4.0-0ubuntu1/ChangeLog	2021-08-19 12:34:26.000000000 +0000
@@ -0,0 +1,329 @@
+CHANGES
+=======
+
+2.4.0
+-----
+
+* Moving to OFTC
+* setup.cfg: Replace dashes with underscores
+* Move flake8 as a pre-commit local target
+* Add Python3 xena unit tests
+* Update master for stable/wallaby
+* tox: Remove references to testr
+* Remove lower-constraints remnants
+
+2.3.0
+-----
+
+* Uncap PrettyTable
+* Dropping lower constraints testing
+* Remove six dependency
+* Use TOX\_CONSTRAINTS\_FILE
+* Use py3 as the default runtime for tox
+* Adding pre-commit
+* Add Python3 wallaby unit tests
+* Update master for stable/victoria
+
+2.2.0
+-----
+
+* Update lower-constraints list
+* drop mock from lower-constraints
+
+2.1.0
+-----
+
+* Stop to use the \_\_future\_\_ module
+* Small cleanup
+* Switch to newer openstackdocstheme and reno versions
+* Bump default tox env from py37 to py38
+* Add py38 package metadata
+* Add Python3 victoria unit tests
+* Update master for stable/ussuri
+
+2.0.1
+-----
+
+* Update hacking for Python3
+
+2.0.0
+-----
+
+* Add python3 classifiers
+* Ignore releasenote artifacts files
+* [ussuri][goal] Drop python 2.7 support and testing
+* trivial: Remove noise
+* Move doc requirements into dedicated file
+* Switch to Ussuri jobs
+* Blacklist sphinx 2.1.0 (autodoc bug)
+* Update the constraints url
+* Update master for stable/train
+
+1.17.0
+------
+
+* Add Python 3 Train unit tests
+* Add local bindep.txt
+* Sync Sphinx requirement
+* Update to opendev
+* OpenDev Migration Patch
+* Update master for stable/stein
+* add python 3.7 unit test job
+
+1.16.0
+------
+
+* Use template for lower-constraints
+* Change openstack-dev to openstack-discuss
+* Change openstack-dev to openstack-discuss
+* add lib-forward-testing-python3 test job
+* add python 3.6 unit test job
+* import zuul job settings from project-config
+* Update reno for stable/rocky
+
+1.15.0
+------
+
+* Switch to stestr
+* fix tox python3 overrides
+* Trivial: Update pypi url to new url
+* fix list of default virtualenvs
+* set default python to python3
+* add lower-constraints job
+* Updated from global requirements
+* Update reno for stable/queens
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+
+1.14.0
+------
+
+
+1.13.1
+------
+
+* Avoid tox\_install.sh for constraints support
+* Remove setting of version/release from releasenotes
+* Updated from global requirements
+
+1.13.0
+------
+
+* Updated from global requirements
+* Remove kwarg default\_start\_state in the machine constructor
+* Updated from global requirements
+* Update reno for stable/pike
+* Updated from global requirements
+
+1.12.0
+------
+
+* Update URLs in documents according to document migration
+* update link to docs in readme
+
+1.11.0
+------
+
+* switch from oslosphinx to openstackdocstheme
+* rearrange existing documentation according to the new standard layout
+* Updated from global requirements
+
+1.10.0
+------
+
+* Remove pbr warnerrors in favor of sphinx check
+* Remove support for py34
+* Updated from global requirements
+* Updated from global requirements
+
+1.9.0
+-----
+
+* Updated from global requirements
+* Remove unused dependecy testscenarios
+
+1.8.0
+-----
+
+* Updated from global requirements
+* Updated from global requirements
+* Update reno for stable/ocata
+
+1.7.0
+-----
+
+* Don't include openstack/common in flake8 exclude list
+* Removes unnecessary utf-8 encoding
+* Add Constraints support
+* Replace six.iteritems() with .items()
+
+1.6.0
+-----
+
+* Updated from global requirements
+* Fix release notes gate failure
+* Updated from global requirements
+* Add reno for release notes management
+
+1.5.0
+-----
+
+* Changed the home-page link
+* Updated from global requirements
+* Updated from global requirements
+
+1.4.0
+-----
+
+* Remove discover from test-requirements
+* Add Python 3.5 classifier and venv
+
+1.3.0
+-----
+
+* Updated from global requirements
+
+1.2.0
+-----
+
+* Add a state-space machine building example
+* Ensure state space can also pass on\_enter/exit callbacks
+* Updated from global requirements
+* Updated from global requirements
+* Ensure machine special method(s) include in generated docs
+* Put py34 first in the envlist order of tox ,remove py33
+
+1.1.0
+-----
+
+* Removes MANIFEST.in as it is not needed explicitely by PBR
+* Deprecated tox -downloadcache option removed
+
+1.0.0
+-----
+
+* Updated from global requirements
+* Remove python 2.6 and cleanup tox.ini
+
+0.8.0
+-----
+
+* Added code coverage section to tox
+* No need for Oslo Incubator Sync
+* Ignore generated files
+* docs - Set pbr 'warnerrors' option for doc build
+* Remove dummy/placeholder 'ChangeLog' as its not needed
+* Enhance the README
+* Fix the build path in .gitignore file
+* Updated from global requirements
+* Provide a finite machine build() method
+* Allow for raising on duplicate transition registration
+
+0.7.0
+-----
+
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+
+0.6.0
+-----
+
+* Activate pep8 check that \_ is imported
+* Updated from global requirements
+
+0.5.0
+-----
+
+* Ensure doctesting and doc8 testing done in py27 env
+* Updated from global requirements
+* Remove setup.cfg 'requires-python' incorrect entry
+* Document \`process\_event\` return and expose return namedtuple type
+* Allow providing and using a 'nested\_start\_state\_fetcher'
+* Allow providing a state-name translation dict
+
+0.4.0
+-----
+
+* Add a bigger CD-player state-machine doctest(ed) example
+* Add \`is\_actionable\_event\` checking function
+* Disallow adding transitions from terminal states
+* Add and use a callback name fetching utility function
+* Add runners to features.rst & add a runner base & update docstrings
+
+0.3.0
+-----
+
+* Add badge support to README.rst
+* Add code repo, mail list, and IRC to CONTRIBUTING
+* Remove 3.3 classifier
+* Remove 2.6 classifier + 2.6 compatibility code
+* Add history.rst that uses generated 'ChangeLog' file
+* Add base exception class for this library
+* Updated from global requirements
+* Add optional machine conversion into a pydot graph
+* Updated from global requirements
+* Updated from global requirements
+* When a state has no transitions show its own \`on\_exit\` and \`on\_enter\`
+* Add a more complex doctest(ed) example
+* Add simple machine doctest(ed) example into docs
+
+0.2.0
+-----
+
+* Split the state machine runners off into own file
+* Use debtcollector removals function instead of warnings.warn
+* Revamp repo to match openstack repos
+* Allow the hierarchical machine to provide back the nested machines
+* Retain & deprecate default\_start\_state via constructor
+* Amend the unittest due to more on\_exit being triggered
+* Have the start state 'on\_exit' be called when exit occurs
+* Use a property setter instead of a method
+* Require using set\_default\_start\_state to set the default
+* Add more checks on setting a alternative start state default
+* Rename start\_state to default\_start\_state
+* Use type(self) instead of self.\_\_class\_\_
+* Correctly copy derived classes
+* Allow initialize to take an alternative start\_state
+* Update message when processing event and not initialized
+* Add pre and post event processing methods
+* Share the same not found template between machines
+* Avoid having a \_generate\_runner method when inheritance is ok
+* Allow frozen to be set/unset
+* Add testrepository to testing requirements
+* Fixup the classifiers
+* Fix the tox to install the right requirements
+* Just use \_generate\_runner to generate the different runner types
+* Use quoting in the machine code documentation
+* Adjust pformat() + add examples
+* Remove version caps
+* Split the requirements file into py2/py3 variations
+* Move process event to be a static method
+* Add a HierarchicalFiniteMachine + Runner
+* Use a helper classmethod to create machines
+* Rename \_Runner -> \_FiniteRunner
+* Move to top level machines module, seems cleaner this way
+* Fix the pformat() example
+* Move the fsm -> machines/finite.py and split off the running methods
+* Allow copies to be unfrozen (if the parent is frozen)
+* Make frozen a non-settable attribute and copy it correctly
+* Allow machines to be shallow or deep copied
+* Three is the number for alpha
+* Change beta to alpha (for now)
+
+0.1
+---
+
+* Add the travis badge
+* Add a travis testing file
+* Also install the main requirements.txt when using tox
+* Move over the fsm test
+* Add testtools testing requirement
+* Use the test-requirements.txt for tox.ini deps
+* Add needed testing requirement and tox.ini file
+* Don't forget the requirements.txt file
+* Fixup the README.rst and setup.cfg
+* Use prettytable
+* Move a bunch of files into there rightful places
+* Initial commit
diff -pruN 2.3.0-2/CONTRIBUTING.rst 2.4.0-0ubuntu1/CONTRIBUTING.rst
--- 2.3.0-2/CONTRIBUTING.rst	2021-02-11 12:27:12.000000000 +0000
+++ 2.4.0-0ubuntu1/CONTRIBUTING.rst	2021-08-19 12:33:38.000000000 +0000
@@ -24,5 +24,5 @@ The mailing list is (prefix subjects wit
 
    https://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-discuss
 
-Questions and discussions take place in #openstack-state-management on
-irc.freenode.net.
+Questions and discussions take place in #openstack-oslo on
+irc.OFTC.net.
diff -pruN 2.3.0-2/debian/changelog 2.4.0-0ubuntu1/debian/changelog
--- 2.3.0-2/debian/changelog	2021-08-16 06:15:43.000000000 +0000
+++ 2.4.0-0ubuntu1/debian/changelog	2021-09-07 19:31:54.000000000 +0000
@@ -1,28 +1,27 @@
-python-automaton (2.3.0-2) unstable; urgency=medium
+python-automaton (2.4.0-0ubuntu1) impish; urgency=medium
 
-  * Uploading to unstable.
+  * New upstream release for OpenStack Xena.
 
- -- Thomas Goirand <zigo@debian.org>  Mon, 16 Aug 2021 08:15:43 +0200
+ -- Corey Bryant <corey.bryant@canonical.com>  Tue, 07 Sep 2021 15:31:54 -0400
 
-python-automaton (2.3.0-1) experimental; urgency=medium
+python-automaton (2.3.0-0ubuntu1) hirsute; urgency=medium
 
-  * New upstream release.
-  * Removed -six from (build-)depends, removed upstream.
+  * d/control: Update VCS paths for move to lp:~ubuntu-openstack-dev.
+  * New upstream release for OpenStack Wallaby.
 
- -- Thomas Goirand <zigo@debian.org>  Mon, 08 Mar 2021 09:46:08 +0100
+ -- Chris MacNaughton <chris.macnaughton@ubuntu.com>  Wed, 17 Mar 2021 11:18:56 +0000
 
-python-automaton (2.2.0-2) unstable; urgency=medium
+python-automaton (2.1.0-0ubuntu1) groovy; urgency=medium
 
-  * Uploading to unstable.
-  * Add a debian/salsa-ci.yml.
+  * d/gbp.conf: Update gbp configuration file.
+  * d/control: Update Vcs-* links and maintainers.
+  * d/watch: Get tarballs from tarballs.opendev.org.
+  * New upstream release for OpenStack Victoria.
+  * d/control: Align (Build-)Depends with upstream.
+  * d/control, d/rules: Switch to debhelper compat 12 and pybuild.
+  * d/control: Update Standards-Version to 4.5.0.
 
- -- Thomas Goirand <zigo@debian.org>  Wed, 14 Oct 2020 22:37:59 +0200
-
-python-automaton (2.2.0-1) experimental; urgency=medium
-
-  * New upstream release.
-
- -- Thomas Goirand <zigo@debian.org>  Mon, 07 Sep 2020 12:29:02 +0200
+ -- Corey Bryant <corey.bryant@canonical.com>  Tue, 28 Jul 2020 16:06:16 -0400
 
 python-automaton (2.0.1-1) unstable; urgency=medium
 
diff -pruN 2.3.0-2/debian/control 2.4.0-0ubuntu1/debian/control
--- 2.3.0-2/debian/control	2021-08-16 06:15:43.000000000 +0000
+++ 2.4.0-0ubuntu1/debian/control	2021-09-07 19:31:54.000000000 +0000
@@ -1,31 +1,33 @@
 Source: python-automaton
 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 <team+openstack@tracker.debian.org>
 Uploaders:
  Thomas Goirand <zigo@debian.org>,
  Corey Bryant <corey.bryant@canonical.com>,
 Build-Depends:
- debhelper-compat (= 10),
+ debhelper-compat (= 12),
  dh-python,
  openstack-pkg-tools,
  python3-all,
- python3-pbr,
+ python3-pbr (>= 2.0.0),
  python3-setuptools,
- python3-sphinx,
+ python3-sphinx (>= 2.0.0),
 Build-Depends-Indep:
  python3-coverage,
  python3-hacking,
- python3-openstackdocstheme,
- python3-oslotest,
- python3-prettytable,
- python3-stestr,
- python3-testtools,
+ python3-openstackdocstheme (>= 2.2.1),
+ python3-oslotest (>= 1:3.2.0),
+ python3-prettytable (>= 0.7.2),
+ python3-six (>= 1.10.0),
+ python3-stestr (>= 2.0.0),
+ python3-testtools (>= 2.2.0),
  subunit,
-Standards-Version: 4.5.1
-Vcs-Browser: https://salsa.debian.org/openstack-team/libs/python-automaton
-Vcs-Git: https://salsa.debian.org/openstack-team/libs/python-automaton.git
-Homepage: https://github.com/openstack/automaton
+Standards-Version: 4.5.0
+Vcs-Browser: https://git.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/python-automaton
+Vcs-Git: https://git.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/python-automaton
+Homepage: https://opendev.org/openstack/automaton
 
 Package: python-automaton-doc
 Section: doc
@@ -49,8 +51,9 @@ Package: python3-automaton
 Architecture: all
 Depends:
  python3-debtcollector,
- python3-pbr,
- python3-prettytable,
+ python3-pbr (>= 2.0.0),
+ python3-prettytable (>= 0.7.2),
+ python3-six (>= 1.10.0),
  ${misc:Depends},
  ${python3:Depends},
 Suggests:
diff -pruN 2.3.0-2/debian/gbp.conf 2.4.0-0ubuntu1/debian/gbp.conf
--- 2.3.0-2/debian/gbp.conf	1970-01-01 00:00:00.000000000 +0000
+++ 2.4.0-0ubuntu1/debian/gbp.conf	2021-09-07 19:31:54.000000000 +0000
@@ -0,0 +1,7 @@
+[DEFAULT]
+debian-branch = master
+upstream-tag = %(version)s
+pristine-tar = True
+
+[buildpackage]
+export-dir = ../build-area
diff -pruN 2.3.0-2/debian/rules 2.4.0-0ubuntu1/debian/rules
--- 2.3.0-2/debian/rules	2021-08-16 06:15:43.000000000 +0000
+++ 2.4.0-0ubuntu1/debian/rules	2021-09-07 19:31:54.000000000 +0000
@@ -1,10 +1,12 @@
 #!/usr/bin/make -f
 
-UPSTREAM_GIT = https://github.com/openstack/automaton.git
+export PYBUILD_NAME=automaton
+
+UPSTREAM_GIT = https://opendev.org/openstack/automaton.git
 include /usr/share/openstack-pkg-tools/pkgos.make
 
 %:
-	dh $@ --buildsystem=python_distutils --with python3,sphinxdoc
+	dh $@ --buildsystem=pybuild --with python3,sphinxdoc
 
 override_dh_auto_clean:
 	rm -rf build
diff -pruN 2.3.0-2/debian/salsa-ci.yml 2.4.0-0ubuntu1/debian/salsa-ci.yml
--- 2.3.0-2/debian/salsa-ci.yml	2021-08-16 06:15:43.000000000 +0000
+++ 2.4.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 2.3.0-2/debian/watch 2.4.0-0ubuntu1/debian/watch
--- 2.3.0-2/debian/watch	2021-08-16 06:15:43.000000000 +0000
+++ 2.4.0-0ubuntu1/debian/watch	2021-09-07 19:31:54.000000000 +0000
@@ -1,4 +1,3 @@
 version=3
 opts="uversionmangle=s/\.(b|rc)/~$1/" \
-https://github.com/openstack/automaton/tags .*/(\d[\d\.]+)\.tar\.gz
-
+    http://tarballs.opendev.org/openstack/automaton/ automaton-(\d.*)\.tar\.gz
diff -pruN 2.3.0-2/.gitignore 2.4.0-0ubuntu1/.gitignore
--- 2.3.0-2/.gitignore	2021-02-11 12:27:12.000000000 +0000
+++ 2.4.0-0ubuntu1/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-env/
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-*.egg-info/
-.installed.cfg
-*.egg
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.stestr/
-.tox/
-.coverage
-cover
-.cache
-coverage.xml
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-
-# Sphinx documentation
-doc/build/
-
-# pbr generates these
-AUTHORS
-ChangeLog
-
-# release note artifacts (reno)
-RELEASENOTES.rst
-releasenotes/notes/reno.cache
-
-# PyBuilder
-target/
diff -pruN 2.3.0-2/.gitreview 2.4.0-0ubuntu1/.gitreview
--- 2.3.0-2/.gitreview	2021-02-11 12:27:12.000000000 +0000
+++ 2.4.0-0ubuntu1/.gitreview	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[gerrit]
-host=review.opendev.org
-port=29418
-project=openstack/automaton.git
diff -pruN 2.3.0-2/lower-constraints.txt 2.4.0-0ubuntu1/lower-constraints.txt
--- 2.3.0-2/lower-constraints.txt	2021-02-11 12:27:12.000000000 +0000
+++ 2.4.0-0ubuntu1/lower-constraints.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-appdirs==1.3.0
-argparse==0.9.0
-cliff==3.1.0
-cmd2==0.8.9
-coverage==4.0
-dulwich==0.15.0
-extras==1.0.0
-fixtures==3.0.0
-future==0.18.2
-iso8601==0.1.11
-keystoneauth1==3.4.0
-linecache2==1.0.0
-os-client-config==1.28.0
-oslotest==3.2.0
-pbr==2.0.0
-prettytable==0.7.2
-pyparsing==2.4.7
-pyperclip==1.8.0
-python-mimeparse==1.6.0
-python-subunit==1.0.0
-reno==3.1.0
-requests==2.14.2
-requestsexceptions==1.2.0
-six==1.10.0
-stestr==2.0.0
-stevedore==1.20.0
-testrepository==0.0.20
-testtools==2.2.0
-toml==0.9.3
-traceback2==1.4.0
-unittest2==1.1.0
-virtualenv==20.0.8
-voluptuous==0.11.7
-wcwidth==0.2.4
diff -pruN 2.3.0-2/PKG-INFO 2.4.0-0ubuntu1/PKG-INFO
--- 2.3.0-2/PKG-INFO	1970-01-01 00:00:00.000000000 +0000
+++ 2.4.0-0ubuntu1/PKG-INFO	2021-08-19 12:34:26.219965700 +0000
@@ -0,0 +1,46 @@
+Metadata-Version: 1.2
+Name: automaton
+Version: 2.4.0
+Summary: Friendly state machines for python.
+Home-page: https://docs.openstack.org/automaton/latest/
+Author: OpenStack
+Author-email: openstack-discuss@lists.openstack.org
+License: UNKNOWN
+Description: =========
+        Automaton
+        =========
+        
+        .. image:: https://img.shields.io/pypi/v/automaton.svg
+            :target: https://pypi.org/project/automaton/
+            :alt: Latest Version
+        
+        .. image:: https://img.shields.io/pypi/dm/automaton.svg
+            :target: https://pypi.org/project/automaton/
+            :alt: Downloads
+        
+        Friendly state machines for python. The goal of this library is to provide
+        well documented state machine classes and associated utilities. The state
+        machine pattern (or the implemented variation there-of) is a commonly
+        used pattern and has a multitude of various usages. Some of the usages
+        for this library include providing state & transition validation and
+        running/scheduling/analyzing the execution of tasks.
+        
+        * Free software: Apache license
+        * Documentation: https://docs.openstack.org/automaton/latest/
+        * Source: https://opendev.org/openstack/automaton
+        * Bugs: https://bugs.launchpad.net/automaton
+        
+        
+Platform: UNKNOWN
+Classifier: Development Status :: 3 - Alpha
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: POSIX
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Topic :: Software Development :: Libraries
+Requires-Python: >=3.6
diff -pruN 2.3.0-2/.pre-commit-config.yaml 2.4.0-0ubuntu1/.pre-commit-config.yaml
--- 2.3.0-2/.pre-commit-config.yaml	2021-02-11 12:27:12.000000000 +0000
+++ 2.4.0-0ubuntu1/.pre-commit-config.yaml	2021-08-19 12:33:38.000000000 +0000
@@ -9,7 +9,7 @@ default_language_version:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: 9136088a246768144165fcc3ecc3d31bb686920a # v3.3.0
+    rev: 9136088a246768144165fcc3ecc3d31bb686920a  # v3.3.0
     hooks:
       - id: trailing-whitespace
       # Replaces or checks mixed line ending
@@ -27,9 +27,13 @@ repos:
       - id: debug-statements
       - id: check-yaml
         files: .*\.(yaml|yml)$
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: fb91b994ed4adf4f2b4890e7bdba82f57e3a81df # 3.8.4
+  - repo: local
     hooks:
       - id: flake8
+        name: flake8
         additional_dependencies:
           - hacking>=3.1.0,<4.0
+        language: python
+        entry: flake8
+        files: '^.*\.py$'
+        exclude: '^(doc|releasenotes|tools)/.*$'
diff -pruN 2.3.0-2/releasenotes/source/index.rst 2.4.0-0ubuntu1/releasenotes/source/index.rst
--- 2.3.0-2/releasenotes/source/index.rst	2021-02-11 12:27:12.000000000 +0000
+++ 2.4.0-0ubuntu1/releasenotes/source/index.rst	2021-08-19 12:33:38.000000000 +0000
@@ -6,6 +6,7 @@
     :maxdepth: 1
 
     unreleased
+    wallaby
     victoria
     ussuri
     train
diff -pruN 2.3.0-2/releasenotes/source/wallaby.rst 2.4.0-0ubuntu1/releasenotes/source/wallaby.rst
--- 2.3.0-2/releasenotes/source/wallaby.rst	1970-01-01 00:00:00.000000000 +0000
+++ 2.4.0-0ubuntu1/releasenotes/source/wallaby.rst	2021-08-19 12:33:38.000000000 +0000
@@ -0,0 +1,6 @@
+============================
+Wallaby Series Release Notes
+============================
+
+.. release-notes::
+   :branch: stable/wallaby
diff -pruN 2.3.0-2/setup.cfg 2.4.0-0ubuntu1/setup.cfg
--- 2.3.0-2/setup.cfg	2021-02-11 12:27:12.000000000 +0000
+++ 2.4.0-0ubuntu1/setup.cfg	2021-08-19 12:34:26.219965700 +0000
@@ -2,24 +2,29 @@
 name = automaton
 summary = Friendly state machines for python.
 author = OpenStack
-author-email = openstack-discuss@lists.openstack.org
-home-page = https://docs.openstack.org/automaton/latest/
-description-file =
-    README.rst
-python-requires = >=3.6
-classifier =
-    Development Status :: 3 - Alpha
-    Intended Audience :: Developers
-    License :: OSI Approved :: Apache Software License
-    Operating System :: POSIX
-    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
-    Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: Implementation :: CPython
-    Topic :: Software Development :: Libraries
+author_email = openstack-discuss@lists.openstack.org
+home_page = https://docs.openstack.org/automaton/latest/
+description_file = 
+	README.rst
+python_requires = >=3.6
+classifier = 
+	Development Status :: 3 - Alpha
+	Intended Audience :: Developers
+	License :: OSI Approved :: Apache Software License
+	Operating System :: POSIX
+	Programming Language :: Python :: 3
+	Programming Language :: Python :: 3.6
+	Programming Language :: Python :: 3.7
+	Programming Language :: Python :: 3.8
+	Programming Language :: Python :: 3 :: Only
+	Programming Language :: Python :: Implementation :: CPython
+	Topic :: Software Development :: Libraries
 
 [files]
-packages =
-    automaton
+packages = 
+	automaton
+
+[egg_info]
+tag_build = 
+tag_date = 0
+
diff -pruN 2.3.0-2/tox.ini 2.4.0-0ubuntu1/tox.ini
--- 2.3.0-2/tox.ini	2021-02-11 12:27:12.000000000 +0000
+++ 2.4.0-0ubuntu1/tox.ini	2021-08-19 12:33:38.000000000 +0000
@@ -5,6 +5,11 @@ ignore_basepython_conflict = true
 
 [testenv]
 basepython = python3
+setenv =
+  OS_STDOUT_CAPTURE=1
+  OS_STDERR_CAPTURE=1
+  OS_TEST_TIMEOUT=60
+  PYTHONDONTWRITEBYTECODE=1
 deps =
   -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/test-requirements.txt
@@ -13,14 +18,23 @@ commands = stestr run --slowest {posargs
 
 [testenv:pep8]
 deps =
-    pre-commit>=2.6.0 # MIT
+  pre-commit>=2.6.0 # MIT
 commands = pre-commit run -a
 
 [testenv:venv]
 commands = {posargs}
 
 [testenv:cover]
-commands = python setup.py test --coverage --testr-args="{posargs}"
+setenv =
+  {[testenv]setenv}
+  PYTHON=coverage run --source automaton --parallel-mode
+commands =
+  coverage erase
+  stestr run {posargs}
+  coverage combine
+  coverage html -d cover
+  coverage xml -o cover/coverage.xml
+  coverage report
 
 [testenv:docs]
 deps =
@@ -28,11 +42,12 @@ deps =
   -r{toxinidir}/doc/requirements.txt
 commands =
   doc8 --ignore-path "doc/source/history.rst" doc/source
-  sphinx-build -W -b html doc/source doc/build/html
+  sphinx-build -a -E -W -b html doc/source doc/build/html
 
 [testenv:releasenotes]
 deps = {[testenv:docs]deps}
-commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
+commands =
+  sphinx-build -a -E -W -b html releasenotes/source releasenotes/build/html
 
 [testenv:bindep]
 # Do not install any requirements. We want this to be fast and work even if
@@ -45,12 +60,6 @@ deps = bindep
 commands = bindep test
 usedevelop = False
 
-[testenv:lower-constraints]
-deps =
-  -c{toxinidir}/lower-constraints.txt
-  -r{toxinidir}/test-requirements.txt
-  -r{toxinidir}/requirements.txt
-
 [flake8]
 show-source = True
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
diff -pruN 2.3.0-2/.zuul.yaml 2.4.0-0ubuntu1/.zuul.yaml
--- 2.3.0-2/.zuul.yaml	2021-02-11 12:27:12.000000000 +0000
+++ 2.4.0-0ubuntu1/.zuul.yaml	2021-08-19 12:33:38.000000000 +0000
@@ -2,7 +2,7 @@
     templates:
       - check-requirements
       - lib-forward-testing-python3
-      - openstack-python3-wallaby-jobs
+      - openstack-python3-xena-jobs
       - periodic-stable-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
