Merge "Enable eventlet dependency on Python 3"

requirements-py3.txt

@@ -12,6 +12,11 @@ stevedore>=1.3.0  # Apache-2.0
 # for jsonutils
 six>=1.9.0
 
+# FIXME(markmc): remove this when the drivers no longer
+# import eventlet
+
+eventlet>=0.17.3
+
 # for the routing notifier
 PyYAML>=3.1.0
 
@@ -20,3 +25,19 @@ kombu>=2.5.0
 
 # middleware
 oslo.middleware>=1.0.0                  # Apache-2.0
+
+# FIXME: concurrent.futures is part of the Python stdlib since Python 3.2,
+# but the requirements is still needed because of a bug in tox:
+# https://bitbucket.org/hpk42/tox/issue/236/tox-must-create-the-source-distribution
+#
+# Tox builds a source distribution with "python setup.py sdist" which uses
+# requirements.txt even if tox wants to build the py34 virtual environment.
+# As a consequence, oslo.messaging.egg_info/requires.txt contains futures
+# and oslo_messaging.tests.test_opts.OptsTestCase.test_entry_point fails.
+#
+# for the futures based executor
+futures>=2.1.6
+
+# needed by the aioeventlet executor
+aioeventlet>=0.4
+trollius>=1.0

requirements.txt

@@ -17,7 +17,7 @@ six>=1.9.0
 # FIXME(markmc): remove this when the drivers no longer
 # import eventlet
 
-eventlet>=0.16.1,!=0.17.0
+eventlet>=0.17.3
 
 # for the routing notifier
 PyYAML>=3.1.0