From 62ce978d8c572395d89ac7a52090833478bdfc47 Mon Sep 17 00:00:00 2001 From: Sanjin <102841251+duckduckgrayduck@users.noreply.github.com> Date: Mon, 9 Nov 2026 11:55:50 -0600 Subject: [PATCH 1/3] Use Valkey 9.1 locally to match staging and production --- local.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/local.yml b/local.yml index 3066264d..83b10b0e 100644 --- a/local.yml +++ b/local.yml @@ -45,10 +45,10 @@ services: - ./.envs/.local/.postgres documentcloud_redis: - image: redis:5.0 + image: valkey/valkey:9.1 documentcloud_processing_redis: - image: redis:5.0 + image: valkey/valkey:9.1 documentcloud_minio: image: minio/minio:RELEASE.2024-12-18T13-15-44Z From 54dc22c9a477c0cdff65c7e3a6434a8c6e81c403 Mon Sep 17 00:00:00 2001 From: Sanjin <102841251+duckduckgrayduck@users.noreply.github.com> Date: Mon, 9 Nov 2026 11:56:02 -0600 Subject: [PATCH 2/3] Upgrade redis to 8.1.0 in lambdas and drop setuptools pin --- .../documents/processing/document_conversion/requirements.txt | 2 +- .../documents/processing/info_and_image/requirements.txt | 2 +- documentcloud/documents/processing/ocr/requirements.txt | 3 +-- documentcloud/documents/processing/utils/requirements.txt | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/documentcloud/documents/processing/document_conversion/requirements.txt b/documentcloud/documents/processing/document_conversion/requirements.txt index 37009855..1f04197a 100644 --- a/documentcloud/documents/processing/document_conversion/requirements.txt +++ b/documentcloud/documents/processing/document_conversion/requirements.txt @@ -3,6 +3,6 @@ django-environ==0.13.0 furl==2.1.0 pebble==4.5.0 -redis==3.4.1 +redis==8.1.0 requests==2.33.0 sentry-sdk==2.57.0 diff --git a/documentcloud/documents/processing/info_and_image/requirements.txt b/documentcloud/documents/processing/info_and_image/requirements.txt index bee08a83..026f3cf9 100755 --- a/documentcloud/documents/processing/info_and_image/requirements.txt +++ b/documentcloud/documents/processing/info_and_image/requirements.txt @@ -6,7 +6,7 @@ django-environ==0.13.0 furl==2.1.0 listcrunch==1.0.0 pebble==4.5.0 -redis==3.4.1 +redis==8.1.0 requests==2.33.0 sentry-sdk==2.57.0 pymupdf==1.25.3 diff --git a/documentcloud/documents/processing/ocr/requirements.txt b/documentcloud/documents/processing/ocr/requirements.txt index a53ad4aa..44cb62dc 100755 --- a/documentcloud/documents/processing/ocr/requirements.txt +++ b/documentcloud/documents/processing/ocr/requirements.txt @@ -5,8 +5,7 @@ cpuprofile==1.0.1 django-environ==0.13.0 furl==2.1.0 pebble==4.5.0 -redis==3.4.1 +redis==8.1.0 requests==2.33.0 sentry-sdk==2.57.0 pymupdf==1.25.3 -setuptools<81 diff --git a/documentcloud/documents/processing/utils/requirements.txt b/documentcloud/documents/processing/utils/requirements.txt index 37009855..1f04197a 100644 --- a/documentcloud/documents/processing/utils/requirements.txt +++ b/documentcloud/documents/processing/utils/requirements.txt @@ -3,6 +3,6 @@ django-environ==0.13.0 furl==2.1.0 pebble==4.5.0 -redis==3.4.1 +redis==8.1.0 requests==2.33.0 sentry-sdk==2.57.0 From 3b44b23ca3e938e323686a9f6b50e80b40c65130 Mon Sep 17 00:00:00 2001 From: Sanjin <102841251+duckduckgrayduck@users.noreply.github.com> Date: Mon, 9 Nov 2026 11:58:16 -0600 Subject: [PATCH 3/3] Upgrade redis to 8.1.0, django-redis to 7.0.0 and fakeredis to 2.40.0 --- requirements/base.txt | 5 +++-- requirements/local.txt | 8 ++++---- requirements/production.txt | 5 +++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index bb7f5716..7a309d26 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -151,7 +151,7 @@ django-parler-rest==2.2 # via -r requirements/base.in django-premailer==0.2.0 # via -r requirements/base.in -django-redis==5.0.0 +django-redis==7.0.0 # via # -r requirements/base.in # python-redis-lock @@ -399,7 +399,7 @@ rcssmin==1.2.2 # via # -r requirements/base.in # django-compressor -redis==3.4.1 +redis==8.1.0 # via # -r requirements/base.in # django-redis @@ -465,6 +465,7 @@ typing-extensions==4.15.0 # -r requirements/base.in # aiohttp # aiosignal + # django-redis # grpcio # opentelemetry-api # opentelemetry-sdk diff --git a/requirements/local.txt b/requirements/local.txt index b8dd68f4..f8a1d4ab 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -233,7 +233,7 @@ django-parler-rest==2.2 # via -r requirements/base.txt django-premailer==0.2.0 # via -r requirements/base.txt -django-redis==5.0.0 +django-redis==7.0.0 # via # -r requirements/base.txt # python-redis-lock @@ -273,7 +273,7 @@ factory-boy==2.12.0 # via -r requirements/local.in faker==2.0.1 # via factory-boy -fakeredis==1.0.5 +fakeredis==2.40.0 # via -r requirements/local.in filelock==3.25.2 # via cachecontrol @@ -691,7 +691,7 @@ rcssmin==1.2.2 # via # -r requirements/base.txt # django-compressor -redis==3.4.1 +redis==8.1.0 # via # -r requirements/base.txt # django-redis @@ -741,7 +741,6 @@ six==1.17.0 # django-appconf # django-coverage-plugin # faker - # fakeredis # furl # html5lib # jsonschema @@ -814,6 +813,7 @@ typing-extensions==4.15.0 # -r requirements/base.txt # aiohttp # aiosignal + # django-redis # grpcio # opentelemetry-api # opentelemetry-sdk diff --git a/requirements/production.txt b/requirements/production.txt index 00db8ba6..d14e8a56 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -212,7 +212,7 @@ django-parler-rest==2.2 # via -r requirements/base.txt django-premailer==0.2.0 # via -r requirements/base.txt -django-redis==5.0.0 +django-redis==7.0.0 # via # -r requirements/base.txt # python-redis-lock @@ -557,7 +557,7 @@ rcssmin==1.2.2 # via # -r requirements/base.txt # django-compressor -redis==3.4.1 +redis==8.1.0 # via # -r requirements/base.txt # django-redis @@ -642,6 +642,7 @@ typing-extensions==4.15.0 # -r requirements/base.txt # aiohttp # aiosignal + # django-redis # grpcio # opentelemetry-api # opentelemetry-sdk