Merge "Remove python3 specific test-requirements file."

requirements.txt

@@ -6,7 +6,7 @@ pbr<2.0,>=0.11
 SQLAlchemy<1.1.0,>=0.9.7
 boto>=2.32.1
 decorator>=3.4.0
-eventlet>=0.17.3
+eventlet>=0.17.4
 Jinja2>=2.6 # BSD License (3 clause)
 keystonemiddleware>=1.5.0
 lxml>=2.3
@@ -33,7 +33,7 @@ six>=1.9.0
 stevedore>=1.5.0 # Apache-2.0
 setuptools
 websockify<0.7,>=0.6.0
-oslo.concurrency>=2.0.0 # Apache-2.0
+oslo.concurrency>=2.1.0 # Apache-2.0
 oslo.config>=1.11.0 # Apache-2.0
 oslo.context>=0.2.0 # Apache-2.0
 oslo.log>=1.2.0 # Apache-2.0
@@ -41,10 +41,10 @@ oslo.serialization>=1.4.0 # Apache-2.0
 oslo.utils>=1.6.0 # Apache-2.0
 oslo.db>=1.10.0 # Apache-2.0
 oslo.rootwrap>=2.0.0 # Apache-2.0
-oslo.messaging>=1.8.0 # Apache-2.0
+oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0
 oslo.i18n>=1.5.0 # Apache-2.0
 rfc3986>=0.2.0 # Apache-2.0
 oslo.middleware!=2.0.0,>=1.2.0 # Apache-2.0
 psutil<2.0.0,>=1.1.1
-oslo.versionedobjects>=0.3.0
+oslo.versionedobjects!=0.5.0,>=0.3.0
 alembic>=0.7.2

test-requirements-py3.txt

@@ -1,29 +0,0 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-
-hacking<0.11,>=0.10.0
-coverage>=3.6
-discover
-fixtures>=0.3.14
-mock>=1.0
-mox3>=0.7.0
-PyMySQL>=0.6.2 # MIT License
-psycopg2
-python-barbicanclient>=3.0.1
-python-ironicclient>=0.2.1
-python-subunit>=0.0.18
-requests-mock>=0.6.0 # Apache-2.0
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
-oslosphinx>=2.5.0 # Apache-2.0
-oslotest>=1.5.1 # Apache-2.0
-testrepository>=0.0.18
-testtools>=1.4.0
-tempest-lib>=0.5.0
-
-# vmwareapi driver specific dependencies
-# FIXME(haypo): oslo.vmware 0.12.0 still requires suds which is not compatible
-# with Python 3. Next oslo.vmware will uses suds-jurko. Disable the dependency
-# until the next oslo.vmware release. Related change:
-# https://review.openstack.org/#/c/180087/
-#oslo.vmware>=0.11.1                     # Apache-2.0

test-requirements.txt

@@ -5,11 +5,12 @@
 hacking<0.11,>=0.10.0
 coverage>=3.6
 discover
-fixtures>=0.3.14
+fixtures>=1.3.1
 mock>=1.0
 mox3>=0.7.0
-MySQL-python
+MySQL-python;python_version=='2.7'
 psycopg2
+PyMySQL>=0.6.2 # MIT License
 python-barbicanclient>=3.0.1
 python-ironicclient>=0.2.1
 python-subunit>=0.0.18
@@ -19,7 +20,7 @@ oslosphinx>=2.5.0 # Apache-2.0
 oslotest>=1.5.1 # Apache-2.0
 testrepository>=0.0.18
 testtools>=1.4.0
-tempest-lib>=0.5.0
+tempest-lib>=0.6.1
 
 # vmwareapi driver specific dependencies
 oslo.vmware>=0.13.1 # Apache-2.0

tox.ini

@@ -39,7 +39,7 @@ setenv =
     {[testenv]setenv}
     OS_TEST_DBAPI_ADMIN_CONNECTION=mysql+pymysql://openstack_citest:openstack_citest@localhost/;postgresql://openstack_citest:openstack_citest@localhost/postgres;sqlite://
 deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements-py3.txt
+       -r{toxinidir}/test-requirements.txt
 commands =
   find . -type f -name "*.pyc" -delete
   python -m testtools.run \