Merge branch 'master' into 3852.json-welcome-page

This commit is contained in:
meejah 2022-01-07 11:00:55 -07:00
commit 4406aee8ab
2 changed files with 3 additions and 1 deletions

0
newsfragments/3856.minor Normal file
View File

View File

@ -409,7 +409,9 @@ setup(name="tahoe-lafs", # also set in __init__.py
"html5lib",
"junitxml",
"tenacity",
"paramiko",
# Pin old version until
# https://github.com/paramiko/paramiko/issues/1961 is fixed.
"paramiko < 2.9",
"pytest-timeout",
# Does our OpenMetrics endpoint adhere to the spec:
"prometheus-client == 0.11.0",