From 6f72a8d1c25034fcb6f43baf7ba154aad8f976db Mon Sep 17 00:00:00 2001 From: Khushboo Date: Sat, 2 Apr 2022 11:39:08 +0530 Subject: [PATCH 1/4] Pinning tenacity --- fixed-requirements.txt | 1 + requirements.txt | 1 + st2common/in-requirements.txt | 1 + st2common/requirements.txt | 1 + 4 files changed, 4 insertions(+) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 58dc5ed0d0..d43b25f127 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -63,6 +63,7 @@ importlib-metadata==3.10.1 # NOTE: sseclient has various issues which sometimes hang the connection for a long time, etc. sseclient-py==1.7 stevedore==1.30.1 +tenacity>=3.2.1,<7.0.0 tooz==2.8.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 diff --git a/requirements.txt b/requirements.txt index 4a31b72f35..062230f4ea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -70,6 +70,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 ce1d2ae920..921ee720f3 100644 --- a/st2common/in-requirements.txt +++ b/st2common/in-requirements.txt @@ -29,6 +29,7 @@ requests retrying semver six +tenacity tooz # Required by tooz - on new versions of tooz, all the backend dependencies need # to be installed manually diff --git a/st2common/requirements.txt b/st2common/requirements.txt index e57351d6aa..ed817677f0 100644 --- a/st2common/requirements.txt +++ b/st2common/requirements.txt @@ -41,6 +41,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 8e908a5435a5a70a80d7fb4839e2fb8a663b1a6c Mon Sep 17 00:00:00 2001 From: Khushboo Date: Sat, 2 Apr 2022 11:58:04 +0530 Subject: [PATCH 2/4] Add Changelog --- CHANGELOG.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e353b69c17..a75f3c97f9 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -40,6 +40,10 @@ Fixed Contributed by Amanda McGuinness (@amanda11 intive) #5581 +* Downgrade tenacity as tooz dependency on tenacity has always been < 7.0.0 #5607 + + Contributed by @khushboobhatia01 + Added ~~~~~ From 0fcb87d57e3029d19ba4cb47e0391e3652aa1b1a Mon Sep 17 00:00:00 2001 From: Khushboo Date: Sat, 2 Apr 2022 19:16:55 +0530 Subject: [PATCH 3/4] Trigger CI From 9d49b814fe86cdf2771df90d59279a077deabfc0 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Sat, 2 Apr 2022 10:51:46 -0500 Subject: [PATCH 4/4] clean up gha caches --- .github/workflows/microbenchmarks.yaml | 6 ++++-- .github/workflows/orquesta-integration-tests.yaml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/microbenchmarks.yaml b/.github/workflows/microbenchmarks.yaml index 674985fe28..60016966c9 100644 --- a/.github/workflows/microbenchmarks.yaml +++ b/.github/workflows/microbenchmarks.yaml @@ -87,8 +87,10 @@ jobs: virtualenv ~/virtualenv key: ${{ runner.os }}-v4-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt') }} - restore-keys: | - ${{ runner.os }}-v4-python-${{ matrix.python }}- + # Don't use alternative key as if requirements.txt has altered we + # don't want to retrieve previous cache + #restore-keys: | + # ${{ runner.os }}-v4-python-${{ matrix.python }}- - name: Cache APT Dependencies id: cache-apt-deps uses: actions/cache@v2 diff --git a/.github/workflows/orquesta-integration-tests.yaml b/.github/workflows/orquesta-integration-tests.yaml index 1e083e62a9..3740950745 100644 --- a/.github/workflows/orquesta-integration-tests.yaml +++ b/.github/workflows/orquesta-integration-tests.yaml @@ -143,8 +143,10 @@ jobs: # !virtualenv/lib/python*/site-packages/st2* # !virtualenv/bin/st2* key: ${{ runner.os }}-v4-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt') }} - restore-keys: | - ${{ runner.os }}-v4-python-${{ matrix.python }}- + # Don't use alternative key as if requirements.txt has altered we + # don't want to retrieve previous cache + #restore-keys: | + # ${{ runner.os }}-v4-python-${{ matrix.python }}- - name: Cache APT Dependencies id: cache-apt-deps uses: actions/cache@v2