diff options
author | Éloi Rivard <eloi.rivard@nubla.fr> | 2024-09-11 23:01:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-09-11 21:01:43 +0000 |
commit | ebad618bf0f4a7cd8adb5c65d6025d320387b492 (patch) | |
tree | efb3e6e544c22f0e9061b55903cff51b0fcd50ea /synapse/rest/client/reporting.py | |
parent | Sliding Sync: Use Sliding Sync tables for sorting (#17693) (diff) | |
download | synapse-ebad618bf0f4a7cd8adb5c65d6025d320387b492.tar.xz |
import pydantic objects from the `_pydantic_compat` module (#17667)
This PR changes `from pydantic import BaseModel` to `from synapse._pydantic_compat import BaseModel` (as well as `constr`, `conbytes`, `conint`, `confloat`). It allows `check_pydantic_models.py` to mock those pydantic objects only in the synapse module, and not interfere with pydantic objects in external dependencies. This should solve the CI problems for #17144, which breaks because `check_pydantic_models.py` patches pydantic models from [scim2-models](https://scim2-models.readthedocs.io/). /cc @DMRobertson @gotmax23 fixes #17659 ### Pull Request Checklist <!-- Please read https://element-hq.github.io/synapse/latest/development/contributing_guide.html before submitting your pull request --> * [x] Pull request is based on the develop branch * [x] Pull request includes a [changelog file](https://element-hq.github.io/synapse/latest/development/contributing_guide.html#changelog). The entry should: - Be a short description of your change which makes sense to users. "Fixed a bug that prevented receiving messages from other servers." instead of "Moved X method from `EventStore` to `EventWorkerStore`.". - Use markdown where necessary, mostly for `code blocks`. - End with either a period (.) or an exclamation mark (!). - Start with a capital letter. - Feel free to credit yourself, by adding a sentence "Contributed by @github_username." or "Contributed by [Your Name]." to the end of the entry. * [x] [Code style](https://element-hq.github.io/synapse/latest/code_style.html) is correct (run the [linters](https://element-hq.github.io/synapse/latest/development/contributing_guide.html#run-the-linters))
Diffstat (limited to 'synapse/rest/client/reporting.py')
-rw-r--r-- | synapse/rest/client/reporting.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/synapse/rest/client/reporting.py b/synapse/rest/client/reporting.py |