From fb46b21a92418c28fbd49acfb6b082876f32c8c4 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 28 Sep 2024 14:21:51 +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: I78745781056a397d9047de5484f265ff07a0ee2e --- neutron_dynamic_routing/cmd/eventlet/__init__.py | 6 ------ requirements.txt | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/neutron_dynamic_routing/cmd/eventlet/__init__.py b/neutron_dynamic_routing/cmd/eventlet/__init__.py index 20582e3a..363e66cf 100644 --- a/neutron_dynamic_routing/cmd/eventlet/__init__.py +++ b/neutron_dynamic_routing/cmd/eventlet/__init__.py @@ -14,9 +14,3 @@ import eventlet eventlet.monkey_patch() -# 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 diff --git a/requirements.txt b/requirements.txt index 28653b34..390da6f8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ # you find any incorrect lower bounds, let us know or propose a fix. 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 httplib2>=0.9.1 # MIT netaddr>=0.7.18 # BSD SQLAlchemy>=1.3.3 # MIT