From d3516167ab23fea77b9c834ce4066e7c6c1ceb8c Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 28 Sep 2024 14:50:01 +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: Idb0d7d46b149d600ac34442ad53e4d78713f7f2f --- requirements.txt | 2 +- trove/cmd/__init__.py | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index 6a2ea70385..5b5a48dd7b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ alembic>=1.8.0 pbr!=2.1.0,>=2.0.0 # Apache-2.0 -eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT +eventlet>=0.27.0 # MIT SQLAlchemy>=1.4.0 # MIT keystonemiddleware>=4.17.0 # Apache-2.0 Routes>=2.3.1 # MIT diff --git a/trove/cmd/__init__.py b/trove/cmd/__init__.py index bdb9af1a0d..c579ba3bd6 100644 --- a/trove/cmd/__init__.py +++ b/trove/cmd/__init__.py @@ -26,9 +26,3 @@ import os if not os.environ.get('NO_EVENTLET_MONKEYPATCH'): import eventlet eventlet.monkey_patch(all=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 # noqa - import threading # noqa - orig_threading.current_thread.__globals__['_active'] = threading._active