From 9b5291ca36065c812cbd26fd7fef9332f7ffe662 Mon Sep 17 00:00:00 2001 From: Felipe Reyes Date: Tue, 26 Nov 2024 03:34:35 -0800 Subject: [PATCH] Pin websockets library (#669) * Pin websockets library Set upper bound for websockets until libjuju is compatible with newer versions. See https://github.com/juju/python-libjuju/pull/1208 * Migrate to actions/upload-artifact@v4 (cherry picked from commit d758d6dde3cf7af0d9f1bf3e90c80ca83c14f7b5) (cherry picked from commit e8d72f465b9ad033821cad30c75a5dae50076818) --- .github/workflows/tox.yaml | 2 +- requirements.txt | 4 ++++ setup.py | 3 +++ test-requirements.txt | 4 ++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tox.yaml b/.github/workflows/tox.yaml index 5f66ab5a6..6517bd904 100644 --- a/.github/workflows/tox.yaml +++ b/.github/workflows/tox.yaml @@ -80,7 +80,7 @@ jobs: juju crashdump -m $model -o logs/ - name: upload logs on failure if: failure() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: test-run-logs-and-crashdump path: logs/ diff --git a/requirements.txt b/requirements.txt index 0b68b8b95..15fbba663 100644 --- a/requirements.txt +++ b/requirements.txt @@ -37,3 +37,7 @@ sphinx sphinxcontrib-asyncio # https://github.com/go-macaroon-bakery/py-macaroon-bakery/issues/94 macaroonbakery!=1.3.3 + +# NOTE(freyes): Set upper bound for websockets until libjuju is compatible with +# newer versions. See https://github.com/juju/python-libjuju/pull/1208 +websockets<13.0.0 diff --git a/setup.py b/setup.py index 2d41ffcf9..b2ac4df22 100644 --- a/setup.py +++ b/setup.py @@ -44,6 +44,9 @@ # https://github.com/go-macaroon-bakery/py-macaroon-bakery/issues/94 'macaroonbakery != 1.3.3', + # NOTE(freyes): Set upper bound for websockets until libjuju is compatible + # with newer versions. See https://github.com/juju/python-libjuju/pull/1208 + 'websockets<13.0.0', ] tests_require = [ diff --git a/test-requirements.txt b/test-requirements.txt index 722c6a98e..3e886c387 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -16,6 +16,10 @@ keystoneauth1 oslo.config python-novaclient tenacity +# NOTE(freyes): Set upper bound for websockets until libjuju is compatible with +# newer versions. See https://github.com/juju/python-libjuju/pull/1208 +websockets<13.0.0 + # pinned until 3.0 regressions are handled: https://github.com/openstack-charmers/zaza/issues/545 juju<3.0 # https://github.com/go-macaroon-bakery/py-macaroon-bakery/issues/94