From ffe7db85fff8d6d1812a2dcbf8e9b6a8c6f7b3ae Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 28 Sep 2024 14:26:29 +0900 Subject: [PATCH] Remove workaround for eventlet < 0.27.0 This code worked around a bug in eventlet[1] that has been fixed in 115103d5608cbe8f15df10e27eba1644f5364e95. The fix has been available in every eventlet release since v0.27.0. [1] https://github.com/eventlet/eventlet/issues/592 Co-Authored-By: Cyril Roelandt Change-Id: Ia9dc54a929ea2f69b871d099dd827d06efb22078 --- mistral/cmd/launch.py | 6 ------ requirements.txt | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/mistral/cmd/launch.py b/mistral/cmd/launch.py index 84f6c6063..ffe895d25 100644 --- a/mistral/cmd/launch.py +++ b/mistral/cmd/launch.py @@ -25,12 +25,6 @@ eventlet.monkey_patch( socket=True, thread=False if '--use-debugger' in sys.argv else True, time=True) -# Monkey patch the original current_thread to use the up-to-date _active -# global variable. See https://bugs.launchpad.net/bugs/1863021 and -# https://github.com/eventlet/eventlet/issues/592 -import __original_module_threading as orig_threading -import threading # noqa -orig_threading.current_thread.__globals__['_active'] = threading._active import os diff --git a/requirements.txt b/requirements.txt index 75edb689c..3fac56998 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ alembic>=0.9.6 # MIT croniter>=0.3.4 # MIT License cachetools>=2.0.0 # MIT License dogpile.cache>=0.6.2 # BSD -eventlet>=0.26.0 # MIT +eventlet>=0.27.0 # MIT Jinja2>=2.10 # BSD License (3 clause) jsonschema>=3.2.0 # MIT keystonemiddleware>=4.18.0 # Apache-2.0