Skip to content

Commit 227fd55

Browse files
authored
Merge pull request #798 from Aiven-Open/matyaskuti/remove_aiokafka_dependency
Remove aiokafka dependency
2 parents 19fe5b7 + c02f9fd commit 227fd55

7 files changed

Lines changed: 92 additions & 114 deletions

File tree

karapace/sentry/sentry_client.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ def _initialize_sentry(self) -> None:
4141
# Don't send library logged errors to Sentry as there is also proper return value or raised exception to calling code
4242
from sentry_sdk.integrations.logging import ignore_logger
4343

44-
ignore_logger("aiokafka")
45-
ignore_logger("aiokafka.*")
4644
ignore_logger("kafka")
4745
ignore_logger("kafka.*")
4846

mypy.ini

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,6 @@ ignore_errors = True
7777
# dependencies.
7878
# - Write your own stubs. You don't need to write stubs for the whole library,
7979
# only the parts that Karapace is interacting with.
80-
[mypy-aiokafka.*]
81-
ignore_missing_imports = True
82-
8380
[mypy-kafka.*]
8481
ignore_missing_imports = True
8582

requirements/requirements-dev.txt

Lines changed: 52 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -5,40 +5,37 @@
55
# 'make requirements'
66
#
77
accept-types==0.4.1
8-
# via -r requirements.txt
8+
# via -r requirements/requirements.txt
99
aiohttp==3.9.2
10-
# via -r requirements.txt
11-
aiokafka==0.8.1
12-
# via -r requirements.txt
10+
# via -r requirements/requirements.txt
1311
aiosignal==1.3.1
1412
# via
15-
# -r requirements.txt
13+
# -r requirements/requirements.txt
1614
# aiohttp
1715
anyio==4.1.0
1816
# via
19-
# -r requirements.txt
17+
# -r requirements/requirements.txt
2018
# watchfiles
2119
async-timeout==4.0.3
2220
# via
23-
# -r requirements.txt
21+
# -r requirements/requirements.txt
2422
# aiohttp
25-
# aiokafka
2623
attrs==23.1.0
2724
# via
28-
# -r requirements.txt
25+
# -r requirements/requirements.txt
2926
# aiohttp
3027
# hypothesis
3128
# jsonschema
3229
# referencing
3330
# wmctrl
3431
avro @ https://github.com/aiven/avro/archive/5a82d57f2a650fd87c819a30e433f1abb2c76ca2.tar.gz#subdirectory=lang/py
35-
# via -r requirements.txt
32+
# via -r requirements/requirements.txt
3633
blinker==1.7.0
3734
# via flask
3835
brotli==1.1.0
3936
# via geventhttpclient
4037
cachetools==5.3.2
41-
# via -r requirements.txt
38+
# via -r requirements/requirements.txt
4239
certifi==2023.11.17
4340
# via
4441
# geventhttpclient
@@ -51,10 +48,10 @@ click==8.1.7
5148
configargparse==1.7
5249
# via locust
5350
confluent-kafka==2.3.0
54-
# via -r requirements.txt
51+
# via -r requirements/requirements.txt
5552
exceptiongroup==1.2.0
5653
# via
57-
# -r requirements.txt
54+
# -r requirements/requirements.txt
5855
# anyio
5956
# hypothesis
6057
# pytest
@@ -63,7 +60,7 @@ execnet==2.0.2
6360
fancycompleter==0.9.1
6461
# via pdbpp
6562
filelock==3.13.1
66-
# via -r requirements-dev.in
63+
# via -r requirements/requirements-dev.in
6764
flask==3.0.0
6865
# via
6966
# flask-basicauth
@@ -75,7 +72,7 @@ flask-cors==4.0.0
7572
# via locust
7673
frozenlist==1.4.0
7774
# via
78-
# -r requirements.txt
75+
# -r requirements/requirements.txt
7976
# aiohttp
8077
# aiosignal
8178
gevent==23.9.1
@@ -87,178 +84,173 @@ geventhttpclient==2.0.11
8784
greenlet==3.0.1
8885
# via gevent
8986
hypothesis==6.92.2
90-
# via -r requirements-dev.in
87+
# via -r requirements/requirements-dev.in
9188
idna==3.6
9289
# via
93-
# -r requirements.txt
90+
# -r requirements/requirements.txt
9491
# anyio
9592
# requests
9693
# yarl
9794
importlib-metadata==6.8.0
9895
# via flask
9996
importlib-resources==6.1.1
10097
# via
101-
# -r requirements.txt
98+
# -r requirements/requirements.txt
10299
# jsonschema
103100
# jsonschema-specifications
104101
iniconfig==2.0.0
105102
# via pytest
106103
isodate==0.6.1
107-
# via -r requirements.txt
104+
# via -r requirements/requirements.txt
108105
itsdangerous==2.1.2
109106
# via flask
110107
jinja2==3.1.3
111108
# via flask
112109
jsonschema==4.21.1
113-
# via -r requirements.txt
110+
# via -r requirements/requirements.txt
114111
jsonschema-specifications==2023.11.2
115112
# via
116-
# -r requirements.txt
113+
# -r requirements/requirements.txt
117114
# jsonschema
118115
kafka-python @ https://github.com/aiven/kafka-python/archive/1b95333c9628152066fb8b1092de9da0433401fd.tar.gz
119-
# via
120-
# -r requirements.txt
121-
# aiokafka
116+
# via -r requirements/requirements.txt
122117
locust==2.19.1
123-
# via -r requirements-dev.in
118+
# via -r requirements/requirements-dev.in
124119
lz4==4.3.2
125-
# via -r requirements.txt
120+
# via -r requirements/requirements.txt
126121
markdown-it-py==3.0.0
127122
# via
128-
# -r requirements.txt
123+
# -r requirements/requirements.txt
129124
# rich
130125
markupsafe==2.1.3
131126
# via
132127
# jinja2
133128
# werkzeug
134129
mdurl==0.1.2
135130
# via
136-
# -r requirements.txt
131+
# -r requirements/requirements.txt
137132
# markdown-it-py
138133
msgpack==1.0.7
139134
# via locust
140135
multidict==6.0.4
141136
# via
142-
# -r requirements.txt
137+
# -r requirements/requirements.txt
143138
# aiohttp
144139
# yarl
145140
networkx==3.1
146-
# via -r requirements.txt
141+
# via -r requirements/requirements.txt
147142
packaging==23.2
148-
# via
149-
# -r requirements.txt
150-
# aiokafka
151-
# pytest
143+
# via pytest
152144
pdbpp==0.10.3
153-
# via -r requirements-dev.in
145+
# via -r requirements/requirements-dev.in
154146
pkgutil-resolve-name==1.3.10
155147
# via
156-
# -r requirements.txt
148+
# -r requirements/requirements.txt
157149
# jsonschema
158150
pluggy==1.3.0
159151
# via pytest
160152
protobuf==3.20.3
161-
# via -r requirements.txt
153+
# via -r requirements/requirements.txt
162154
psutil==5.9.6
163155
# via
164-
# -r requirements-dev.in
156+
# -r requirements/requirements-dev.in
165157
# locust
166158
# pytest-xdist
167159
pygments==2.17.2
168160
# via
169-
# -r requirements.txt
161+
# -r requirements/requirements.txt
170162
# pdbpp
171163
# rich
172164
pyjwt==2.8.0
173-
# via -r requirements.txt
165+
# via -r requirements/requirements.txt
174166
pyrepl==0.9.0
175167
# via fancycompleter
176168
pytest==7.4.4
177169
# via
178-
# -r requirements-dev.in
170+
# -r requirements/requirements-dev.in
179171
# pytest-timeout
180172
# pytest-xdist
181173
pytest-timeout==2.2.0
182-
# via -r requirements-dev.in
174+
# via -r requirements/requirements-dev.in
183175
pytest-xdist[psutil]==3.5.0
184-
# via -r requirements-dev.in
176+
# via -r requirements/requirements-dev.in
185177
python-dateutil==2.8.2
186-
# via -r requirements.txt
178+
# via -r requirements/requirements.txt
187179
python-snappy==0.6.1
188-
# via -r requirements.txt
180+
# via -r requirements/requirements.txt
189181
pyzmq==25.1.1
190182
# via locust
191183
referencing==0.31.1
192184
# via
193-
# -r requirements.txt
185+
# -r requirements/requirements.txt
194186
# jsonschema
195187
# jsonschema-specifications
196188
requests==2.31.0
197189
# via
198-
# -r requirements-dev.in
190+
# -r requirements/requirements-dev.in
199191
# locust
200192
rich==13.7.0
201-
# via -r requirements.txt
193+
# via -r requirements/requirements.txt
202194
roundrobin==0.0.4
203195
# via locust
204196
rpds-py==0.13.2
205197
# via
206-
# -r requirements.txt
198+
# -r requirements/requirements.txt
207199
# jsonschema
208200
# referencing
209201
sentry-sdk==1.38.0
210-
# via -r requirements-dev.in
202+
# via -r requirements/requirements-dev.in
211203
six==1.16.0
212204
# via
213-
# -r requirements.txt
205+
# -r requirements/requirements.txt
214206
# geventhttpclient
215207
# isodate
216208
# python-dateutil
217209
sniffio==1.3.0
218210
# via
219-
# -r requirements.txt
211+
# -r requirements/requirements.txt
220212
# anyio
221213
sortedcontainers==2.4.0
222214
# via hypothesis
223215
tenacity==8.2.3
224-
# via -r requirements.txt
216+
# via -r requirements/requirements.txt
225217
tomli==2.0.1
226218
# via pytest
227219
typing-extensions==4.8.0
228220
# via
229-
# -r requirements.txt
221+
# -r requirements/requirements.txt
230222
# rich
231223
ujson==5.8.0
232-
# via -r requirements.txt
224+
# via -r requirements/requirements.txt
233225
urllib3==2.1.0
234226
# via
235227
# requests
236228
# sentry-sdk
237229
watchfiles==0.21.0
238-
# via -r requirements.txt
230+
# via -r requirements/requirements.txt
239231
werkzeug==3.0.1
240232
# via
241233
# flask
242234
# locust
243235
wmctrl==0.5
244236
# via pdbpp
245237
xxhash==3.4.1
246-
# via -r requirements.txt
238+
# via -r requirements/requirements.txt
247239
yarl==1.9.3
248240
# via
249-
# -r requirements.txt
241+
# -r requirements/requirements.txt
250242
# aiohttp
251243
zipp==3.17.0
252244
# via
253-
# -r requirements.txt
245+
# -r requirements/requirements.txt
254246
# importlib-metadata
255247
# importlib-resources
256248
zope-event==5.0
257249
# via gevent
258250
zope-interface==6.1
259251
# via gevent
260252
zstandard==0.22.0
261-
# via -r requirements.txt
253+
# via -r requirements/requirements.txt
262254

263255
# The following packages are considered to be unsafe in a requirements file:
264256
# setuptools

requirements/requirements-typing.txt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,47 +6,47 @@
66
#
77
attrs==23.1.0
88
# via
9-
# -c requirements-dev.txt
10-
# -c requirements.txt
9+
# -c requirements/requirements-dev.txt
10+
# -c requirements/requirements.txt
1111
# referencing
1212
certifi==2023.11.17
1313
# via
14-
# -c requirements-dev.txt
14+
# -c requirements/requirements-dev.txt
1515
# sentry-sdk
1616
mypy==1.8.0
17-
# via -r requirements-typing.in
17+
# via -r requirements/requirements-typing.in
1818
mypy-extensions==1.0.0
1919
# via mypy
2020
referencing==0.31.1
2121
# via
22-
# -c requirements-dev.txt
23-
# -c requirements.txt
22+
# -c requirements/requirements-dev.txt
23+
# -c requirements/requirements.txt
2424
# types-jsonschema
2525
rpds-py==0.13.2
2626
# via
27-
# -c requirements-dev.txt
28-
# -c requirements.txt
27+
# -c requirements/requirements-dev.txt
28+
# -c requirements/requirements.txt
2929
# referencing
3030
sentry-sdk==1.38.0
3131
# via
32-
# -c requirements-dev.txt
33-
# -r requirements-typing.in
32+
# -c requirements/requirements-dev.txt
33+
# -r requirements/requirements-typing.in
3434
tomli==2.0.1
3535
# via
36-
# -c requirements-dev.txt
36+
# -c requirements/requirements-dev.txt
3737
# mypy
3838
types-cachetools==5.3.0.7
39-
# via -r requirements-typing.in
39+
# via -r requirements/requirements-typing.in
4040
types-jsonschema==4.21.0.20240118
41-
# via -r requirements-typing.in
41+
# via -r requirements/requirements-typing.in
4242
types-protobuf==3.20.4.6
43-
# via -r requirements-typing.in
43+
# via -r requirements/requirements-typing.in
4444
typing-extensions==4.8.0
4545
# via
46-
# -c requirements-dev.txt
47-
# -c requirements.txt
46+
# -c requirements/requirements-dev.txt
47+
# -c requirements/requirements.txt
4848
# mypy
4949
urllib3==2.1.0
5050
# via
51-
# -c requirements-dev.txt
51+
# -c requirements/requirements-dev.txt
5252
# sentry-sdk

requirements/requirements.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# PyPI dependencies
22
accept-types<1
33
aiohttp<4
4-
aiokafka<1
54
confluent-kafka==2.3.0
65
isodate<1
76
jsonschema<5

0 commit comments

Comments
 (0)