Skip to content

Commit

Permalink
Merge pull request #671 from freyes/pin-websockets-bobcat
Browse files Browse the repository at this point in the history
Pin websockets library [bobcat]
  • Loading branch information
MylesJP authored Nov 27, 2024
2 parents d29ef52 + 8e83fd5 commit a68d080
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 @@ -45,6 +45,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 @@ -80,7 +87,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 @@ -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
3 changes: 3 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
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

# 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
Expand Down

0 comments on commit a68d080

Please sign in to comment.