From 9cf5d9d861a56d136f71377f6d356f5da651c1f2 Mon Sep 17 00:00:00 2001 From: Muhammad Soban Javed <58461728+iamsobanjaved@users.noreply.github.com> Date: Wed, 9 Mar 2022 13:20:49 +0500 Subject: [PATCH] Revert "[SE-4860] Upgrade Celery to v5.2.1" --- requirements/constraints.txt | 14 +++++----- requirements/edx-sandbox/py38.txt | 2 +- requirements/edx/base.txt | 34 +++++++---------------- requirements/edx/development.txt | 44 +++++++----------------------- requirements/edx/doc.txt | 2 +- requirements/edx/github.in | 2 +- requirements/edx/pip-tools.txt | 2 +- requirements/edx/testing.txt | 45 ++++++++----------------------- 8 files changed, 43 insertions(+), 102 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index f1e1c503ed96..1fef670caed4 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -12,16 +12,15 @@ # This file contains all common constraints for edx-repos -c common_constraints.txt -# 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 +# celert>5.0.0 hasn't been tested yet, so the constraint will be removed after testing latest version +celery<5.0.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 @@ -81,6 +80,9 @@ 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. diff --git a/requirements/edx-sandbox/py38.txt b/requirements/edx-sandbox/py38.txt index 590c9b32de47..d9a65b23a6d8 100644 --- a/requirements/edx-sandbox/py38.txt +++ b/requirements/edx-sandbox/py38.txt @@ -10,7 +10,7 @@ cffi==1.15.0 # via cryptography chem==1.2.0 # via -r requirements/edx-sandbox/py38.in -click==8.0.3 +click==7.1.2 # via # -c requirements/edx-sandbox/../constraints.txt # nltk diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 7973e46b48bd..7f91ee0263e2 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -36,7 +36,7 @@ aiohttp==3.8.1 # via geoip2 aiosignal==1.2.0 # via aiohttp -amqp==5.0.9 +amqp==2.6.1 # via kombu analytics-python==1.4.0 # via -r requirements/edx/base.in @@ -91,7 +91,7 @@ botocore==1.8.17 # s3transfer bridgekeeper==0.9 # via -r requirements/edx/base.in -celery==5.2.3 +celery==4.4.7 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in @@ -119,22 +119,12 @@ charset-normalizer==2.0.12 # requests chem==1.2.0 # via -r requirements/edx/base.in -click==8.0.3 +click==7.1.2 # 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 @@ -245,8 +235,10 @@ django-appconf==1.0.5 # django-statici18n django-cache-memoize==0.1.10 # via edx-enterprise -django-celery-results==2.2.0 - # via -r requirements/edx/base.in +django-celery-results==2.0.1 + # via + # -c requirements/edx/../constraints.txt + # -r requirements/edx/base.in django-classy-tags==3.0.1 # via django-sekizai django-config-models==2.3.0 @@ -606,7 +598,7 @@ jsonfield==3.1.0 # ora2 jwcrypto==1.0 # via pylti1p3 -kombu==5.2.3 +kombu==4.6.11 # via celery laboratory==1.0.2 # via -r requirements/edx/base.in @@ -749,8 +741,6 @@ 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 @@ -941,7 +931,6 @@ six==1.16.0 # analytics-python # bleach # chem - # click-repl # codejail # crowdsourcehinter-xblock # edx-ace @@ -1037,17 +1026,14 @@ urllib3==1.26.8 # requests user-util==1.0.0 # via -r requirements/edx/base.in -vine==5.0.0 +vine==1.3.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 @@ -1090,7 +1076,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@v1.12.0 +xblock-poll @ git+https://github.com/open-craft/xblock-poll@922cd36fb1c3cfe00b4ce03b19a13185d136447d # via -r requirements/edx/github.in xblock-utils==3.0.0 # via diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 2c6f9d43b954..e4a34f957303 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -42,7 +42,7 @@ aiosignal==1.2.0 # aiohttp alabaster==0.7.12 # via sphinx -amqp==5.0.9 +amqp==2.6.1 # via # -r requirements/edx/testing.txt # kombu @@ -128,7 +128,7 @@ botocore==1.8.17 # s3transfer bridgekeeper==0.9 # via -r requirements/edx/testing.txt -celery==5.2.3 +celery==4.4.7 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt @@ -159,17 +159,13 @@ charset-normalizer==2.0.12 # requests chem==1.2.0 # via -r requirements/edx/testing.txt -click==8.0.3 +click==7.1.2 # 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 @@ -177,22 +173,10 @@ click==8.0.3 # 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 @@ -331,8 +315,10 @@ django-cache-memoize==0.1.10 # via # -r requirements/edx/testing.txt # edx-enterprise -django-celery-results==2.2.0 - # via -r requirements/edx/testing.txt +django-celery-results==2.0.1 + # via + # -c requirements/edx/../constraints.txt + # -r requirements/edx/testing.txt django-classy-tags==3.0.1 # via # -r requirements/edx/testing.txt @@ -815,7 +801,7 @@ jwcrypto==1.0 # via # -r requirements/edx/testing.txt # pylti1p3 -kombu==5.2.3 +kombu==4.6.11 # via # -r requirements/edx/testing.txt # celery @@ -1019,10 +1005,6 @@ 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 @@ -1323,7 +1305,6 @@ six==1.16.0 # bleach # bok-choy # chem - # click-repl # codejail # crowdsourcehinter-xblock # edx-ace @@ -1513,12 +1494,11 @@ uvicorn==0.17.5 # via # -r requirements/edx/testing.txt # pact-python -vine==5.0.0 +vine==1.3.0 # via # -r requirements/edx/testing.txt # amqp # celery - # kombu virtualenv==20.13.3 # via # -r requirements/edx/testing.txt @@ -1531,10 +1511,6 @@ 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 @@ -1584,7 +1560,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@v1.12.0 +xblock-poll @ git+https://github.com/open-craft/xblock-poll@922cd36fb1c3cfe00b4ce03b19a13185d136447d # via -r requirements/edx/testing.txt xblock-utils==3.0.0 # via diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 114ca6cf6406..2c01c4adaa71 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -12,7 +12,7 @@ certifi==2021.10.8 # via requests charset-normalizer==2.0.12 # via requests -click==8.0.3 +click==7.1.2 # via # -c requirements/edx/../constraints.txt # code-annotations diff --git a/requirements/edx/github.in b/requirements/edx/github.in index 54d08e572a21..c2f4f0333c7b 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -73,5 +73,5 @@ git+https://github.com/edx/django-require.git@0c54adb167142383b26ea6b3edecc32118 # Third Party XBlocks -git+https://github.com/open-craft/xblock-poll@v1.12.0#egg=xblock-poll==1.12.0 +git+https://github.com/open-craft/xblock-poll@922cd36fb1c3cfe00b4ce03b19a13185d136447d#egg=xblock-poll==1.10.2 git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.3.5#egg=xblock-drag-and-drop-v2==2.3.5 diff --git a/requirements/edx/pip-tools.txt b/requirements/edx/pip-tools.txt index 4b52420675cb..677b8fbd16c2 100644 --- a/requirements/edx/pip-tools.txt +++ b/requirements/edx/pip-tools.txt @@ -4,7 +4,7 @@ # # make upgrade # -click==8.0.3 +click==7.1.2 # via # -c requirements/edx/../constraints.txt # pip-tools diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 3b828ec46e00..c3dd43194ad2 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -40,7 +40,7 @@ aiosignal==1.2.0 # via # -r requirements/edx/base.txt # aiohttp -amqp==5.0.9 +amqp==2.6.1 # via # -r requirements/edx/base.txt # kombu @@ -75,6 +75,7 @@ attrs==21.4.0 # aiohttp # edx-ace # openedx-events + # outcome # pytest babel==2.9.1 # via @@ -122,7 +123,7 @@ botocore==1.8.17 # s3transfer bridgekeeper==0.9 # via -r requirements/edx/base.txt -celery==5.2.3 +celery==4.4.7 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt @@ -153,35 +154,19 @@ charset-normalizer==2.0.12 # requests chem==1.2.0 # via -r requirements/edx/base.txt -click==8.0.3 +click==7.1.2 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt - # celery - # click-didyoumean # click-log - # click-plugins - # click-repl # code-annotations # edx-lint # nltk # pact-python # user-util # uvicorn -click-didyoumean==0.3.0 - # via - # -r requirements/edx/base.txt - # celery click-log==0.3.2 # via edx-lint -click-plugins==1.1.1 - # via - # -r requirements/edx/base.txt - # celery -click-repl==0.2.0 - # via - # -r requirements/edx/base.txt - # celery code-annotations==1.3.0 # via # -r requirements/edx/base.txt @@ -318,8 +303,10 @@ django-cache-memoize==0.1.10 # via # -r requirements/edx/base.txt # edx-enterprise -django-celery-results==2.2.0 - # via -r requirements/edx/base.txt +django-celery-results==2.0.1 + # via + # -c requirements/edx/../constraints.txt + # -r requirements/edx/base.txt django-classy-tags==3.0.1 # via # -r requirements/edx/base.txt @@ -775,7 +762,7 @@ jwcrypto==1.0 # via # -r requirements/edx/base.txt # pylti1p3 -kombu==5.2.3 +kombu==4.6.11 # via # -r requirements/edx/base.txt # celery @@ -959,10 +946,6 @@ polib==1.1.1 # -r requirements/edx/base.txt # -r requirements/edx/testing.in # edx-i18n-tools -prompt-toolkit==3.0.27 - # via - # -r requirements/edx/base.txt - # click-repl psutil==5.9.0 # via # -r requirements/edx/base.txt @@ -1246,7 +1229,6 @@ six==1.16.0 # bleach # bok-choy # chem - # click-repl # codejail # crowdsourcehinter-xblock # edx-ace @@ -1397,12 +1379,11 @@ user-util==1.0.0 # via -r requirements/edx/base.txt uvicorn==0.17.5 # via pact-python -vine==5.0.0 +vine==1.3.0 # via # -r requirements/edx/base.txt # amqp # celery - # kombu virtualenv==20.13.3 # via tox voluptuous==0.12.2 @@ -1411,10 +1392,6 @@ voluptuous==0.12.2 # ora2 watchdog==2.1.6 # via -r requirements/edx/base.txt -wcwidth==0.2.5 - # via - # -r requirements/edx/base.txt - # prompt-toolkit web-fragments==2.0.0 # via # -r requirements/edx/base.txt @@ -1460,7 +1437,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/base.txt -xblock-poll @ git+https://github.com/open-craft/xblock-poll@v1.12.0 +xblock-poll @ git+https://github.com/open-craft/xblock-poll@922cd36fb1c3cfe00b4ce03b19a13185d136447d # via -r requirements/edx/base.txt xblock-utils==3.0.0 # via