Merge ~bryce/ubuntu/+source/aodh:ubuntu/impish-devel into ubuntu/+source/aodh:ubuntu/devel

[Bryce Harrington]

The -0ubuntu2 update dropped the sqlalchemy version requirement from d/control but there's also one in requirements.txt.

With this change, the package builds and autopkgtests pass for me:

autopkgtest [01:05:06]: @@@@@@@@@@@@@@@@@@@@ summary
aodh-daemons PASS
autodep8-python3 PASS (superficial)
autopkgtest [01:05:06]: Binaries: resetting testbed apt configuration

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Bryce. I agree with the proposed changes; one can easily check that the requirement for python3-sqlalchemy is still present in the generated .deb because of the expansion of ${python3:Depends}, which comes from the requirements.txt file.

review: Approve

[Utkarsh Gupta (utkarsh)]

Hey,

Reproduced the problem as noticed in https://people.canonical.com/~ubuntu-archive/proposed-migration/update_excuses.html#aodh & https://autopkgtest.ubuntu.com/results/autopkgtest-impish/impish/arm64/a/aodh/20210802_124549_91ca1@/log.gz.

Verified that your patch works. Rebuilt and ran the autopkgtest with success:
autopkgtest [17:12:01]: @@@@@@@@@@@@@@@@@@@@ summary
aodh-daemons PASS
autodep8-python3 PASS (superficial)

So, a +1. Go, go, go!

review: Approve

[Corey Bryant (corey.bryant)]

Thanks Bryce! I'll get this merged and uploaded.

review: Approve

[Corey Bryant (corey.bryant)]

Uploaded and merged into https://code.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/aodh/+git/aodh/+ref/master

diff --git a/debian/changelog b/debian/changelog
index 10ca17c..54bc450 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+aodh (1:12.0.0+git2021072116.10383f4d-0ubuntu3) impish; urgency=medium
+
+  * d/p/drop-sqlalchemy-required-version.patch: Remove dependency on
+    unavailable sqlalchemy 1.4.
+    (LP: #1938962)
+
+ -- Bryce Harrington <[e-mail]>  Thu, 05 Aug 2021 00:37:55 +0000
+
 aodh (1:12.0.0+git2021072116.10383f4d-0ubuntu2) impish; urgency=medium
 
   * d/control: Drop python3-sqlalchemy min version.
diff --git a/debian/patches/drop-sqlalchemy-required-version.patch b/debian/patches/drop-sqlalchemy-required-version.patch
 new file mode 100644
index 0000000..c1cb344
--- /dev/null
+++ b/debian/patches/drop-sqlalchemy-required-version.patch
@@ -0,0 +1,11 @@
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -26,7 +26,7 @@
+ pytz>=2013.6
+ requests>=2.5.2
+ stevedore>=1.5.0 # Apache-2.0
+-sqlalchemy>=1.4.1
++sqlalchemy
+ tooz>=1.28.0 # Apache-2.0
+ voluptuous>=0.8.10
+ WebOb>=1.2.3
diff --git a/debian/patches/series b/debian/patches/series
index 92092ac..c4c8f84 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+drop-sqlalchemy-required-version.patch
 remove-wsmeext.sphinxext.patch