Skip to content

Commit 55956a9

Browse files
authored
Merge pull request #393 from aiven/hacka-fix-linting-issues
Fix linting issues
2 parents 52e3025 + 49943dd commit 55956a9

4 files changed

Lines changed: 21 additions & 16 deletions

File tree

.pre-commit-config.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ repos:
3030
- id: mypy
3131
name: Mypy Karapace
3232
pass_filenames: false
33-
args: ["--ignore-missing-imports", "--package", "karapace"]
33+
args:
34+
- "--show-error-codes"
35+
- "--ignore-missing-imports"
36+
- "--package"
37+
- "karapace"
3438

3539
- repo: https://github.com/pre-commit/pre-commit-hooks
3640
rev: v4.1.0

karapace/anonymize_schemas/anonymize_avro.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,4 @@ def anonymize(input_schema: Schema) -> Schema:
114114
output_schema[key] = anonymize(value)
115115
return output_schema
116116
else:
117-
return input_schema
117+
return input_schema # type: ignore[unreachable]

tests/integration/test_schema_backup_avro_export.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
Copyright (c) 2019 Aiven Ltd
55
See LICENSE for details
66
"""
7+
from karapace.client import Client
78
from karapace.config import set_config_defaults
89
from karapace.schema_backup import SchemaBackup
9-
from karapace.utils import Client
1010
from pathlib import Path
11-
from tests.utils import KafkaServers
11+
from tests.integration.utils.kafka_server import KafkaServers
1212
from typing import Any, Dict
1313

1414
import os
@@ -58,7 +58,7 @@ async def insert_data(c: Client, schemaType: str, subject: str, data: Dict[str,
5858
"subjects/{}/versions".format(subject),
5959
json={"schema": f"{schema_string}", "schemaType": schemaType},
6060
)
61-
assert res.status == 200
61+
assert res.status_code == 200
6262
assert "id" in res.json()
6363

6464

tests/unit/anonymize_schemas/test_anonymize_avro.py

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
PRIMITIVE_TYPE_SCHEMA = json.loads('"int"')
1414
EXPECTED_PRIMITIVE_TYPE_SCHEMA = "int"
1515

16-
16+
# Pylint issue: https://github.com/PyCQA/pylint/issues/3368
17+
# pylint: disable=line-too-long
1718
SCHEMA_WITH_NAME = json.loads('"io.aiven.myrecord"')
18-
EXPECTED_SCHEMA_WITH_NAME = "aa258230180d9c643f761089d7e33b8b52288ed3.ae02f26b082c5f3bc7027f72335dd1186a2cd382.afe8733e983101f1f4ff50d24152890d0da71418" # pylint: disable=line-too-long
19+
EXPECTED_SCHEMA_WITH_NAME = "aa258230180d9c643f761089d7e33b8b52288ed3.ae02f26b082c5f3bc7027f72335dd1186a2cd382.afe8733e983101f1f4ff50d24152890d0da71418"
1920

2021

2122
FIXED_VALUE_SCHEMA_INVALID = json.loads("100.101")
@@ -212,7 +213,7 @@
212213
"namespace": "aa258230180d9c643f761089d7e33b8b52288ed3.ae02f26b082c5f3bc7027f72335dd1186a2cd382",
213214
"name": "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3.a09a23220f2c3d64d1e1d6d18c4d5280f8d82fca",
214215
"aliases": [
215-
"aa258230180d9c643f761089d7e33b8b52288ed3.ae02f26b082c5f3bc7027f72335dd1186a2cd382.a99e5e92725f9873fa5802326346a6067051ee61", # pylint: disable=line-too-long
216+
"aa258230180d9c643f761089d7e33b8b52288ed3.ae02f26b082c5f3bc7027f72335dd1186a2cd382.a99e5e92725f9873fa5802326346a6067051ee61",
216217
"a99e5e92725f9873fa5802326346a6067051ee61",
217218
],
218219
"fields": [
@@ -235,24 +236,24 @@
235236
"name": "abe0d2dc12d0aa622bacbe23b5516c2e7895e1d7",
236237
"namespace": "aa258230180d9c643f761089d7e33b8b52288ed3.ae02f26b082c5f3bc7027f72335dd1186a2cd382",
237238
"aliases": [
238-
"aa258230180d9c643f761089d7e33b8b52288ed3.ae02f26b082c5f3bc7027f72335dd1186a2cd382.afaba999b462193044dfff2af00fd144e3622c93" # pylint: disable=line-too-long
239+
"aa258230180d9c643f761089d7e33b8b52288ed3.ae02f26b082c5f3bc7027f72335dd1186a2cd382.afaba999b462193044dfff2af00fd144e3622c93"
239240
],
240241
"symbols": ["a58b5a8ced9db48b30e008b148004c1065ce53b1", "a6e018ece5a1d3b750531de58d16b961de23d629"],
241242
"default": "a6e018ece5a1d3b750531de58d16b961de23d629",
242243
},
243244
{
244245
"type": "array",
245246
"name": "af227bcd25744bf96408ccc655a37521935c7ab1",
246-
"items": "aa258230180d9c643f761089d7e33b8b52288ed3.ae02f26b082c5f3bc7027f72335dd1186a2cd382.a94a8fe5ccb19ba61c4c0873d391e987982fbbd3.a09a23220f2c3d64d1e1d6d18c4d5280f8d82fca", # pylint: disable=line-too-long
247+
"items": "aa258230180d9c643f761089d7e33b8b52288ed3.ae02f26b082c5f3bc7027f72335dd1186a2cd382.a94a8fe5ccb19ba61c4c0873d391e987982fbbd3.a09a23220f2c3d64d1e1d6d18c4d5280f8d82fca",
247248
"default": [],
248-
"a43c4b82570e182eb1c74072896167113d2c7345": "a0f1005a1091064f11247324586b3fe8b4504e26.aa39a3ee5e6b4b0d3255bfef95601890afd80709", # pylint: disable=line-too-long
249+
"a43c4b82570e182eb1c74072896167113d2c7345": "a0f1005a1091064f11247324586b3fe8b4504e26.aa39a3ee5e6b4b0d3255bfef95601890afd80709",
249250
},
250251
{
251252
"type": "array",
252253
"name": "ab840f929bee7c863e52894210d3916a03226427",
253254
"items": [
254255
"string",
255-
"aa258230180d9c643f761089d7e33b8b52288ed3.ae02f26b082c5f3bc7027f72335dd1186a2cd382.ac8fb489b3e9ff687f990ffb2b2f1ec08b0052ca", # pylint: disable=line-too-long
256+
"aa258230180d9c643f761089d7e33b8b52288ed3.ae02f26b082c5f3bc7027f72335dd1186a2cd382.ac8fb489b3e9ff687f990ffb2b2f1ec08b0052ca",
256257
],
257258
"default": [],
258259
},
@@ -265,7 +266,7 @@
265266
{
266267
"type": [
267268
"null",
268-
"aa258230180d9c643f761089d7e33b8b52288ed3.ae02f26b082c5f3bc7027f72335dd1186a2cd382.a94a8fe5ccb19ba61c4c0873d391e987982fbbd3.a09a23220f2c3d64d1e1d6d18c4d5280f8d82fca", # pylint: disable=line-too-long
269+
"aa258230180d9c643f761089d7e33b8b52288ed3.ae02f26b082c5f3bc7027f72335dd1186a2cd382.a94a8fe5ccb19ba61c4c0873d391e987982fbbd3.a09a23220f2c3d64d1e1d6d18c4d5280f8d82fca",
269270
],
270271
"name": "ae69f15f11172a41f77b4a0aa0b7a60906eecb3c",
271272
},
@@ -274,7 +275,7 @@
274275
"name": "ab98f5b85764b8561cacbb055a963cd334928cba",
275276
"namespace": "aa258230180d9c643f761089d7e33b8b52288ed3.ae02f26b082c5f3bc7027f72335dd1186a2cd382",
276277
"aliases": [
277-
"aa258230180d9c643f761089d7e33b8b52288ed3.ae02f26b082c5f3bc7027f72335dd1186a2cd382.a6e4c69f975b291f655e5eaa65ed9eb97781cb01" # pylint: disable=line-too-long
278+
"aa258230180d9c643f761089d7e33b8b52288ed3.ae02f26b082c5f3bc7027f72335dd1186a2cd382.a6e4c69f975b291f655e5eaa65ed9eb97781cb01"
278279
],
279280
"order": "ae5d03fc0f0537f32701e8cab51a448a0f591d97",
280281
"size": 16,
@@ -426,7 +427,7 @@
426427
"namespace": "aa258230180d9c643f761089d7e33b8b52288ed3.ae02f26b082c5f3bc7027f72335dd1186a2cd382",
427428
"name": "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3.a09a23220f2c3d64d1e1d6d18c4d5280f8d82fca",
428429
"aliases": [
429-
"aa258230180d9c643f761089d7e33b8b52288ed3.ae02f26b082c5f3bc7027f72335dd1186a2cd382.a99e5e92725f9873fa5802326346a6067051ee61", # pylint: disable=line-too-long
430+
"aa258230180d9c643f761089d7e33b8b52288ed3.ae02f26b082c5f3bc7027f72335dd1186a2cd382.a99e5e92725f9873fa5802326346a6067051ee61",
430431
"a99e5e92725f9873fa5802326346a6067051ee61",
431432
],
432433
"fields": [
@@ -447,7 +448,7 @@
447448
"name": "abe0d2dc12d0aa622bacbe23b5516c2e7895e1d7",
448449
"namespace": "aa258230180d9c643f761089d7e33b8b52288ed3.ae02f26b082c5f3bc7027f72335dd1186a2cd382",
449450
"aliases": [
450-
"aa258230180d9c643f761089d7e33b8b52288ed3.ae02f26b082c5f3bc7027f72335dd1186a2cd382.afaba999b462193044dfff2af00fd144e3622c93", # pylint: disable=line-too-long
451+
"aa258230180d9c643f761089d7e33b8b52288ed3.ae02f26b082c5f3bc7027f72335dd1186a2cd382.afaba999b462193044dfff2af00fd144e3622c93",
451452
],
452453
"symbols": ["a58b5a8ced9db48b30e008b148004c1065ce53b1", "a6e018ece5a1d3b750531de58d16b961de23d629"],
453454
"default": "a6e018ece5a1d3b750531de58d16b961de23d629",

0 commit comments

Comments
 (0)