From 5a8598c436a14efb1c718afe8ce1d0221d77104a Mon Sep 17 00:00:00 2001
From: Yadnesh Kulkarni <ykulkarn@redhat.com>
Date: Mon, 20 Feb 2023 19:32:03 +0530
Subject: [PATCH] Fix CI jobs(py38, py310) and upload of wheels package to PyPi

According to PEP440[1] python wheel with a direct references
in their metadata cannot be uploaded to PyPi(public index server). Move "aodh-master" tarball url to tox.ini.

Since this project doesn't consume upper-constraints, the latest
releases of a few packages are being installed which breaks
"gnocchi upgrade" when running py38 and py310 jobs. Avoid this
by pinning sqlalchemy and oslo.db packages.

[1] https://peps.python.org/pep-0440/#direct-references

Change-Id: I6c10d87c572f9503484fcb02f6f0a0188c9454b3
---
 requirements.txt | 6 +++++-
 setup.cfg        | 3 ++-
 tox.ini          | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index f2b84d9..80d0aca 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,4 +10,8 @@ oslo.serialization>=1.4.0 # Apache-2.0
 oslo.utils>=2.0.0 # Apache-2.0
 osprofiler>=1.4.0 # Apache-2.0
 keystoneauth1>=1.0.0
-pyparsing
\ No newline at end of file
+pyparsing
+SQLAlchemy-Utils<=0.38.3
+sqlalchemy-migrate<=0.13.0
+SQLAlchemy<=1.4.41
+oslo.db<=12.3.1
diff --git a/setup.cfg b/setup.cfg
index 027face..6cb7288 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -33,7 +33,8 @@ test =
     testtools>=1.4.0
     pifpaf[gnocchi]>=0.23
     gnocchi[postgresql,file]
-    aodh @ https://tarballs.openstack.org/aodh/aodh-master.tar.gz#egg=aodh[mysql]
+    ;Disabled due to https://github.com/pypa/twine/issues/726
+    ;aodh @ https://tarballs.openstack.org/aodh/aodh-master.tar.gz#egg=aodh[mysql]
 
 [entry_points]
 console_scripts =
diff --git a/tox.ini b/tox.ini
index 966daa7..61a44c4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,6 +22,7 @@ passenv =
 # NOTE(jd): the -e is on its own line so it is passed a separate argument to pip
 deps =
     .[test]
+    http://tarballs.openstack.org/aodh/aodh-master.tar.gz#egg=aodh[mysql]
 commands = pifpaf run aodh -- stestr run --slowest {posargs}
 
 [testenv:pep8]