From 93142ab3bfc88a178a647433fce076dabcea86da Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Tue, 2 Mar 2021 12:53:06 -0500 Subject: [PATCH 1/3] Bump the mypy versions. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 08ba4eb764b7..bbd9e7862a01 100755 --- a/setup.py +++ b/setup.py @@ -102,7 +102,7 @@ def exec_file(path_segments): "flake8", ] -CONDITIONAL_REQUIREMENTS["mypy"] = ["mypy==0.790", "mypy-zope==0.2.8"] +CONDITIONAL_REQUIREMENTS["mypy"] = ["mypy==0.812", "mypy-zope==0.2.11"] # Dependencies which are exclusively required by unit test code. This is # NOT a list of all modules that are necessary to run the unit tests. From 2b082164560890cbf81ee981ef51a141d22cdced Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Tue, 2 Mar 2021 11:31:57 -0500 Subject: [PATCH 2/3] Ensure that namedtuples use the proper name. --- synapse/replication/tcp/streams/_base.py | 2 +- synapse/storage/roommember.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/synapse/replication/tcp/streams/_base.py b/synapse/replication/tcp/streams/_base.py index 38809b5b7c7c..f45e7a8c8914 100644 --- a/synapse/replication/tcp/streams/_base.py +++ b/synapse/replication/tcp/streams/_base.py @@ -502,7 +502,7 @@ class AccountDataStream(Stream): """Global or per room account data was changed""" AccountDataStreamRow = namedtuple( - "AccountDataStream", + "AccountDataStreamRow", ("user_id", "room_id", "data_type"), # str # Optional[str] # str ) diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py index f152f63321f4..d2ff4da6b9fe 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py @@ -25,7 +25,7 @@ ) GetRoomsForUserWithStreamOrdering = namedtuple( - "_GetRoomsForUserWithStreamOrdering", ("room_id", "event_pos") + "GetRoomsForUserWithStreamOrdering", ("room_id", "event_pos") ) From e271d900d21e62ba8a6097d9263965e27af8e326 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Tue, 2 Mar 2021 12:54:21 -0500 Subject: [PATCH 3/3] Newsfragment --- changelog.d/9529.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/9529.misc diff --git a/changelog.d/9529.misc b/changelog.d/9529.misc new file mode 100644 index 000000000000..b9021a26b406 --- /dev/null +++ b/changelog.d/9529.misc @@ -0,0 +1 @@ +Bump the versions of mypy and mypy-zope used for static type checking.