Skip to content

Commit f120b59

Browse files
authored
Merge pull request #670 from freyes/pin-websockets-caracal
Pin websockets library [caracal]
2 parents 6787575 + 5a15016 commit f120b59

File tree

4 files changed

+19
-1
lines changed

4 files changed

+19
-1
lines changed

.github/workflows/tox.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,13 @@ jobs:
6969
needs: build
7070
steps:
7171
- uses: actions/checkout@v1
72+
- name: Free Disk Space (Ubuntu)
73+
uses: jlumbroso/free-disk-space@main
74+
with:
75+
tool-cache: false
76+
large-packages: false
77+
docker-images: false
78+
swap-storage: false
7279
- name: Install dependencies
7380
run: |
7481
set -euxo pipefail
@@ -110,7 +117,7 @@ jobs:
110117
juju-crashdump -m $model -o logs/
111118
- name: upload logs on failure
112119
if: failure()
113-
uses: actions/upload-artifact@v2
120+
uses: actions/upload-artifact@v4
114121
with:
115122
name: test-run-logs-and-crashdump
116123
path: logs/

requirements.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,7 @@ sphinx
3535
sphinxcontrib-asyncio
3636
# https://github.com/go-macaroon-bakery/py-macaroon-bakery/issues/94
3737
macaroonbakery!=1.3.3
38+
39+
# NOTE(freyes): Set upper bound for websockets until libjuju is compatible with
40+
# newer versions. See https://github.com/juju/python-libjuju/pull/1208
41+
websockets<13.0.0

setup.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343

4444
# https://github.com/go-macaroon-bakery/py-macaroon-bakery/issues/94
4545
'macaroonbakery != 1.3.3',
46+
# NOTE(freyes): Set upper bound for websockets until libjuju is compatible
47+
# with newer versions. See https://github.com/juju/python-libjuju/pull/1208
48+
'websockets<13.0.0',
4649
]
4750
if os.environ.get("TEST_JUJU3"):
4851
install_require.append('juju')

test-requirements.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ keystoneauth1
1616
oslo.config
1717
python-novaclient
1818
tenacity>8.2.0
19+
# NOTE(freyes): Set upper bound for websockets until libjuju is compatible with
20+
# newer versions. See https://github.com/juju/python-libjuju/pull/1208
21+
websockets<13.0.0
22+
1923
# To force the installation of an specific version of libjuju use a constraints
2024
# file, e.g.: `env PIP_CONSTRAINTS=./constraints-juju31.txt tox -e func-target`
2125
juju

0 commit comments

Comments
 (0)