diff --git a/lower-constraints.txt b/lower-constraints.txt index 33c3ca66c..a37b2ff28 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -1,10 +1,10 @@ alembic==0.8.10 -autobahn==0.17.1 +autobahn==20.7.1 Babel==2.3.4 coverage==4.0 ddt==1.0.1 doc8==0.6.0 -dogpile.cache==0.6.2 +dogpile.cache==1.0.2 enum34==1.0.4;python_version=='2.7' falcon==1.1.0 fixtures==3.0.0 @@ -22,7 +22,7 @@ os-testr==1.0.0 oslo.cache==1.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 @@ -38,20 +38,20 @@ osprofiler==1.4.0 pbr==2.0.0 Pygments==2.2.0 pymongo==3.6.0 -PyMySQL==0.7.6 +PyMySQL==0.8.0 python-keystoneclient==3.8.0 python-memcached==1.56 python-subunit==1.0.0 python-swiftclient==3.2.0 pytz==2013.6 -PyYAML==3.12 +PyYAML==3.13 redis==3.0.0 requests==2.14.2 requestsexceptions==1.2.0 restructuredtext-lint==1.1.1 rfc3986==0.3.1 six==1.10.0 -SQLAlchemy==1.0.10 +SQLAlchemy==1.3.19 sqlalchemy-migrate==0.11.0 stestr==2.0.0 stevedore==1.20.0 diff --git a/requirements.txt b/requirements.txt index 008da0801..37c41bcd0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,7 @@ six>=1.10.0 # MIT oslo.cache>=1.26.0 # Apache-2.0 oslo.config>=5.2.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 @@ -28,7 +28,7 @@ oslo.upgradecheck>=0.1.0 # Apache-2.0 oslo.utils>=3.33.0 # Apache-2.0 oslo.policy>=1.30.0 # Apache-2.0 osprofiler>=1.4.0 # Apache-2.0 -SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT -autobahn>=0.17.1 # MIT License +SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.3.19 # MIT +autobahn>=20.7.1 # MIT License requests>=2.14.2 # Apache-2.0 futurist>=1.2.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index ab39b5d5d..3eb1d9dd4 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -12,7 +12,7 @@ redis>=3.0.0 # MIT pymongo>=3.6.0 # Apache-2.0 python-swiftclient>=3.2.0 # Apache-2.0 websocket-client>=0.44.0 # LGPLv2+ -PyMySQL>=0.7.6 # MIT License +PyMySQL>=0.8.0 # MIT License # Unit testing coverage!=4.4,>=4.0 # Apache-2.0 @@ -23,7 +23,6 @@ fixtures>=3.0.0 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD testtools>=2.2.0 # MIT -oslo.db>=4.27.0 # Apache-2.0 testresources>=2.0.0 # Apache-2.0/BSD oslotest>=3.2.0 # Apache-2.0 stestr>=2.0.0 diff --git a/tools/test-setup.sh b/tools/test-setup.sh index 2bf33a742..3cf57b233 100755 --- a/tools/test-setup.sh +++ b/tools/test-setup.sh @@ -23,11 +23,11 @@ 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 " SET default_storage_engine=MYISAM; DROP DATABASE IF EXISTS openstack_citest; - CREATE DATABASE openstack_citest CHARACTER SET utf8;" \ No newline at end of file + CREATE DATABASE openstack_citest CHARACTER SET utf8;"