Skip to content

Commit f1b0f9a

Browse files
Bump mypy from 1.11.2 to 1.12.1 and fix new typechecking errors (#17999)
Supersedes #17958. Awkwardly, the changes made to fix the mypy errors in 1.12.1 cause errors in 1.11.2. So you'll need to update your mypy version to 1.12.1 to eliminate typechecking errors during developing.
1 parent f1ecf46 commit f1b0f9a

File tree

7 files changed

+49
-43
lines changed

7 files changed

+49
-43
lines changed

changelog.d/17999.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Bump mypy from 1.11.2 to 1.12.1.

poetry.lock

Lines changed: 35 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

synapse/config/repository.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import logging
2323
import os
2424
from typing import Any, Dict, List, Tuple
25-
from urllib.request import getproxies_environment # type: ignore
25+
from urllib.request import getproxies_environment
2626

2727
import attr
2828

synapse/handlers/appservice.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -896,10 +896,10 @@ async def claim_e2e_one_time_keys(
896896
results = await make_deferred_yieldable(
897897
defer.DeferredList(
898898
[
899-
run_in_background(
899+
run_in_background( # type: ignore[call-overload]
900900
self.appservice_api.claim_client_keys,
901901
# We know this must be an app service.
902-
self.store.get_app_service_by_id(service_id), # type: ignore[arg-type]
902+
self.store.get_app_service_by_id(service_id),
903903
service_query,
904904
)
905905
for service_id, service_query in query_by_appservice.items()
@@ -952,10 +952,10 @@ async def query_keys(
952952
results = await make_deferred_yieldable(
953953
defer.DeferredList(
954954
[
955-
run_in_background(
955+
run_in_background( # type: ignore[call-overload]
956956
self.appservice_api.query_keys,
957957
# We know this must be an app service.
958-
self.store.get_app_service_by_id(service_id), # type: ignore[arg-type]
958+
self.store.get_app_service_by_id(service_id),
959959
service_query,
960960
)
961961
for service_id, service_query in query_by_appservice.items()

synapse/push/bulk_push_rule_evaluator.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ async def _action_for_event_by_user(
371371
"Deferred[Tuple[int, Tuple[dict, Optional[int]], Dict[str, Dict[str, JsonValue]], Mapping[str, ProfileInfo]]]",
372372
gather_results(
373373
(
374-
run_in_background( # type: ignore[call-arg]
374+
run_in_background( # type: ignore[call-overload]
375375
self.store.get_number_joined_users_in_room,
376376
event.room_id, # type: ignore[arg-type]
377377
),
@@ -382,10 +382,10 @@ async def _action_for_event_by_user(
382382
event_id_to_event,
383383
),
384384
run_in_background(self._related_events, event),
385-
run_in_background( # type: ignore[call-arg]
385+
run_in_background( # type: ignore[call-overload]
386386
self.store.get_subset_users_in_room_with_profiles,
387-
event.room_id, # type: ignore[arg-type]
388-
rules_by_user.keys(), # type: ignore[arg-type]
387+
event.room_id,
388+
rules_by_user.keys(),
389389
),
390390
),
391391
consumeErrors=True,

synapse/rest/client/room.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -783,9 +783,9 @@ async def on_GET(
783783
# decorator on `get_number_joined_users_in_room` doesn't play well with
784784
# the type system. Maybe in the future, it can use some ParamSpec
785785
# wizardry to fix it up.
786-
room_member_count_deferred = run_in_background( # type: ignore[call-arg]
786+
room_member_count_deferred = run_in_background( # type: ignore[call-overload]
787787
self.store.get_number_joined_users_in_room,
788-
room_id, # type: ignore[arg-type]
788+
room_id,
789789
)
790790

791791
requester = await self.auth.get_user_by_req(request, allow_guest=True)

tests/replication/http/test__base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def __init__(self, hs: HomeServer):
4646
self.clock = hs.get_clock()
4747

4848
@staticmethod
49-
async def _serialize_payload() -> JsonDict:
49+
async def _serialize_payload(**kwargs: ReplicationEndpoint) -> JsonDict:
5050
return {}
5151

5252
@cancellable
@@ -68,7 +68,7 @@ def __init__(self, hs: HomeServer):
6868
self.clock = hs.get_clock()
6969

7070
@staticmethod
71-
async def _serialize_payload() -> JsonDict:
71+
async def _serialize_payload(**kwargs: ReplicationEndpoint) -> JsonDict:
7272
return {}
7373

7474
async def _handle_request( # type: ignore[override]

0 commit comments

Comments
 (0)