Skip to content

Commit

Permalink
chore(deps): update dependency pydantic to v2.10.3 (#618)
Browse files Browse the repository at this point in the history
* chore(deps): update dependency pydantic to v2.10.3

* fix: add temporary trivyignore

* fix test_synapse_with_mjolnir_from_refresh_is_up

* fix lint

* fix integration test

* Update test_charm.py

* Update conftest.py

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Amanda H. L. de Andrade Katz <amanda.katz@canonical.com>
Co-authored-by: Phan Trung Thanh <trung.thanh.phan@canonical.com>
  • Loading branch information
3 people authored Dec 11, 2024
1 parent 1e4da01 commit 3e51c5a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .trivyignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,7 @@ CVE-2024-52804
# Fix ongoing:
# https://github.com/element-hq/synapse/pull/17985
CVE-2024-53981
# The 3 following CVEs will be fixed by Synapse 1.120.2
CVE-2024-52805
CVE-2024-52815
CVE-2024-53863
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ deepdiff ==8.0.1
jinja2 ==3.1.4
jsonschema ==4.23.0
ops ==2.17.1
pydantic ==2.10.2
pydantic ==2.10.3
psycopg2-binary ==2.9.10
requests ==2.32.3
1 change: 1 addition & 0 deletions tests/integration/test_charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,7 @@ async def test_nginx_route_integration(
assert "Welcome to the Matrix" in response.text


@pytest.mark.usefixtures("postgresql_app")
@pytest.mark.mjolnir
async def test_synapse_enable_mjolnir(
ops_test: OpsTest,
Expand Down

0 comments on commit 3e51c5a

Please sign in to comment.