From 4484ab691e1e925077ac5d198b35b6869d438f8f Mon Sep 17 00:00:00 2001
From: David Robertson <davidr@element.io>
Date: Mon, 14 Nov 2022 13:03:37 +0000
Subject: [PATCH 1/2] Remove unused type-ignores

Oversights in #14427 and #14429.
---
 scripts-dev/release.py    | 4 +---
 synapse/streams/events.py | 9 ++++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/scripts-dev/release.py b/scripts-dev/release.py
index c82c58c54b05..bf47b6c713ff 100755
--- a/scripts-dev/release.py
+++ b/scripts-dev/release.py
@@ -219,9 +219,7 @@ def _prepare() -> None:
                 update_branch(repo)
 
             # Create the new release branch
-            # Type ignore will no longer be needed after GitPython 3.1.28.
-            # See https://github.com/gitpython-developers/GitPython/pull/1419
-            repo.create_head(release_branch_name, commit=base_branch)  # type: ignore[arg-type]
+            repo.create_head(release_branch_name, commit=base_branch)
 
         # Special-case SyTest: we don't actually prepare any files so we may
         # as well push it now (and only when we create a release branch;
diff --git a/synapse/streams/events.py b/synapse/streams/events.py
index bcd840bd88c1..f331e1af16e0 100644
--- a/synapse/streams/events.py
+++ b/synapse/streams/events.py
@@ -45,9 +45,12 @@ def get_sources(self) -> Iterator[Tuple[str, EventSource]]:
 class EventSources:
     def __init__(self, hs: "HomeServer"):
         self.sources = _EventSourcesInner(
-            # mypy thinks attribute.type is `Optional`, but we know it's never `None` here since
-            # all the attributes of `_EventSourcesInner` are annotated.
-            *(attribute.type(hs) for attribute in attr.fields(_EventSourcesInner))  # type: ignore[misc]
+            # mypy previously warned that attribute.type is `Optional`, but we know it's
+            # never `None` here since all the attributes of `_EventSourcesInner` are
+            # annotated.
+            # As of the stubs in attrs 22.1.0, `attr.fields()` now returns Any,
+            # so the call to `attribute.type` is not checked.
+            *(attribute.type(hs) for attribute in attr.fields(_EventSourcesInner))
         )
         self.store = hs.get_datastores().main
 

From 45c27d8520b57296b8d2af0e58f65169398d816e Mon Sep 17 00:00:00 2001
From: David Robertson <davidr@element.io>
Date: Mon, 14 Nov 2022 13:07:08 +0000
Subject: [PATCH 2/2] Changelog

---
 changelog.d/14433.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/14433.misc

diff --git a/changelog.d/14433.misc b/changelog.d/14433.misc
new file mode 100644
index 000000000000..08a350b13b48
--- /dev/null
+++ b/changelog.d/14433.misc
@@ -0,0 +1 @@
+Fix mypy errors introduced by bumping the locked version of `attrs` and `gitpython`.