Skip to content

Commit a02047d

Browse files
jongiddyjongiddy
authored
Merge pull request #318 from aiven/hacka-enable-mypy-in-precommit
Enable mypy in precommit
2 parents 41c7c94 + 6c297e4 commit a02047d

8 files changed

Lines changed: 184 additions & 27 deletions

File tree

‎.pre-commit-config.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@ repos:
2323
name: isort (python)
2424
files: \.py$
2525

26+
- repo: https://github.com/pre-commit/mirrors-mypy
27+
rev: v0.931
28+
hooks:
29+
- id: mypy
30+
name: Mypy Karapace
31+
pass_filenames: false
32+
args: ["--ignore-missing-imports", "--package", "karapace"]
33+
2634
- repo: https://github.com/pre-commit/pre-commit-hooks
2735
rev: v2.5.0
2836
hooks:

‎karapace/compatibility/__init__.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
)
1616
from karapace.compatibility.jsonschema.checks import compatibility as jsonschema_compatibility
1717
from karapace.compatibility.protobuf.checks import check_protobuf_schema_compatibility
18+
from karapace.protobuf.schema import ProtobufSchema
1819
from karapace.schema_reader import SchemaType, TypedSchema
20+
from karapace.utils import assert_never
1921

2022
import logging
2123

@@ -67,7 +69,7 @@ def check_jsonschema_compatibility(reader: Draft7Validator, writer: Draft7Valida
6769
return jsonschema_compatibility(reader, writer)
6870

6971

70-
def check_protobuf_compatibility(reader, writer) -> SchemaCompatibilityResult:
72+
def check_protobuf_compatibility(reader: ProtobufSchema, writer: ProtobufSchema) -> SchemaCompatibilityResult:
7173
return check_protobuf_schema_compatibility(reader, writer)
7274

7375

@@ -161,10 +163,6 @@ def check_compatibility(
161163
)
162164

163165
else:
164-
result = SchemaCompatibilityResult.incompatible(
165-
incompat_type=SchemaIncompatibilityType.type_mismatch,
166-
message=f"Unknow schema_type {old_schema.schema_type}",
167-
location=[],
168-
)
166+
assert_never(f"Unknown schema_type {old_schema.schema_type}")
169167

170168
return result

‎karapace/compatibility/jsonschema/checks.py‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,11 @@
129129
)
130130

131131

132-
def type_mismatch(reader_type, writer_type, location: List[str]) -> SchemaCompatibilityResult:
132+
def type_mismatch(
133+
reader_type: JSONSCHEMA_TYPES,
134+
writer_type: JSONSCHEMA_TYPES,
135+
location: List[str],
136+
) -> SchemaCompatibilityResult:
133137
return SchemaCompatibilityResult.incompatible(
134138
incompat_type=Incompatibility.type_changed,
135139
message=f"type {reader_type} is not compatible with type {writer_type}",
@@ -189,7 +193,11 @@ def compatibility(reader: Draft7Validator, writer: Draft7Validator) -> SchemaCom
189193

190194

191195
def check_simple_subschema(
192-
simplified_reader_schema, simplified_writer_schema, original_reader_type, original_writer_type, location
196+
simplified_reader_schema: Any,
197+
simplified_writer_schema: Any,
198+
original_reader_type: JSONSCHEMA_TYPES,
199+
original_writer_type: JSONSCHEMA_TYPES,
200+
location: List[str],
193201
) -> SchemaCompatibilityResult:
194202
rec_result = compatibility_rec(simplified_reader_schema, simplified_writer_schema, location)
195203
if is_compatible(rec_result):
@@ -307,7 +315,7 @@ def check_assertion_compatibility(
307315
)
308316

309317
# The type error below is due to a mypy bug for version 0.820 (issue #10131)
310-
if assertion_check.comparison(reader_value, writer_value): # type: ignore
318+
if assertion_check.comparison(reader_value, writer_value): # type: ignore[call-arg]
311319
result.add_incompatibility(
312320
incompat_type=assertion_check.error_when_restricting,
313321
message=assertion_check.error_msg_when_restricting.format(
@@ -816,7 +824,7 @@ def compatibility_subschemas(reader_schema, writer_schema, location: List[str])
816824
qty_of_required_compatible_subschemas = len_writer_subschemas
817825

818826
compatible_schemas_count = count_uniquely_compatible_schemas(
819-
reader_type,
827+
reader_type, # type: ignore
820828
reader_subschemas,
821829
writer_subschemas,
822830
subschema_location,

‎karapace/compatibility/jsonschema/utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def normalize_schema(validator: Draft7Validator) -> Any:
1414
return normalize_schema_rec(validator, original_schema)
1515

1616

17-
def normalize_schema_rec(validator, original_schema) -> Any:
17+
def normalize_schema_rec(validator: Draft7Validator, original_schema: Any) -> Any:
1818
if isinstance(original_schema, (bool, str, float, int)) or original_schema is None:
1919
return original_schema
2020

‎karapace/utils.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from functools import partial
88
from http import HTTPStatus
99
from kafka.client_async import BrokerConnection, KafkaClient, MetadataRequest
10-
from typing import Optional
10+
from typing import NoReturn, Optional
1111
from urllib.parse import urljoin
1212

1313
import aiohttp
@@ -65,6 +65,10 @@ def json_encode(obj, *, compact=True, sort_keys=True, binary=False):
6565
return res.encode("utf-8") if binary else res
6666

6767

68+
def assert_never(value: NoReturn) -> NoReturn:
69+
raise RuntimeError(f"This code should never be reached, got: {value}")
70+
71+
6872
class Result:
6973
def __init__(self, status, json_result, headers=None):
7074
# We create both status and status_code so people can be agnostic on whichever to use

‎mypy.ini‎

Lines changed: 154 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
[mypy]
22
python_version = 3.7
33
warn_redundant_casts = True
4-
5-
[mypy-karapace.*]
6-
ignore_errors = True
7-
8-
[mypy-karapace.avro_compatibility]
94
ignore_errors = False
105
disallow_untyped_defs = True
116
disallow_incomplete_defs = True
@@ -16,13 +11,157 @@ warn_no_return = True
1611
warn_unreachable = True
1712
strict_equality = True
1813

19-
[mypy-karapace.compatibility]
20-
ignore_errors = False
21-
disallow_untyped_defs = True
22-
disallow_incomplete_defs = True
23-
check_untyped_defs = True
24-
no_implicit_optional = True
25-
warn_unused_ignores = True
26-
warn_no_return = True
27-
warn_unreachable = True
28-
strict_equality = True
14+
[mypy-karapace.schema_registry_apis]
15+
ignore_errors = True
16+
17+
[mypy-karapace.karapace]
18+
ignore_errors = True
19+
20+
[mypy-karapace]
21+
ignore_errors = True
22+
23+
[mypy-karapace.version]
24+
ignore_errors = True
25+
26+
[mypy-karapace.compatibility.jsonschema.checks]
27+
disallow_untyped_defs = False
28+
disallow_incomplete_defs = False
29+
warn_unused_ignores = False
30+
31+
[mypy-karapace.constants]
32+
ignore_errors = True
33+
34+
[mypy-karapace.karapace_all]
35+
ignore_errors = True
36+
37+
[mypy-karapace.protobuf.one_of_element]
38+
ignore_errors = True
39+
40+
[mypy-karapace.protobuf.syntax]
41+
ignore_errors = True
42+
43+
[mypy-karapace.protobuf.field]
44+
ignore_errors = True
45+
46+
[mypy-karapace.protobuf.kotlin_wrapper]
47+
ignore_errors = True
48+
49+
[mypy-karapace.protobuf.io]
50+
ignore_errors = True
51+
52+
[mypy-karapace.protobuf.field_element]
53+
ignore_errors = True
54+
55+
[mypy-karapace.protobuf.proto_file_element]
56+
ignore_errors = True
57+
58+
[mypy-karapace.protobuf.compare_type_storage]
59+
ignore_errors = True
60+
61+
[mypy-karapace.protobuf.type_element]
62+
ignore_errors = True
63+
64+
[mypy-karapace.protobuf.enum_element]
65+
ignore_errors = True
66+
67+
[mypy-karapace.protobuf.encoding_variants]
68+
ignore_errors = True
69+
70+
[mypy-karapace.protobuf]
71+
ignore_errors = True
72+
73+
[mypy-karapace.protobuf.schema]
74+
ignore_errors = True
75+
76+
[mypy-karapace.protobuf.extensions_element]
77+
ignore_errors = True
78+
79+
[mypy-karapace.protobuf.protobuf_to_dict]
80+
ignore_errors = True
81+
82+
[mypy-karapace.protobuf.exception]
83+
ignore_errors = True
84+
85+
[mypy-karapace.protobuf.rpc_element]
86+
ignore_errors = True
87+
88+
[mypy-karapace.protobuf.option_reader]
89+
ignore_errors = True
90+
91+
[mypy-karapace.protobuf.option_element]
92+
ignore_errors = True
93+
94+
[mypy-karapace.protobuf.enum_constant_element]
95+
ignore_errors = True
96+
97+
[mypy-karapace.protobuf.compare_result]
98+
ignore_errors = True
99+
100+
[mypy-karapace.protobuf.location]
101+
ignore_errors = True
102+
103+
[mypy-karapace.protobuf.message_element]
104+
ignore_errors = True
105+
106+
[mypy-karapace.protobuf.syntax_reader]
107+
ignore_errors = True
108+
109+
[mypy-karapace.protobuf.utils]
110+
ignore_errors = True
111+
112+
[mypy-karapace.protobuf.extend_element]
113+
ignore_errors = True
114+
115+
[mypy-karapace.protobuf.reserved_element]
116+
ignore_errors = True
117+
118+
[mypy-karapace.protobuf.proto_type]
119+
ignore_errors = True
120+
121+
[mypy-karapace.protobuf.group_element]
122+
ignore_errors = True
123+
124+
[mypy-karapace.protobuf.service_element]
125+
ignore_errors = True
126+
127+
[mypy-karapace.protobuf.proto_parser]
128+
ignore_errors = True
129+
130+
[mypy-karapace.config]
131+
ignore_errors = True
132+
133+
[mypy-karapace.schema_reader]
134+
ignore_errors = True
135+
136+
[mypy-karapace.statsd]
137+
ignore_errors = True
138+
139+
[mypy-karapace.utils]
140+
ignore_errors = True
141+
142+
[mypy-karapace.rapu]
143+
ignore_errors = True
144+
145+
[mypy-karapace.serialization]
146+
ignore_errors = True
147+
148+
[mypy-karapace.master_coordinator]
149+
ignore_errors = True
150+
151+
[mypy-karapace.kafka_rest_apis.__main__]
152+
ignore_errors = True
153+
154+
[mypy-karapace.kafka_rest_apis.consumer_manager]
155+
ignore_errors = True
156+
157+
[mypy-karapace.kafka_rest_apis]
158+
ignore_errors = True
159+
160+
[mypy-karapace.kafka_rest_apis.admin]
161+
ignore_errors = True
162+
163+
[mypy-karapace.kafka_rest_apis.error_codes]
164+
ignore_errors = True
165+
166+
[mypy-karapace.schema_backup]
167+
ignore_errors = True

‎tests/__init__.py‎

Whitespace-only changes.

‎tests/schemas/__init__.py‎

Whitespace-only changes.

0 commit comments

Comments
 (0)