Skip to content

Commit

Permalink
Merge pull request #670 from freyes/pin-websockets-caracal
Browse files Browse the repository at this point in the history
Pin websockets library [caracal]
  • Loading branch information
MylesJP authored Nov 27, 2024
2 parents 6787575 + 5a15016 commit f120b59
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 1 deletion.
9 changes: 8 additions & 1 deletion .github/workflows/tox.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ jobs:
needs: build
steps:
- uses: actions/checkout@v1
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@main
with:
tool-cache: false
large-packages: false
docker-images: false
swap-storage: false
- name: Install dependencies
run: |
set -euxo pipefail
Expand Down Expand Up @@ -110,7 +117,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/
Expand Down
4 changes: 4 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,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
3 changes: 3 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,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',
]
if os.environ.get("TEST_JUJU3"):
install_require.append('juju')
Expand Down
4 changes: 4 additions & 0 deletions test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ keystoneauth1
oslo.config
python-novaclient
tenacity>8.2.0
# 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

# To force the installation of an specific version of libjuju use a constraints
# file, e.g.: `env PIP_CONSTRAINTS=./constraints-juju31.txt tox -e func-target`
juju
Expand Down

0 comments on commit f120b59

Please sign in to comment.