Browse Source

Remove unused type-ignores (#14433)

* Remove unused type-ignores

Oversights in #14427 and #14429.

* Changelog
tags/v1.72.0rc1
David Robertson 1 year ago
committed by GitHub
parent
commit
2cc592584a
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
  1. +1
    -0
      changelog.d/14433.misc
  2. +1
    -3
      scripts-dev/release.py
  3. +6
    -3
      synapse/streams/events.py

+ 1
- 0
changelog.d/14433.misc View File

@@ -0,0 +1 @@
Fix mypy errors introduced by bumping the locked version of `attrs` and `gitpython`.

+ 1
- 3
scripts-dev/release.py View File

@@ -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;


+ 6
- 3
synapse/streams/events.py View File

@@ -45,9 +45,12 @@ class _EventSourcesInner:
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



Loading…
Cancel
Save