diff --git a/taskflow/utils/eventlet_utils.py b/taskflow/utils/eventlet_utils.py index cc26dfe1..335dd017 100644 --- a/taskflow/utils/eventlet_utils.py +++ b/taskflow/utils/eventlet_utils.py @@ -144,9 +144,7 @@ class GreenExecutor(futures.Executor): self._shutdown = True if wait: self._pool.waitall() - # NOTE(harlowja): Fixed in eventlet 0.15 (remove when able to use) - if not self._delayed_work.empty(): - self._delayed_work.join() + self._delayed_work.join() class _GreenWaiter(object): diff --git a/tox.ini b/tox.ini index bc912778..186b438f 100644 --- a/tox.ini +++ b/tox.ini @@ -61,14 +61,14 @@ basepython = python2.6 deps = {[testenv]deps} -r{toxinidir}/requirements-py2.txt MySQL-python - eventlet>=0.13.0 + eventlet>=0.15.1 SQLAlchemy>=0.7.8,<=0.7.99 [testenv:py27] deps = {[testenv]deps} -r{toxinidir}/requirements-py2.txt MySQL-python - eventlet>=0.13.0 + eventlet>=0.15.1 SQLAlchemy>=0.7.8,<=0.9.99 doc8 commands =