openstack/heat
Code Issues Proposed changes

Fix lower-constraints errors

Browse Source 
This patch changes the lower-constraint requirements to make them
py3.8 compatible. See https://bugs.launchpad.net/nova/+bug/1886298

Markupsafe==1.1.1
PyMySQL==0.8.0
PyYAML==3.13
cffi==1.14.0
greenlet==0.4.15
kombu==5.0.1
lxml==4.5.0
oslo.db==6.0.0
paramiko==2.7.1
psycopg2==2.8
sqlalchemy-migrate==0.13.0
tenacity==6.1.0

Also update the test-setup.sh to work with recent version of mysql.

Change-Id: Ibe60d1e536f0e887eceea32b7cb4eec6318e96af
Partial-Bug: #1886298
This commit is contained in:
Emilien Macchi 2020-09-10 09:48:56 -04:00
parent c54518d607
commit 17a491449f
4 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lower-constraints.txt
View File

@ -8,7 +8,7 @@ bandit==1.1.0
bcrypt==3.1.4
cachetools==2.0.1
certifi==2018.1.18
cffi==1.11.5
cffi==1.14.0
chardet==3.0.4
cliff==2.11.0
cmd2==0.8.1
@ -32,7 +32,7 @@ future==0.16.0
futurist==1.6.0
gitdb2==2.0.3
GitPython==2.1.8
greenlet==0.4.13
greenlet==0.4.15
idna==2.6
iso8601==0.1.12
Jinja2==2.10
@ -42,11 +42,11 @@ jsonpointer==2.0
jsonschema==2.6.0
keystoneauth1==3.18.0
keystonemiddleware==4.17.0
kombu==4.0.0
kombu==5.0.1
linecache2==1.0.0
lxml==3.4.1
lxml==4.5.0
Mako==1.0.7
MarkupSafe==1.0
MarkupSafe==1.1.1
mccabe==0.2.1
monotonic==1.4
msgpack==0.5.6
@ -62,7 +62,7 @@ oslo.cache==1.26.0
oslo.concurrency==3.26.0
oslo.config==5.2.0
oslo.context==2.19.2
oslo.db==4.27.0
oslo.db==6.0.0
oslo.i18n==3.15.3
oslo.log==3.36.0
oslo.messaging==5.29.0
@ -77,7 +77,7 @@ oslo.versionedobjects==1.31.2
oslotest==3.2.0
osprofiler==1.4.0
packaging==17.1
paramiko==2.4.1
paramiko==2.7.1
Paste==2.0.3
PasteDeploy==1.5.0
pbr==2.0.0
@ -86,13 +86,13 @@ pika==0.10.0
ply==3.11
prettytable==0.7.2
psutil==5.4.3
psycopg2==2.7
psycopg2==2.8
pyasn1==0.4.2
pycadf==2.7.0
pycparser==2.18
Pygments==2.2.0
pyinotify==0.9.6
PyMySQL==0.7.6
PyMySQL==0.8.0
PyNaCl==1.2.1
pyOpenSSL==17.5.0
pyparsing==2.2.0
@ -125,7 +125,7 @@ python-vitrageclient==2.7.0
python-zaqarclient==1.3.0
python-zunclient==3.4.0
pytz==2013.6
PyYAML==3.12
PyYAML==3.13
repoze.lru==0.7
requests==2.14.2
requestsexceptions==1.4.0
@ -134,7 +134,7 @@ Routes==2.3.1
simplejson==3.13.2
six==1.10.0
smmap2==2.0.3
sqlalchemy-migrate==0.11.0
sqlalchemy-migrate==0.13.0
SQLAlchemy==1.0.10
sqlparse==0.2.4
statsd==3.2.2
@ -142,7 +142,7 @@ stestr==2.0.0
stevedore==3.1.0
tempest==17.1.0
Tempita==0.5.2
tenacity==4.4.0
tenacity==6.1.0
testresources==2.0.0
testscenarios==0.4
testtools==2.2.0

10
requirements.txt
View File

@ -10,7 +10,7 @@ debtcollector>=1.19.0 # Apache-2.0
eventlet!=0.18.3,!=0.20.1,!=0.21.0,!=0.23.0,!=0.25.0,>=0.18.2 # MIT
keystoneauth1>=3.18.0 # Apache-2.0
keystonemiddleware>=4.17.0 # Apache-2.0
lxml!=3.7.0,>=3.4.1 # BSD
lxml!=3.7.0,>=4.5.0 # BSD
netaddr>=0.7.18 # BSD
neutron-lib>=1.14.0 # Apache-2.0
openstacksdk>=0.11.2 # Apache-2.0
@ -18,7 +18,7 @@ oslo.cache>=1.26.0 # Apache-2.0
oslo.config>=5.2.0 # Apache-2.0
oslo.concurrency>=3.26.0 # Apache-2.0
oslo.context>=2.19.2 # Apache-2.0
oslo.db>=4.27.0 # Apache-2.0
oslo.db>=6.0.0 # Apache-2.0
oslo.i18n>=3.15.3 # Apache-2.0
oslo.log>=3.36.0 # Apache-2.0
oslo.messaging>=5.29.0 # Apache-2.0
@ -56,12 +56,12 @@ python-vitrageclient>=2.7.0 # Apache-2.0
python-zaqarclient>=1.3.0 # Apache-2.0
python-zunclient>=3.4.0 # Apache-2.0
pytz>=2013.6 # MIT
PyYAML>=3.12 # MIT
PyYAML>=3.13 # MIT
requests>=2.14.2 # Apache-2.0
tenacity>=4.4.0 # Apache-2.0
tenacity>=6.1.0 # Apache-2.0
Routes>=2.3.1 # MIT
SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
sqlalchemy-migrate>=0.11.0 # Apache-2.0
sqlalchemy-migrate>=0.13.0 # Apache-2.0
stevedore>=3.1.0 # Apache-2.0
WebOb>=1.7.1 # MIT
yaql>=1.1.3 # Apache 2.0 License

11
test-requirements.txt
View File

@ -4,13 +4,18 @@
# Hacking already pins down pep8, pyflakes and flake8
hacking>=3.0.1,<3.1.0 # Apache-2.0
# remove this pyflakes from here once you bump the
# hacking to 3.2.0 or above. hacking 3.2.0 takes
# care of pyflakes version compatibilty.
pyflakes>=2.1.1
bandit!=1.6.0,>=1.1.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
kombu!=4.0.2,>=4.0.0 # BSD
PyMySQL>=0.7.6 # MIT License
kombu!=4.0.2,>=5.0.1 # BSD
PyMySQL>=0.8.0 # MIT License
oslotest>=3.2.0 # Apache-2.0
psycopg2>=2.7 # LGPL/ZPL
psycopg2>=2.8 # LGPL/ZPL
stestr>=2.0.0 # Apache-2.0
testscenarios>=0.4 # Apache-2.0/BSD
testtools>=2.2.0 # MIT

4
tools/test-setup.sh
View File

@ -23,8 +23,8 @@ sudo -H mysqladmin -u root password $DB_ROOT_PW
sudo -H mysql -u root -p$DB_ROOT_PW -h localhost -e "
DELETE FROM mysql.user WHERE User='';
FLUSH PRIVILEGES;
GRANT ALL PRIVILEGES ON *.*
TO '$DB_USER'@'%' identified by '$DB_PW' WITH GRANT OPTION;"
CREATE USER '$DB_USER'@'%' IDENTIFIED BY '$DB_PW';
GRANT ALL PRIVILEGES ON *.* TO '$DB_USER'@'%' WITH GRANT OPTION;"
# Now create our database.
mysql -u $DB_USER -p$DB_PW -h 127.0.0.1 -e "