Skip to content

Commit

Permalink
Allow to use redis>=5 (apache#38385)
Browse files Browse the repository at this point in the history
  • Loading branch information
Taragolis authored and utkarsharma2 committed Apr 22, 2024
1 parent d95861e commit 56282a7
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion airflow/providers/celery/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ dependencies:
# (https://docs.celeryq.dev/en/stable/contributing.html?highlight=semver#versions).
# Make sure that the limit here is synchronized with [celery] extra in the airflow core
# The 5.3.3/5.3.2 limit comes from https://github.com/celery/celery/issues/8470
- celery>=5.3.0,<6,!=5.3.3,!=5.3.2
- celery[redis]>=5.3.0,<6,!=5.3.3,!=5.3.2
- flower>=1.0.0
- google-re2>=1.0

Expand Down
7 changes: 2 additions & 5 deletions airflow/providers/redis/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,8 @@ versions:

dependencies:
- apache-airflow>=2.6.0
# We limit redis to <5.0.0 because of incompatibility with celery. Both Celery and Kombu limited it
# and deferred fixing it for later, we should bump the limit once they do. Also !=4.5.5 matches celery
# limits and prevents installing 4.5.5 which is broken.
# https://github.com/celery/celery/pull/8442, https://github.com/celery/kombu/pull/1776
- redis>=4.5.2,<5.0.0,!=4.5.5
# 5.0.2 excluded due to breaking changes which fixed in https://github.com/redis/redis-py/pull/3176
- redis>=4.5.2,!=4.5.5,!=5.0.2

integrations:
- integration-name: Redis
Expand Down
4 changes: 2 additions & 2 deletions generated/provider_dependencies.json
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
"celery": {
"deps": [
"apache-airflow>=2.6.0",
"celery>=5.3.0,<6,!=5.3.3,!=5.3.2",
"celery[redis]>=5.3.0,<6,!=5.3.3,!=5.3.2",
"flower>=1.0.0",
"google-re2>=1.0"
],
Expand Down Expand Up @@ -957,7 +957,7 @@
"redis": {
"deps": [
"apache-airflow>=2.6.0",
"redis>=4.5.2,<5.0.0,!=4.5.5"
"redis>=4.5.2,!=4.5.5,!=5.0.2"
],
"devel-deps": [],
"cross-providers-deps": [],
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ atlassian-jira = [ # source: airflow/providers/atlassian/jira/provider.yaml
"beautifulsoup4",
]
celery = [ # source: airflow/providers/celery/provider.yaml
"celery>=5.3.0,<6,!=5.3.3,!=5.3.2",
"celery[redis]>=5.3.0,<6,!=5.3.3,!=5.3.2",
"flower>=1.0.0",
"google-re2>=1.0",
]
Expand Down Expand Up @@ -906,7 +906,7 @@ qdrant = [ # source: airflow/providers/qdrant/provider.yaml
"qdrant_client>=1.7.0",
]
redis = [ # source: airflow/providers/redis/provider.yaml
"redis>=4.5.2,<5.0.0,!=4.5.5",
"redis>=4.5.2,!=4.5.5,!=5.0.2",
]
salesforce = [ # source: airflow/providers/salesforce/provider.yaml
"pandas>=1.2.5,<2.2",
Expand Down

0 comments on commit 56282a7

Please sign in to comment.