Skip to content

Commit

Permalink
Merge pull request #874 from Aiven-Open/jjaakola-aiven-update-kafka-p…
Browse files Browse the repository at this point in the history 
…ython-with-vendored-six-fix

chore: update kafka-python with vendored six 1.16.0
  • Loading branch information
@keejon
keejon authored May 13, 2024
2 parents 38a9ed3 + 92c35f4 commit 669493c
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 70 deletions.
89 changes: 47 additions & 42 deletions requirements/requirements-dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@
#
accept-types==0.4.1
# via -r requirements.txt
aiohttp==3.9.4
aiohttp==3.9.5
# via -r requirements.txt
aiosignal==1.3.1
# via
# -r requirements.txt
# aiohttp
anyio==4.1.0
anyio==4.3.0
# via
# -r requirements.txt
# watchfiles
async-timeout==4.0.3
# via
# -r requirements.txt
# aiohttp
attrs==23.1.0
attrs==23.2.0
# via
# -r requirements.txt
# aiohttp
Expand All @@ -30,13 +30,13 @@ attrs==23.1.0
# wmctrl
avro @ https://github.com/aiven/avro/archive/5a82d57f2a650fd87c819a30e433f1abb2c76ca2.tar.gz#subdirectory=lang/py
# via -r requirements.txt
blinker==1.7.0
blinker==1.8.2
# via flask
brotli==1.1.0
# via geventhttpclient
cachetools==5.3.3
# via -r requirements.txt
certifi==2023.11.17
certifi==2024.2.2
# via
# geventhttpclient
# requests
Expand All @@ -49,7 +49,11 @@ configargparse==1.7
# via locust
confluent-kafka==2.3.0
# via -r requirements.txt
exceptiongroup==1.2.0
cramjam==2.8.3
# via
# -r requirements.txt
# python-snappy
exceptiongroup==1.2.1
# via
# -r requirements.txt
# anyio
Expand All @@ -59,9 +63,9 @@ execnet==2.1.1
# via pytest-xdist
fancycompleter==0.9.1
# via pdbpp
filelock==3.13.3
filelock==3.14.0
# via -r requirements-dev.in
flask==3.0.0
flask==3.0.3
# via
# flask-cors
# flask-login
Expand All @@ -70,30 +74,30 @@ flask-cors==4.0.1
# via locust
flask-login==0.6.3
# via locust
frozenlist==1.4.0
frozenlist==1.4.1
# via
# -r requirements.txt
# aiohttp
# aiosignal
gevent==23.9.1
gevent==24.2.1
# via
# geventhttpclient
# locust
geventhttpclient==2.0.11
geventhttpclient==2.0.12
# via locust
greenlet==3.0.1
greenlet==3.0.3
# via gevent
hypothesis==6.92.2
hypothesis==6.101.0
# via -r requirements-dev.in
idna==3.7
# via
# -r requirements.txt
# anyio
# requests
# yarl
importlib-metadata==6.8.0
importlib-metadata==7.1.0
# via flask
importlib-resources==6.1.1
importlib-resources==6.4.0
# via
# -r requirements.txt
# jsonschema
Expand All @@ -102,52 +106,52 @@ iniconfig==2.0.0
# via pytest
isodate==0.6.1
# via -r requirements.txt
itsdangerous==2.1.2
itsdangerous==2.2.0
# via flask
jinja2==3.1.4
# via flask
jsonschema==4.21.1
jsonschema==4.22.0
# via -r requirements.txt
jsonschema-specifications==2023.11.2
jsonschema-specifications==2023.12.1
# via
# -r requirements.txt
# jsonschema
kafka-python @ https://github.com/aiven/kafka-python/archive/1b95333c9628152066fb8b1092de9da0433401fd.tar.gz
kafka-python @ https://github.com/aiven/kafka-python/archive/19ff1f4b28e33318b0cd2d916b8399170055b1ca.tar.gz
# via -r requirements.txt
locust==2.24.1
locust==2.25.0
# via -r requirements-dev.in
lz4==4.3.3
# via -r requirements.txt
markdown-it-py==3.0.0
# via
# -r requirements.txt
# rich
markupsafe==2.1.3
markupsafe==2.1.5
# via
# jinja2
# werkzeug
mdurl==0.1.2
# via
# -r requirements.txt
# markdown-it-py
msgpack==1.0.7
msgpack==1.0.8
# via locust
multidict==6.0.4
multidict==6.0.5
# via
# -r requirements.txt
# aiohttp
# yarl
networkx==3.1
# via -r requirements.txt
packaging==23.2
packaging==24.0
# via pytest
pdbpp==0.10.3
# via -r requirements-dev.in
pkgutil-resolve-name==1.3.10
# via
# -r requirements.txt
# jsonschema
pluggy==1.3.0
pluggy==1.5.0
# via pytest
protobuf==3.20.3
# via -r requirements.txt
Expand All @@ -156,7 +160,7 @@ psutil==5.9.8
# -r requirements-dev.in
# locust
# pytest-xdist
pygments==2.17.2
pygments==2.18.0
# via
# -r requirements.txt
# pdbpp
Expand All @@ -165,25 +169,25 @@ pyjwt==2.8.0
# via -r requirements.txt
pyrepl==0.9.0
# via fancycompleter
pytest==7.4.4
pytest==8.2.0
# via
# -r requirements/requirements-dev.in
# -r requirements-dev.in
# pytest-random-order
# pytest-timeout
# pytest-xdist
pytest-random-order==1.1.1
# via -r requirements/requirements-dev.in
pytest-timeout==2.2.0
# via -r requirements-dev.in
pytest-timeout==2.3.1
# via -r requirements-dev.in
pytest-xdist[psutil]==3.6.1
# via -r requirements-dev.in
python-dateutil==2.9.0.post0
# via -r requirements.txt
python-snappy==0.6.1
python-snappy==0.7.1
# via -r requirements.txt
pyzmq==25.1.1
pyzmq==26.0.3
# via locust
referencing==0.31.1
referencing==0.35.1
# via
# -r requirements.txt
# jsonschema
Expand All @@ -196,38 +200,39 @@ rich==13.7.1
# via -r requirements.txt
roundrobin==0.0.4
# via locust
rpds-py==0.13.2
rpds-py==0.18.1
# via
# -r requirements.txt
# jsonschema
# referencing
sentry-sdk==1.38.0
sentry-sdk==2.1.1
# via -r requirements-dev.in
six==1.16.0
# via
# -r requirements.txt
# geventhttpclient
# isodate
# python-dateutil
sniffio==1.3.0
sniffio==1.3.1
# via
# -r requirements.txt
# anyio
sortedcontainers==2.4.0
# via hypothesis
tenacity==8.2.3
tenacity==8.3.0
# via -r requirements.txt
tomli==2.0.1
# via
# locust
# pytest
typing-extensions==4.8.0
typing-extensions==4.11.0
# via
# -r requirements.txt
# anyio
# rich
ujson==5.9.0
# via -r requirements.txt
urllib3==2.1.0
urllib3==2.2.1
# via
# requests
# sentry-sdk
Expand All @@ -242,18 +247,18 @@ wmctrl==0.5
# via pdbpp
xxhash==3.4.1
# via -r requirements.txt
yarl==1.9.3
yarl==1.9.4
# via
# -r requirements.txt
# aiohttp
zipp==3.17.0
zipp==3.18.1
# via
# -r requirements.txt
# importlib-metadata
# importlib-resources
zope-event==5.0
# via gevent
zope-interface==6.1
zope-interface==6.3
# via gevent
zstandard==0.22.0
# via -r requirements.txt
Expand Down
16 changes: 8 additions & 8 deletions requirements/requirements-typing.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,30 @@
#
# 'make requirements'
#
attrs==23.1.0
attrs==23.2.0
# via
# -c requirements-dev.txt
# -c requirements.txt
# referencing
certifi==2023.11.17
certifi==2024.2.2
# via
# -c requirements-dev.txt
# sentry-sdk
mypy==1.8.0
mypy==1.10.0
# via -r requirements-typing.in
mypy-extensions==1.0.0
# via mypy
referencing==0.31.1
referencing==0.35.1
# via
# -c requirements-dev.txt
# -c requirements.txt
# types-jsonschema
rpds-py==0.13.2
rpds-py==0.18.1
# via
# -c requirements-dev.txt
# -c requirements.txt
# referencing
sentry-sdk==1.38.0
sentry-sdk==2.1.1
# via
# -c requirements-dev.txt
# -r requirements-typing.in
Expand All @@ -41,12 +41,12 @@ types-jsonschema==4.22.0.20240501
# via -r requirements-typing.in
types-protobuf==3.20.4.6
# via -r requirements-typing.in
typing-extensions==4.8.0
typing-extensions==4.11.0
# via
# -c requirements-dev.txt
# -c requirements.txt
# mypy
urllib3==2.1.0
urllib3==2.2.1
# via
# -c requirements-dev.txt
# sentry-sdk
2 changes: 1 addition & 1 deletion requirements/requirements.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ zstandard
# - The contents of the file change, which invalidates the existing docker
# images and forces a new image generation.
#
https://github.com/aiven/kafka-python/archive/1b95333c9628152066fb8b1092de9da0433401fd.tar.gz
https://github.com/aiven/kafka-python/archive/19ff1f4b28e33318b0cd2d916b8399170055b1ca.tar.gz
https://github.com/aiven/avro/archive/5a82d57f2a650fd87c819a30e433f1abb2c76ca2.tar.gz#subdirectory=lang/py
Loading

0 comments on commit 669493c

Please sign in to comment.