OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Make `configure_workers_and_start` script used in Complement tests compatible with older versions of Python. (#15275)

madlittlemods/add-stable-unstable-version-for-jump-to-date
reivilibre 2023-03-17 13:02:30 +00:00 committed by GitHub
parent afb216c202
commit 66fc166b96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/15275.misc Normal file
View File

@ -0,0 +1 @@
Make `configure_workers_and_start` script used in Complement tests compatible with older versions of Python.

2
docker/configure_workers_and_start.py
View File

@ -422,7 +422,7 @@ def add_worker_roles_to_shared_config(
def merge_worker_template_configs( def merge_worker_template_configs(
existing_dict: Dict[str, Any] | None, existing_dict: Optional[Dict[str, Any]],
to_be_merged_dict: Dict[str, Any], to_be_merged_dict: Dict[str, Any],
) -> Dict[str, Any]: ) -> Dict[str, Any]:
"""When given an existing dict of worker template configuration consisting with both """When given an existing dict of worker template configuration consisting with both