Merge branch '2/main' into renovate/pydantic-2.x

canonical · Dec 11, 2024 · f7b19e0 · f7b19e0
2 parents 13f9c25 + 1e4da01
commit f7b19e0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-boto3 ==1.35.73
+boto3 ==1.35.76
 cosl ==0.0.45
 deepdiff ==8.0.1
 jinja2 ==3.1.4

diff --git a/tests/integration/test_charm.py b/tests/integration/test_charm.py
@@ -410,6 +410,7 @@ async def test_synapse_enable_mjolnir(
 
 
 # pylint: disable=too-many-positional-arguments
+@pytest.mark.usefixtures("postgresql_app")
 @pytest.mark.mjolnir
 async def test_synapse_with_mjolnir_from_refresh_is_up(
     ops_test: OpsTest,