feat: update celery version (#605)

openedx-unsupported · Apr 30, 2024 · c08b3d9 · c08b3d9
1 parent ce16df4
commit c08b3d9
Show file tree

Hide file tree

Showing 10 changed files with 295 additions and 86 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -46,7 +46,9 @@ jobs:
         make validate_translations
     - name: Run Coverage
       if: matrix.python-version == '3.8' && matrix.toxenv=='django42'
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v4
       with:
         flags: unittests
+        file: ./coverage.xml
         fail_ci_if_error: true
+        token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-amqp==2.6.1
+amqp==5.2.0
     # via kombu
 analytics-python==1.4.post1
     # via -r requirements/base.in
@@ -17,13 +17,15 @@ async-timeout==4.0.3
     # via redis
 backoff==1.10.0
     # via analytics-python
-backports-zoneinfo==0.2.1
+backports-zoneinfo[tzdata]==0.2.1
     # via
+    #   celery
     #   django
     #   djangorestframework
-billiard==3.6.4.0
+    #   kombu
+billiard==4.2.0
     # via celery
-celery==4.4.7
+celery==5.4.0
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.in
@@ -37,7 +39,18 @@ cffi==1.16.0
 charset-normalizer==3.3.2
     # via requests
 click==8.1.7
-    # via edx-django-utils
+    # via
+    #   celery
+    #   click-didyoumean
+    #   click-plugins
+    #   click-repl
+    #   edx-django-utils
+click-didyoumean==0.3.1
+    # via celery
+click-plugins==1.1.1
+    # via celery
+click-repl==0.3.0
+    # via celery
 cryptography==42.0.5
     # via
     #   pyjwt
@@ -134,7 +147,7 @@ idna==3.7
     # via requests
 inflection==0.5.1
     # via drf-yasg
-kombu==4.6.11
+kombu==5.3.7
     # via celery
 monotonic==1.6
     # via analytics-python
@@ -150,6 +163,8 @@ packaging==24.0
     # via drf-yasg
 pbr==6.0.0
     # via stevedore
+prompt-toolkit==3.0.43
+    # via click-repl
 psutil==5.9.8
     # via edx-django-utils
 pycparser==2.22
@@ -166,7 +181,9 @@ pymongo==4.4.0
 pynacl==1.5.0
     # via edx-django-utils
 python-dateutil==2.9.0.post0
-    # via analytics-python
+    # via
+    #   analytics-python
+    #   celery
 python-slugify==4.0.1
     # via
     #   -c requirements/constraints.txt
@@ -176,7 +193,6 @@ python3-openid==3.2.0
 pytz==2024.1
     # via
     #   -r requirements/base.in
-    #   celery
     #   drf-yasg
 pyyaml==6.0.1
     # via
@@ -224,13 +240,21 @@ typing-extensions==4.11.0
     # via
     #   asgiref
     #   edx-opaque-keys
+    #   kombu
+tzdata==2024.1
+    # via
+    #   backports-zoneinfo
+    #   celery
 uritemplate==4.1.1
     # via drf-yasg
 urllib3==1.26.18
     # via
     #   -c requirements/constraints.txt
     #   requests
-vine==1.3.0
+vine==5.1.0
     # via
     #   amqp
     #   celery
+    #   kombu
+wcwidth==0.2.13
+    # via prompt-toolkit
diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
@@ -3,6 +3,11 @@
 # See BOM-2721 for more details.
 # Below is the copied and edited version of common_constraints
 
+# This is a temporary solution to override the real common_constraints.txt
+# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
+# See BOM-2721 for more details.
+# Below is the copied and edited version of common_constraints
+
 # A central location for most common version constraints
 # (across edx repos) for pip-installation.
 #

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -21,7 +21,7 @@ django-extensions<3.2.0
 django-storages==1.10.1
 
 # From base.in
-celery<5.0  # version 5.0 drops support for python 3.5
+celery<6.0  # keeping the version same as edx-platform
 
 
 code-annotations>=0.3.1  # Pinned to avoid pyyaml security alerts. (https://github.com/openedx/registrar/pull/42)

diff --git a/requirements/devstack.txt b/requirements/devstack.txt
@@ -12,7 +12,7 @@ alabaster==0.7.13
     # via
     #   -r requirements/local.txt
     #   sphinx
-amqp==2.6.1
+amqp==5.2.0
     # via
     #   -r requirements/local.txt
     #   kombu
@@ -42,25 +42,27 @@ backoff==1.10.0
     # via
     #   -r requirements/local.txt
     #   analytics-python
-backports-zoneinfo==0.2.1
+backports-zoneinfo[tzdata]==0.2.1
     # via
     #   -r requirements/local.txt
+    #   celery
     #   django
     #   djangorestframework
+    #   kombu
 beautifulsoup4==4.12.3
     # via
     #   -r requirements/local.txt
     #   pydata-sphinx-theme
-billiard==3.6.4.0
+billiard==4.2.0
     # via
     #   -r requirements/local.txt
     #   celery
-boto3==1.34.92
+boto3==1.34.94
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/local.txt
     #   moto
-botocore==1.34.92
+botocore==1.34.94
     # via
     #   -r requirements/local.txt
     #   boto3
@@ -70,7 +72,7 @@ cachetools==5.3.3
     # via
     #   -r requirements/local.txt
     #   tox
-celery==4.4.7
+celery==5.4.0
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/local.txt
@@ -95,14 +97,30 @@ charset-normalizer==3.3.2
 click==8.1.7
     # via
     #   -r requirements/local.txt
+    #   celery
+    #   click-didyoumean
     #   click-log
+    #   click-plugins
+    #   click-repl
     #   code-annotations
     #   edx-django-utils
     #   edx-lint
+click-didyoumean==0.3.1
+    # via
+    #   -r requirements/local.txt
+    #   celery
 click-log==0.4.0
     # via
     #   -r requirements/local.txt
     #   edx-lint
+click-plugins==1.1.1
+    # via
+    #   -r requirements/local.txt
+    #   celery
+click-repl==0.3.0
+    # via
+    #   -r requirements/local.txt
+    #   celery
 code-annotations==1.8.0
     # via
     #   -c requirements/constraints.txt
@@ -256,11 +274,11 @@ exceptiongroup==1.2.1
     #   pytest
 factory-boy==3.3.0
     # via -r requirements/local.txt
-faker==24.14.0
+faker==25.0.0
     # via
     #   -r requirements/local.txt
     #   factory-boy
-filelock==3.13.4
+filelock==3.14.0
     # via
     #   -r requirements/local.txt
     #   tox
@@ -303,7 +321,7 @@ jmespath==1.0.1
     #   -r requirements/local.txt
     #   boto3
     #   botocore
-kombu==4.6.11
+kombu==5.3.7
     # via
     #   -r requirements/local.txt
     #   celery
@@ -333,7 +351,7 @@ monotonic==1.6
     # via
     #   -r requirements/local.txt
     #   analytics-python
-moto==5.0.5
+moto==5.0.6
     # via -r requirements/local.txt
 mysqlclient==2.2.4
     # via -r requirements/nonlocal.txt
@@ -383,6 +401,10 @@ polib==1.2.0
     # via
     #   -r requirements/local.txt
     #   edx-i18n-tools
+prompt-toolkit==3.0.43
+    # via
+    #   -r requirements/local.txt
+    #   click-repl
 psutil==5.9.8
     # via
     #   -r requirements/local.txt
@@ -445,7 +467,7 @@ pyproject-api==1.6.1
     # via
     #   -r requirements/local.txt
     #   tox
-pytest==8.1.1
+pytest==8.2.0
     # via
     #   -r requirements/local.txt
     #   pytest-cov
@@ -459,6 +481,7 @@ python-dateutil==2.9.0.post0
     #   -r requirements/local.txt
     #   analytics-python
     #   botocore
+    #   celery
     #   faker
     #   freezegun
     #   moto
@@ -478,7 +501,6 @@ pytz==2024.1
     # via
     #   -r requirements/local.txt
     #   babel
-    #   celery
     #   drf-yasg
 pywatchman==2.0.0
     # via -r requirements/local.txt
@@ -630,17 +652,22 @@ tomlkit==0.12.4
     # via
     #   -r requirements/local.txt
     #   pylint
-tox==4.14.2
+tox==4.15.0
     # via -r requirements/local.txt
 typing-extensions==4.11.0
     # via
     #   -r requirements/local.txt
     #   asgiref
     #   astroid
     #   edx-opaque-keys
-    #   faker
+    #   kombu
     #   pydata-sphinx-theme
     #   pylint
+tzdata==2024.1
+    # via
+    #   -r requirements/local.txt
+    #   backports-zoneinfo
+    #   celery
 uritemplate==4.1.1
     # via
     #   -r requirements/local.txt
@@ -652,15 +679,20 @@ urllib3==1.26.18
     #   botocore
     #   requests
     #   responses
-vine==1.3.0
+vine==5.1.0
     # via
     #   -r requirements/local.txt
     #   amqp
     #   celery
-virtualenv==20.26.0
+    #   kombu
+virtualenv==20.26.1
     # via
     #   -r requirements/local.txt
     #   tox
+wcwidth==0.2.13
+    # via
+    #   -r requirements/local.txt
+    #   prompt-toolkit
 werkzeug==3.0.2
     # via
     #   -r requirements/local.txt