From 5afdc50435aed47f42b1097b3d40d6ff43315e8c Mon Sep 17 00:00:00 2001 From: bkhushboo Date: Thu, 6 Jan 2022 15:29:08 +0530 Subject: [PATCH 1/3] Add required dependency to support etcd3gw driver. --- fixed-requirements.txt | 2 ++ requirements.txt | 2 ++ st2common/in-requirements.txt | 2 ++ st2common/requirements.txt | 2 ++ 4 files changed, 8 insertions(+) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 55d3eb14bc..2706a5191d 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -11,6 +11,7 @@ cryptography==3.4.7 # Note: 0.20.0 removed select.poll() on which some of our code and libraries we # depend on rely eventlet==0.30.2 +etcd3gw==1.0.0 flex==6.14.1 gitpython==3.1.15 # Needed by gitpython, old versions used to bundle it @@ -59,6 +60,7 @@ importlib-metadata==3.10.1 sseclient-py==1.7 stevedore==1.30.1 tooz==2.8.0 +tenacity>=3.2.1,<7.0.0 # Note: virtualenv embeds wheels for pip, wheel, and setuptools. So pinning virtualenv pins those as well. # virtualenv==20.4.0 (<21) has pip==20.3.3 wheel==0.36.2 setuptools==51.3.3 virtualenv==20.4.0 diff --git a/requirements.txt b/requirements.txt index aa495cf67c..c4df9589c9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,6 +15,7 @@ chardet<3.1.0 cryptography==3.4.7 decorator==4.4.2 dnspython>=1.16.0,<2.0.0 +etcd3gw==1.0.0 eventlet==0.30.2 flex==6.14.1 git+https://github.com/StackStorm/logshipper.git@stackstorm_patched#egg=logshipper @@ -67,6 +68,7 @@ simplejson six==1.13.0 sseclient-py==1.7 stevedore==1.30.1 +tenacity>=3.2.1,<7.0.0 tooz==2.8.0 udatetime==0.0.16 unittest2 diff --git a/st2common/in-requirements.txt b/st2common/in-requirements.txt index 2e102a63e0..b2562fe92b 100644 --- a/st2common/in-requirements.txt +++ b/st2common/in-requirements.txt @@ -12,6 +12,7 @@ mongoengine networkx # used by networkx decorator +etcd3gw git+https://github.com/StackStorm/orquesta.git@v1.5.0#egg=orquesta git+https://github.com/StackStorm/st2-rbac-backend.git@master#egg=st2-rbac-backend oslo.config @@ -28,6 +29,7 @@ retrying semver six tooz +tenacity # Required by tooz - on new versions of tooz, all the backend dependencies need # to be installed manually zake diff --git a/st2common/requirements.txt b/st2common/requirements.txt index 315b1031e0..8707cb5ece 100644 --- a/st2common/requirements.txt +++ b/st2common/requirements.txt @@ -12,6 +12,7 @@ chardet<3.1.0 cryptography==3.4.7 decorator==4.4.2 dnspython>=1.16.0,<2.0.0 +etcd3gw==1.0.0 eventlet==0.30.2 flex==6.14.1 git+https://github.com/StackStorm/orquesta.git@v1.5.0#egg=orquesta @@ -39,6 +40,7 @@ retrying==1.3.3 routes==2.4.1 semver==2.13.0 six==1.13.0 +tenacity>=3.2.1,<7.0.0 tooz==2.8.0 udatetime==0.0.16 webob==1.8.7 From 9ee3d19f420983c0d2fd40170ba7bbe8b04a80df Mon Sep 17 00:00:00 2001 From: bkhushboo Date: Thu, 6 Jan 2022 19:19:50 +0530 Subject: [PATCH 2/3] Add changelog --- CHANGELOG.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f3b0d1d470..538051abb1 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -39,6 +39,10 @@ Fixed * Fix ``st2-self-check`` script reporting falsey success when the nested workflows runs failed. #5487 +* Add required dependency to support etcd3gw driver. #5528 + + Contributed by @khushboobhatia01 + 3.6.0 - October 29, 2021 ------------------------ From d47ebed182747e652a0649c0eb9847b1b066a894 Mon Sep 17 00:00:00 2001 From: bkhushboo Date: Sun, 9 Jan 2022 21:56:32 +0530 Subject: [PATCH 3/3] Retrigger CI