Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade redis and async-timeout #35548

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Upgrade redis and async-timeout #35548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1fc59c
Upgrade redis and async-timeout
gherceg Dec 19, 2024
f9b404e
Unify RedisError imports
gherceg Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions corehq/form_processor/backends/sql/processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import uuid
from itertools import chain

import redis
from contextlib import ExitStack
from django.db import transaction, DatabaseError
from lxml import etree
from redis import RedisError

from casexml.apps.case import const
from casexml.apps.case.xform import get_case_updates
Expand Down Expand Up @@ -330,7 +330,7 @@ def get_case_with_lock(case_id, lock=False, wrap=False):
if lock:
try:
return CommCareCase.get_locked_obj(_id=case_id)
except redis.RedisError:
except RedisError:
case = CommCareCase.objects.get_case(case_id)
else:
case = CommCareCase.objects.get_case(case_id)
Expand Down
2 changes: 1 addition & 1 deletion corehq/form_processor/interfaces/processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from collections import namedtuple

from couchdbkit.exceptions import BulkSaveError
from redis.exceptions import RedisError
from redis import RedisError

from casexml.apps.case import const
from corehq.form_processor.exceptions import (
Expand Down
4 changes: 2 additions & 2 deletions requirements/dev-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ asttokens==2.0.5
# via
# stack-data
# transifex-python
async-timeout==4.0.2
async-timeout==5.0.1
# via
# aiohttp
# redis
Expand Down Expand Up @@ -624,7 +624,7 @@ radon==6.0.1
# via -r test-requirements.in
rcssmin==1.1.1
# via django-compressor
redis==4.5.4
redis==5.2.1
# via
# -r base-requirements.in
# django-redis
Expand Down
4 changes: 2 additions & 2 deletions requirements/docs-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ asgiref==3.7.2
# via django
asttokens==2.4.1
# via transifex-python
async-timeout==4.0.2
async-timeout==5.0.1
# via
# aiohttp
# redis
Expand Down Expand Up @@ -520,7 +520,7 @@ quickcache==0.5.4
# via -r base-requirements.in
rcssmin==1.1.1
# via django-compressor
redis==4.5.4
redis==5.2.1
# via
# -r base-requirements.in
# django-redis
Expand Down
4 changes: 2 additions & 2 deletions requirements/prod-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ asttokens==2.0.5
# via
# stack-data
# transifex-python
async-timeout==4.0.2
async-timeout==5.0.1
# via
# aiohttp
# redis
Expand Down Expand Up @@ -527,7 +527,7 @@ quickcache==0.5.4
# via -r base-requirements.in
rcssmin==1.1.1
# via django-compressor
redis==4.5.4
redis==5.2.1
# via
# -r base-requirements.in
# django-redis
Expand Down
4 changes: 2 additions & 2 deletions requirements/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ asgiref==3.7.2
# via django
asttokens==2.4.1
# via transifex-python
async-timeout==4.0.2
async-timeout==5.0.1
# via
# aiohttp
# redis
Expand Down Expand Up @@ -490,7 +490,7 @@ quickcache==0.5.4
# via -r base-requirements.in
rcssmin==1.1.1
# via django-compressor
redis==4.5.4
redis==5.2.1
# via
# -r base-requirements.in
# django-redis
Expand Down
4 changes: 2 additions & 2 deletions requirements/test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ asgiref==3.7.2
# via django
asttokens==2.4.1
# via transifex-python
async-timeout==4.0.2
async-timeout==5.0.1
# via
# aiohttp
# redis
Expand Down Expand Up @@ -537,7 +537,7 @@ radon==6.0.1
# via -r test-requirements.in
rcssmin==1.1.1
# via django-compressor
redis==4.5.4
redis==5.2.1
# via
# -r base-requirements.in
# django-redis
Expand Down
Loading