Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Simplify untyped-defs config in mypy.ini #12790

Merged
DMRobertson merged 3 commits into from
May 19, 2022
Merged

Simplify untyped-defs config in mypy.ini #12790

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a551092
Simplify untyped-defs config in mypy.ini
May 18, 2022
0757476
Changelog
May 18, 2022
4c6207f
Restore epoll comment
May 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/12790.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Simplify `disallow_untyped_defs` config in `mypy.ini`.
175 changes: 17 additions & 158 deletions mypy.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ warn_unreachable = True
warn_unused_ignores = True
local_partial_types = True
no_implicit_optional = True
disallow_untyped_defs = True

files =
docker/,
Expand Down Expand Up @@ -86,177 +87,35 @@ exclude = (?x)
|tests/utils.py
)$

[mypy-synapse._scripts.*]
disallow_untyped_defs = True

[mypy-synapse.api.*]
disallow_untyped_defs = True

[mypy-synapse.app.*]
disallow_untyped_defs = True

[mypy-synapse.appservice.*]
disallow_untyped_defs = True

[mypy-synapse.config.*]
disallow_untyped_defs = True

[mypy-synapse.crypto.*]
disallow_untyped_defs = True

[mypy-synapse.event_auth]
disallow_untyped_defs = True

[mypy-synapse.events.*]
disallow_untyped_defs = True

[mypy-synapse.federation.*]
disallow_untyped_defs = True

[mypy-synapse.federation.transport.client]
disallow_untyped_defs = False

[mypy-synapse.groups.*]
disallow_untyped_defs = True

[mypy-synapse.handlers.*]
disallow_untyped_defs = True

[mypy-synapse.http.federation.*]
disallow_untyped_defs = True

[mypy-synapse.http.connectproxyclient]
disallow_untyped_defs = True

[mypy-synapse.http.proxyagent]
disallow_untyped_defs = True

[mypy-synapse.http.request_metrics]
disallow_untyped_defs = True

[mypy-synapse.http.server]
disallow_untyped_defs = True

[mypy-synapse.logging._remote]
disallow_untyped_defs = True

[mypy-synapse.logging.context]
disallow_untyped_defs = True
[mypy-synapse.http.client]
disallow_untyped_defs = False

[mypy-synapse.logging.formatter]
disallow_untyped_defs = True
[mypy-synapse.http.matrixfederationclient]
disallow_untyped_defs = False

[mypy-synapse.logging.handlers]
disallow_untyped_defs = True
[mypy-synapse.logging.opentracing]
disallow_untyped_defs = False

[mypy-synapse.metrics.*]
disallow_untyped_defs = True
[mypy-synapse.logging.scopecontextmanager]
disallow_untyped_defs = False

[mypy-synapse.metrics._reactor_metrics]
# This module imports select.epoll. That exists on Linux, but doesn't on macOS.
# See https://github.com/matrix-org/synapse/pull/11771.
Comment on lines -156 to -157
Copy link
Copy Markdown
Member

@clokep clokep May 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we OK removing this comment?

Copy link
Copy Markdown
Contributor Author

@DMRobertson DMRobertson May 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ooooooops

disallow_untyped_defs = False
warn_unused_ignores = False

[mypy-synapse.module_api.*]
disallow_untyped_defs = True

[mypy-synapse.notifier]
disallow_untyped_defs = True

[mypy-synapse.push.*]
disallow_untyped_defs = True

[mypy-synapse.replication.*]
disallow_untyped_defs = True

[mypy-synapse.rest.*]
disallow_untyped_defs = True

[mypy-synapse.server_notices.*]
disallow_untyped_defs = True

[mypy-synapse.state.*]
disallow_untyped_defs = True

[mypy-synapse.storage.databases.background_updates]
disallow_untyped_defs = True

[mypy-synapse.storage.databases.main.account_data]
disallow_untyped_defs = True

[mypy-synapse.storage.databases.main.client_ips]
disallow_untyped_defs = True

[mypy-synapse.storage.databases.main.directory]
disallow_untyped_defs = True

[mypy-synapse.storage.databases.main.e2e_room_keys]
disallow_untyped_defs = True

[mypy-synapse.storage.databases.main.end_to_end_keys]
disallow_untyped_defs = True

[mypy-synapse.storage.databases.main.event_push_actions]
disallow_untyped_defs = True

[mypy-synapse.storage.databases.main.events_bg_updates]
disallow_untyped_defs = True

[mypy-synapse.storage.databases.main.events_worker]
disallow_untyped_defs = True

[mypy-synapse.storage.databases.main.room]
disallow_untyped_defs = True

[mypy-synapse.storage.databases.main.room_batch]
disallow_untyped_defs = True

[mypy-synapse.storage.databases.main.profile]
disallow_untyped_defs = True

[mypy-synapse.storage.databases.main.stats]
disallow_untyped_defs = True

[mypy-synapse.storage.databases.main.state_deltas]
disallow_untyped_defs = True

[mypy-synapse.storage.databases.main.stream]
disallow_untyped_defs = True

[mypy-synapse.storage.databases.main.transactions]
disallow_untyped_defs = True

[mypy-synapse.storage.databases.main.user_erasure_store]
disallow_untyped_defs = True

[mypy-synapse.storage.engines.*]
disallow_untyped_defs = True

[mypy-synapse.storage.prepare_database]
disallow_untyped_defs = True

[mypy-synapse.storage.persist_events]
disallow_untyped_defs = True

[mypy-synapse.storage.state]
disallow_untyped_defs = True

[mypy-synapse.storage.types]
disallow_untyped_defs = True

[mypy-synapse.storage.util.*]
disallow_untyped_defs = True

[mypy-synapse.streams.*]
disallow_untyped_defs = True
[mypy-synapse.util.caches.treecache]
disallow_untyped_defs = False

[mypy-synapse.types]
disallow_untyped_defs = True
[mypy-synapse.server]
disallow_untyped_defs = False

[mypy-synapse.util.*]
disallow_untyped_defs = True
[mypy-synapse.storage.database]
disallow_untyped_defs = False

[mypy-synapse.util.caches.treecache]
[mypy-tests.*]
disallow_untyped_defs = False
Comment on lines +118 to +121
Copy link
Copy Markdown
Member

@clokep clokep May 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is slightly wider than what we previously had, but maybe that's OK?

Copy link
Copy Markdown
Contributor Author

@DMRobertson DMRobertson May 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I was just in the process of restoring this.

Copy link
Copy Markdown
Member

@clokep clokep May 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry to jump the gun. 👼 Just SO EXCITED TO SEE THIS!

Copy link
Copy Markdown
Contributor Author

@DMRobertson DMRobertson May 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likewise! (That's why I got carried away and deleted the config for tests without thinking!)


[mypy-tests.handlers.test_user_directory]
Expand Down
⚡