From a551092d4f57ebe605c54a921686838ff878d3f7 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Wed, 18 May 2022 20:25:37 +0100 Subject: [PATCH 1/3] Simplify untyped-defs config in mypy.ini --- mypy.ini | 175 ++++++------------------------------------------------- 1 file changed, 17 insertions(+), 158 deletions(-) diff --git a/mypy.ini b/mypy.ini index 4fa020b8764d..591124cc8724 100644 --- a/mypy.ini +++ b/mypy.ini @@ -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/, @@ -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. +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 [mypy-tests.handlers.test_user_directory] From 07574761a3e9beb0f2f16ed1e75d208ac6d29c69 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Wed, 18 May 2022 20:27:47 +0100 Subject: [PATCH 2/3] Changelog --- changelog.d/12790.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/12790.misc diff --git a/changelog.d/12790.misc b/changelog.d/12790.misc new file mode 100644 index 000000000000..b78156cf4e1d --- /dev/null +++ b/changelog.d/12790.misc @@ -0,0 +1 @@ +Simplify `disallow_untyped_defs` config in `mypy.ini`. From 4c6207f757f5c0b9040a09b357b83725a1825e11 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Wed, 18 May 2022 20:45:58 +0100 Subject: [PATCH 3/3] Restore epoll comment --- mypy.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mypy.ini b/mypy.ini index 591124cc8724..df2622df983a 100644 --- a/mypy.ini +++ b/mypy.ini @@ -104,6 +104,8 @@ disallow_untyped_defs = False [mypy-synapse.metrics._reactor_metrics] disallow_untyped_defs = False +# This module imports select.epoll. That exists on Linux, but doesn't on macOS. +# See https://github.com/matrix-org/synapse/pull/11771. warn_unused_ignores = False [mypy-synapse.util.caches.treecache]