diff options
author | wu.shiming <wushiming@yovole.com> | 2021-02-19 14:35:08 +0800 |
---|---|---|
committer | Aija Jauntēva <aija.jaunteva@dell.com> | 2021-08-06 03:41:16 -0400 |
commit | d15545a7b3b745d8c23bcb5842b28ee0fecc6f66 (patch) | |
tree | 94f0f9fa39010cccb1a9d7aacf944e14e74197d2 | |
parent | 08879fbf3b066c55cd5f17a2a6f059a243a03ce6 (diff) | |
download | oslo-db-d15545a7b3b745d8c23bcb5842b28ee0fecc6f66.tar.gz |
Remove lower-constraints remnants
These were missed in change : Icd090cf8a36fa560bf7b0c67d0e1c4923c221c65
Conflicts:
lower-constraints.txt
NOTE(stephenfin): Conflicts are because the constraints are different.
(cherry picked from commit ad720c3371ff26d484b5264f1332d92524719023)
(cherry picked from commit 0646eb6595a79edb62801232ee2f6af0886d3013)
(cherry picked from commit 1e40b7c4f3accd15dc48130b148141ae2740474c)
NOTE(ajya): Added to fix mysql8 support for requirements-check job
(cherry picked from commit 7af699e72802817d5a19fc0c4e016f6aeb9dce1c)
Change-Id: I07b577f4e948c03d1751145e5f898b90ac1c197a
-rw-r--r-- | lower-constraints.txt | 67 | ||||
-rwxr-xr-x | tools/test-setup.sh | 4 | ||||
-rw-r--r-- | tox.ini | 5 |
3 files changed, 2 insertions, 74 deletions
diff --git a/lower-constraints.txt b/lower-constraints.txt deleted file mode 100644 index 87aa12b..0000000 --- a/lower-constraints.txt +++ /dev/null @@ -1,67 +0,0 @@ -alembic==0.9.6 -appdirs==1.3.0 -Babel==2.3.4 -bandit==1.4.0 -cffi==1.7.0 -cliff==2.8.0 -cmd2==0.8.0 -coverage==4.0 -debtcollector==1.2.0 -decorator==3.4.0 -eventlet==0.18.2 -extras==1.0.0 -fixtures==3.0.0 -flake8==2.5.5 -future==0.16.0 -gitdb==0.6.4 -GitPython==1.0.1 -greenlet==0.4.10 -hacking==0.12.0 -iso8601==0.1.11 -keystoneauth1==3.4.0 -linecache2==1.0.0 -Mako==0.4.0 -MarkupSafe==1.0 -mccabe==0.2.1 -monotonic==0.6 -netaddr==0.7.18 -netifaces==0.10.4 -os-client-config==1.28.0 -os-testr==1.0.0 -oslo.config==5.2.0 -oslo.context==2.19.2 -oslo.i18n==3.15.3 -oslo.utils==3.33.0 -oslotest==3.2.0 -pbr==2.0.0 -pep8==1.5.7 -pifpaf==0.10.0 -prettytable==0.7.2 -psycopg2==2.7.0 -pycparser==2.18 -pyflakes==0.8.1 -PyMySQL==0.7.6 -pyparsing==2.1.0 -pyperclip==1.5.27 -python-editor==1.0.3 -python-mimeparse==1.6.0 -python-subunit==1.0.0 -pytz==2013.6 -PyYAML==3.12 -requests==2.14.2 -requestsexceptions==1.2.0 -rfc3986==0.3.1 -smmap==0.9.0 -SQLAlchemy==1.2.0 -sqlalchemy-migrate==0.11.0 -sqlparse==0.2.2 -stevedore==1.20.0 -Tempita==0.5.2 -testrepository==0.0.18 -stestr==2.0.0 -testresources==2.0.0 -testscenarios==0.4 -testtools==2.2.0 -traceback2==1.4.0 -wrapt==1.7.0 -xattr==0.9.2 diff --git a/tools/test-setup.sh b/tools/test-setup.sh index 07a0785..505a58c 100755 --- a/tools/test-setup.sh +++ b/tools/test-setup.sh @@ -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 " @@ -82,8 +82,3 @@ 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 |