Skip to content

[SE-4860] Upgrade Celery to v5.2.1 #29046

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

Merged
iamsobanjaved merged 2 commits into from
Mar 9, 2022
Merged

[SE-4860] Upgrade Celery to v5.2.1 #29046

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
0b0ea1c
chore(dependencies): bump celery dependencies
gabor-boros Dec 22, 2021
df50d37
chore(dependencies): upgrade dependencies
gabor-boros Feb 10, 2022
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
14 changes: 6 additions & 8 deletions requirements/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,16 @@
# This file contains all common constraints for edx-repos
-c common_constraints.txt

# celert>5.0.0 hasn't been tested yet, so the constraint will be removed after testing latest version
celery<5.0.0
# As it is not clarified what exact breaking changes will be introduced as per
# the next major release, ensure the installed version is within boundaries.
celery>=5.2.2,<6.0.0

# required for celery>=5.2.0;<5.3.0
click>=8.0,<9.0

# edx-platform currently only supported for Django 3.2.x
django<3.3

# Newer versions need celery >= 5.0
django-celery-results<2.1

# We do not support version django-config-models<1.0.0
django-config-models>=1.0.0

Expand Down Expand Up @@ -80,9 +81,6 @@ python-slugify<5.0.0
# greater version has breaking changes and requires some migration steps.
django-webpack-loader==0.7.0

# celery requires click<8.0.0 which would be fixed once https://github.com/celery/celery/issues/6753 is done.
click<8.0.0

# Release 2.1.0 pulls declares `pact-python` as a base requirement, even though it should be
# a testing requirement. Installing it would cause a bunch of new tool packages to become base
# requirements of edx-platform. Pinning temporarily until this is resolved in edx-val.
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx-sandbox/py38.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ cffi==1.15.0
# via cryptography
chem==1.2.0
# via -r requirements/edx-sandbox/py38.in
click==7.1.2
click==8.0.3
# via
# -c requirements/edx-sandbox/../constraints.txt
# nltk
Expand Down
34 changes: 24 additions & 10 deletions requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ aiohttp==3.8.1
# via geoip2
aiosignal==1.2.0
# via aiohttp
amqp==2.6.1
amqp==5.0.9
# via kombu
analytics-python==1.4.0
# via -r requirements/edx/base.in
Expand Down Expand Up @@ -91,7 +91,7 @@ botocore==1.8.17
# s3transfer
bridgekeeper==0.9
# via -r requirements/edx/base.in
celery==4.4.7
celery==5.2.3
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.in
Expand Down Expand Up @@ -119,12 +119,22 @@ charset-normalizer==2.0.12
# requests
chem==1.2.0
# via -r requirements/edx/base.in
click==7.1.2
click==8.0.3
# via
# -c requirements/edx/../constraints.txt
# celery
# click-didyoumean
# click-plugins
# click-repl
# code-annotations
# nltk
# user-util
click-didyoumean==0.3.0
# via celery
click-plugins==1.1.1
# via celery
click-repl==0.2.0
# via celery
code-annotations==1.3.0
# via
# edx-enterprise
Expand Down Expand Up @@ -235,10 +245,8 @@ django-appconf==1.0.5
# django-statici18n
django-cache-memoize==0.1.10
# via edx-enterprise
django-celery-results==2.0.1
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.in
django-celery-results==2.2.0
# via -r requirements/edx/base.in
django-classy-tags==3.0.1
# via django-sekizai
django-config-models==2.3.0
Expand Down Expand Up @@ -598,7 +606,7 @@ jsonfield==3.1.0
# ora2
jwcrypto==1.0
# via pylti1p3
kombu==4.6.11
kombu==5.2.3
# via celery
laboratory==1.0.2
# via -r requirements/edx/base.in
Expand Down Expand Up @@ -741,6 +749,8 @@ pillow==9.0.1
# edx-organizations
polib==1.1.1
# via edx-i18n-tools
prompt-toolkit==3.0.27
# via click-repl
psutil==5.9.0
# via
# -r requirements/edx/paver.txt
Expand Down Expand Up @@ -931,6 +941,7 @@ six==1.16.0
# analytics-python
# bleach
# chem
# click-repl
# codejail
# crowdsourcehinter-xblock
# edx-ace
Expand Down Expand Up @@ -1026,14 +1037,17 @@ urllib3==1.26.8
# requests
user-util==1.0.0
# via -r requirements/edx/base.in
vine==1.3.0
vine==5.0.0
# via
# amqp
# celery
# kombu
voluptuous==0.12.2
# via ora2
watchdog==2.1.6
# via -r requirements/edx/paver.txt
wcwidth==0.2.5
# via prompt-toolkit
web-fragments==2.0.0
# via
# -r requirements/edx/base.in
Expand Down Expand Up @@ -1076,7 +1090,7 @@ xblock==1.6.1
# xblock-utils
xblock-drag-and-drop-v2 @ git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.3.5
# via -r requirements/edx/github.in
xblock-poll @ git+https://github.com/open-craft/xblock-poll@922cd36fb1c3cfe00b4ce03b19a13185d136447d
xblock-poll @ git+https://github.com/open-craft/xblock-poll@v1.12.0
# via -r requirements/edx/github.in
xblock-utils==3.0.0
# via
Expand Down
44 changes: 34 additions & 10 deletions requirements/edx/development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ aiosignal==1.2.0
# aiohttp
alabaster==0.7.12
# via sphinx
amqp==2.6.1
amqp==5.0.9
# via
# -r requirements/edx/testing.txt
# kombu
Expand Down Expand Up @@ -128,7 +128,7 @@ botocore==1.8.17
# s3transfer
bridgekeeper==0.9
# via -r requirements/edx/testing.txt
celery==4.4.7
celery==5.2.3
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/testing.txt
Expand Down Expand Up @@ -159,24 +159,40 @@ charset-normalizer==2.0.12
# requests
chem==1.2.0
# via -r requirements/edx/testing.txt
click==7.1.2
click==8.0.3
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/development.in
# -r requirements/edx/pip-tools.txt
# -r requirements/edx/testing.txt
# celery
# click-didyoumean
# click-log
# click-plugins
# click-repl
# code-annotations
# edx-lint
# nltk
# pact-python
# pip-tools
# user-util
# uvicorn
click-didyoumean==0.3.0
# via
# -r requirements/edx/testing.txt
# celery
click-log==0.3.2
# via
# -r requirements/edx/testing.txt
# edx-lint
click-plugins==1.1.1
# via
# -r requirements/edx/testing.txt
# celery
click-repl==0.2.0
# via
# -r requirements/edx/testing.txt
# celery
code-annotations==1.3.0
# via
# -r requirements/edx/testing.txt
Expand Down Expand Up @@ -315,10 +331,8 @@ django-cache-memoize==0.1.10
# via
# -r requirements/edx/testing.txt
# edx-enterprise
django-celery-results==2.0.1
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/testing.txt
django-celery-results==2.2.0
# via -r requirements/edx/testing.txt
django-classy-tags==3.0.1
# via
# -r requirements/edx/testing.txt
Expand Down Expand Up @@ -801,7 +815,7 @@ jwcrypto==1.0
# via
# -r requirements/edx/testing.txt
# pylti1p3
kombu==4.6.11
kombu==5.2.3
# via
# -r requirements/edx/testing.txt
# celery
Expand Down Expand Up @@ -1005,6 +1019,10 @@ polib==1.1.1
# via
# -r requirements/edx/testing.txt
# edx-i18n-tools
prompt-toolkit==3.0.27
# via
# -r requirements/edx/testing.txt
# click-repl
psutil==5.9.0
# via
# -r requirements/edx/testing.txt
Expand Down Expand Up @@ -1305,6 +1323,7 @@ six==1.16.0
# bleach
# bok-choy
# chem
# click-repl
# codejail
# crowdsourcehinter-xblock
# edx-ace
Expand Down Expand Up @@ -1494,11 +1513,12 @@ uvicorn==0.17.5
# via
# -r requirements/edx/testing.txt
# pact-python
vine==1.3.0
vine==5.0.0
# via
# -r requirements/edx/testing.txt
# amqp
# celery
# kombu
virtualenv==20.13.3
# via
# -r requirements/edx/testing.txt
Expand All @@ -1511,6 +1531,10 @@ vulture==2.3
# via -r requirements/edx/development.in
watchdog==2.1.6
# via -r requirements/edx/testing.txt
wcwidth==0.2.5
# via
# -r requirements/edx/testing.txt
# prompt-toolkit
web-fragments==2.0.0
# via
# -r requirements/edx/testing.txt
Expand Down Expand Up @@ -1560,7 +1584,7 @@ xblock==1.6.1
# xblock-utils
xblock-drag-and-drop-v2 @ git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.3.5
# via -r requirements/edx/testing.txt
xblock-poll @ git+https://github.com/open-craft/xblock-poll@922cd36fb1c3cfe00b4ce03b19a13185d136447d
xblock-poll @ git+https://github.com/open-craft/xblock-poll@v1.12.0
# via -r requirements/edx/testing.txt
xblock-utils==3.0.0
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/doc.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ certifi==2021.10.8
# via requests
charset-normalizer==2.0.12
# via requests
click==7.1.2
click==8.0.3
# via
# -c requirements/edx/../constraints.txt
# code-annotations
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/github.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,5 @@ git+https://github.com/edx/django-require.git@0c54adb167142383b26ea6b3edecc32118

# Third Party XBlocks

git+https://github.com/open-craft/xblock-poll@922cd36fb1c3cfe00b4ce03b19a13185d136447d#egg=xblock-poll==1.10.2
git+https://github.com/open-craft/xblock-poll@v1.12.0#egg=xblock-poll==1.12.0
Comment thread
gabor-boros marked this conversation as resolved.
Outdated
git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.3.5#egg=xblock-drag-and-drop-v2==2.3.5
2 changes: 1 addition & 1 deletion requirements/edx/pip-tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
click==7.1.2
click==8.0.3
# via
# -c requirements/edx/../constraints.txt
# pip-tools
Expand Down
Loading