From 26067950d69b69d5a4d08e60742b04d263a121bd Mon Sep 17 00:00:00 2001 From: JP Bourget Date: Wed, 8 Apr 2020 01:33:15 -0400 Subject: [PATCH 1/2] try to support tooz in EL8/py3 --- CHANGELOG.rst | 1 + fixed-requirements.txt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4f3c9cc863..2627a0b4fa 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -60,6 +60,7 @@ Changed * Use ``pip-compile`` from ``pip-tools`` instead of ``pip-conflict-checker`` (improvement) #4896 * Refactor how inbound criteria for join task in orquesta workflow is evaluated to count by task completion instead of task transition. (improvement) +* Update tooz to v2.3.0 to apply fix for consul coordination session timeout (@punkrokk) Fixed ~~~~~ diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 661910fc75..67697148a0 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -41,7 +41,8 @@ six==1.13.0 # NOTE: sseclient has various issues which sometimes hang the connection for a long time, etc. sseclient-py==1.7 stevedore==1.30.1 -tooz==1.66.1 +tooz==1.66.1; python_version <= '2.7' +tooz==2.3.0; python_version >= '3.6' # Note: We use latest version of virtualenv which uses pip 19 virtualenv==16.6.0 webob==1.8.5 From 71ac08db29a8cf94358601eeae64b94a2370b332 Mon Sep 17 00:00:00 2001 From: JP Bourget Date: Wed, 8 Apr 2020 01:41:05 -0400 Subject: [PATCH 2/2] fix Changelog descr --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 2627a0b4fa..c04b982748 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -60,7 +60,7 @@ Changed * Use ``pip-compile`` from ``pip-tools`` instead of ``pip-conflict-checker`` (improvement) #4896 * Refactor how inbound criteria for join task in orquesta workflow is evaluated to count by task completion instead of task transition. (improvement) -* Update tooz to v2.3.0 to apply fix for consul coordination session timeout (@punkrokk) +* Updated and tested tooz to v2.3.0 to apply fix for consul coordination heartbeat (@punkrokk) Fixed ~~~~~