From 67ec6015fe1351b2a259b41421261c3f6b38e675 Mon Sep 17 00:00:00 2001 From: Alastair Porter Date: Fri, 31 Jan 2025 14:50:16 +0100 Subject: [PATCH] Upgrade redis and set specific version Different versions of the redis-py library support different versions of redis. Use an explicit version in docker-compose.yml and update python dependency to a version which supports it. --- docker-compose.yml | 2 +- requirements.in | 2 +- requirements.txt | 121 ++++++++++++++++++++++----------------------- 3 files changed, 62 insertions(+), 63 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 45708a935..cd1a883df 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -61,7 +61,7 @@ services: # Redis (caches) redis: - image: redis:alpine + image: redis:7.4.2 command: redis-server --port 6379 # Celery broker (queue manager) diff --git a/requirements.in b/requirements.in index 6b0d29dee..1a6a548fe 100644 --- a/requirements.in +++ b/requirements.in @@ -48,7 +48,7 @@ pysolr==3.10.0b1 python-louvain==0.16 # community detection in clustering pytz==2023.3 PyYAML==6.0.1 -redis==3.2.0 +redis==5.2.1 scikit-learn==1.4.1.post1 # clustering scipy==1.12.0 # clustering sentry-sdk[django]~=2.21.0 diff --git a/requirements.txt b/requirements.txt index 635f0edbc..5f89db73f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,33 +2,35 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile requirements.in +# pip-compile # akismet==1.0.1 # via -r requirements.in -alabaster==0.7.13 +alabaster==0.7.16 # via sphinx -amqp==5.2.0 +amqp==5.3.1 # via kombu -asgiref==3.7.2 +asgiref==3.8.1 # via # django # django-cors-headers -asttokens==2.4.1 +asttokens==3.0.0 # via stack-data +async-timeout==5.0.1 + # via redis autopep8==1.5.7 # via # -r requirements.in # django-silk -babel==2.14.0 +babel==2.17.0 # via sphinx backcall==0.2.0 # via ipython -bcrypt==4.1.2 +bcrypt==4.2.1 # via paramiko beautifulsoup4==4.9.3 # via -r requirements.in -billiard==4.2.0 +billiard==4.2.1 # via celery bleach==5.0.1 # via -r requirements.in @@ -41,38 +43,38 @@ botocore==1.29.165 # via # boto3 # s3transfer -build==1.0.3 +build==1.2.2.post1 # via pip-tools -cachecontrol==0.13.1 +cachecontrol==0.14.2 # via mapbox -cachetools==5.3.2 +cachetools==5.5.1 # via zenpy celery==5.3.4 # via -r requirements.in -certifi==2023.11.17 +certifi==2025.1.31 # via # requests # sentry-sdk -cffi==1.16.0 +cffi==1.17.1 # via # cryptography # pynacl -charset-normalizer==3.3.2 +charset-normalizer==3.4.1 # via requests -click==8.1.7 +click==8.1.8 # via # celery # click-didyoumean # click-plugins # click-repl # pip-tools -click-didyoumean==0.3.0 +click-didyoumean==0.3.1 # via celery click-plugins==1.1.1 # via celery click-repl==0.3.0 # via celery -cryptography==41.0.7 +cryptography==44.0.1 # via # jwcrypto # paramiko @@ -82,8 +84,6 @@ decorator==5.1.1 # via ipython defusedxml==0.7.1 # via djangorestframework-xml -deprecated==1.2.14 - # via jwcrypto dj-database-url==2.3.0 # via -r requirements.in django==4.2.19 @@ -134,11 +134,11 @@ djangorestframework-xml==2.0.0 # via -r requirements.in djangorestframework-yaml==2.0.0 # via -r requirements.in -docutils==0.20.1 +docutils==0.21.2 # via sphinx -et-xmlfile==1.1.0 +et-xmlfile==2.0.0 # via openpyxl -executing==2.0.1 +executing==2.2.0 # via stack-data fabric==2.6.0 # via -r requirements.in @@ -148,13 +148,13 @@ freezegun==1.2.2 # via -r requirements.in future==0.18.3 # via -r requirements.in -gprof2dot==2022.7.29 +gprof2dot==2024.6.6 # via django-silk graypy==2.1.0 # via -r requirements.in gunicorn==21.2.0 # via -r requirements.in -idna==3.6 +idna==3.10 # via requests imagesize==1.4.1 # via sphinx @@ -164,7 +164,7 @@ ipython==8.14.0 # via -r requirements.in iso3166==2.1.1 # via mapbox -jedi==0.19.1 +jedi==0.19.2 # via ipython jinja2==3.0.3 # via @@ -174,11 +174,11 @@ jmespath==1.0.1 # via # boto3 # botocore -joblib==1.3.2 +joblib==1.4.2 # via scikit-learn -jwcrypto==1.5.1 +jwcrypto==1.5.6 # via django-oauth-toolkit -kombu==5.3.4 +kombu==5.4.2 # via celery luqum==0.13.0 # via -r requirements.in @@ -186,11 +186,11 @@ mapbox==0.18.1 # via -r requirements.in markdown==3.4.1 # via -r requirements.in -markupsafe==2.1.3 +markupsafe==3.0.2 # via jinja2 -matplotlib-inline==0.1.6 +matplotlib-inline==0.1.7 # via ipython -msgpack==1.0.7 +msgpack==1.1.0 # via cachecontrol networkx==3.2.1 # via @@ -209,13 +209,13 @@ oauthlib==3.2.2 # django-oauth-toolkit openpyxl==3.1.0 # via -r requirements.in -packaging==23.2 +packaging==24.2 # via # build # gunicorn -paramiko==3.4.0 +paramiko==3.5.1 # via fabric -parso==0.8.3 +parso==0.8.4 # via jedi pathlib2==2.3.7.post1 # via fabric @@ -229,9 +229,9 @@ pip-tools==7.1.0 # via -r requirements.in ply==3.11 # via luqum -polyline==2.0.1 +polyline==2.0.2 # via mapbox -prompt-toolkit==3.0.43 +prompt-toolkit==3.0.50 # via # click-repl # ipython @@ -239,13 +239,13 @@ psycopg2-binary==2.9.6 # via -r requirements.in ptyprocess==0.7.0 # via pexpect -pure-eval==0.2.2 +pure-eval==0.2.3 # via stack-data -pycodestyle==2.11.1 +pycodestyle==2.12.1 # via autopep8 -pycparser==2.21 +pycparser==2.22 # via cffi -pygments==2.17.2 +pygments==2.19.1 # via # ipython # sphinx @@ -255,13 +255,13 @@ pynacl==1.5.0 # via paramiko pyparsing==2.4.7 # via -r requirements.in -pyproject-hooks==1.0.0 +pyproject-hooks==1.2.0 # via build pysndfile==1.4.4 # via -r requirements.in pysolr==3.10.0b1 # via -r requirements.in -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # botocore # celery @@ -276,11 +276,11 @@ pyyaml==6.0.1 # via # -r requirements.in # djangorestframework-yaml -redis==3.2.0 +redis==5.2.1 # via # -r requirements.in # django-redis -requests==2.31.0 +requests==2.32.3 # via # akismet # cachecontrol @@ -302,24 +302,23 @@ sentry-sdk[django]==2.21.0 # via -r requirements.in sgmllib3k==1.0.0 # via feedparser -six==1.16.0 +six==1.17.0 # via - # asttokens # bleach # pathlib2 # python-dateutil # sphinx snowballstemmer==2.2.0 # via sphinx -soupsieve==2.5 +soupsieve==2.6 # via beautifulsoup4 sphinx==1.6.3 # via -r requirements.in -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==2.0.0 # via sphinxcontrib-websupport sphinxcontrib-websupport==1.2.4 # via sphinx -sqlparse==0.4.4 +sqlparse==0.5.3 # via # django # django-debug-toolbar @@ -328,28 +327,30 @@ stack-data==0.6.3 # via ipython stripe==2.28.1 # via -r requirements.in -threadpoolctl==3.3.0 +threadpoolctl==3.5.0 # via scikit-learn toml==0.10.2 # via autopep8 -tomli==2.0.1 +tomli==2.2.1 # via # build # pip-tools - # pyproject-hooks -traitlets==5.14.0 +traitlets==5.14.3 # via # ipython # matplotlib-inline -typing-extensions==4.9.0 +typing-extensions==4.12.2 # via # asgiref # dj-database-url -tzdata==2023.4 - # via celery + # jwcrypto +tzdata==2025.1 + # via + # celery + # kombu uritemplate==4.1.1 # via mapbox -urllib3==1.26.18 +urllib3==1.26.20 # via # botocore # requests @@ -359,14 +360,12 @@ vine==5.1.0 # amqp # celery # kombu -wcwidth==0.2.12 +wcwidth==0.2.13 # via prompt-toolkit webencodings==0.5.1 # via bleach -wheel==0.42.0 +wheel==0.45.1 # via pip-tools -wrapt==1.16.0 - # via deprecated xlrd==2.0.1 # via -r requirements.in zenpy==1.1.3