Skip to content

Commit

Permalink
fix: update celery constraint to fix make upgrade (#113)
Browse files Browse the repository at this point in the history
* fix: update celery constraint to fix make upgrade

Celery is currently pinned to ==5.0.04 which is causing make upgrade issues in edx-platform, so changing that constraint to <6.0

* fix: remove click constraint

* chore: Updating Python Requirements

Co-authored-by: edX requirements bot <[email protected]>
  • Loading branch information
iamsobanjaved and edx-requirements-bot authored Jan 24, 2022
1 parent 539edec commit 2e64b26
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 27 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ Unreleased
~~~~~~~~~~
*

[1.2.1] - 2022-01-24
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Updated celery constraint to <6.0 to fix make upgrade failure in edx-platform

[1.2.0] - 2022-01-19
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Removed Django22, 30, 31 support
Expand Down
2 changes: 1 addition & 1 deletion celery_utils/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
Code to support working with celery.
"""

__version__ = '1.2.0'
__version__ = '1.2.1'

default_app_config = 'celery_utils.apps.CeleryUtilsConfig' # pylint: disable=invalid-name
10 changes: 6 additions & 4 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,16 @@
#
amqp==5.0.9
# via kombu
asgiref==3.4.1
asgiref==3.5.0
# via django
billiard==3.6.4.0
# via celery
celery==5.0.4
celery==5.2.3
# via
# -c requirements/constraints.txt
# -r requirements/base.in
click==7.1.2
click==8.0.3
# via
# -c requirements/constraints.txt
# celery
# click-didyoumean
# click-plugins
Expand Down Expand Up @@ -58,3 +57,6 @@ vine==5.0.0
# kombu
wcwidth==0.2.5
# via prompt-toolkit

# The following packages are considered to be unsafe in a requirements file:
# setuptools
4 changes: 2 additions & 2 deletions requirements/celery50.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
amqp==5.0.9
billiard==3.6.4.0
celery==5.0.4
click==7.1.2
celery==5.2.3
click==8.0.3
click-didyoumean==0.3.0
click-repl==0.2.0
kombu==5.2.3
Expand Down
2 changes: 1 addition & 1 deletion requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pluggy==1.0.0
# via tox
py==1.11.0
# via tox
pyparsing==3.0.6
pyparsing==3.0.7
# via packaging
requests==2.27.1
# via codecov
Expand Down
5 changes: 1 addition & 4 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,4 @@
-c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt

# pinning it to latest release.
celery==5.0.4

# celery requires click<8.0 (can be removed when https://github.com/celery/celery/issues/6753 is done).
click<8.0
celery<6.0
7 changes: 3 additions & 4 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
asgiref==3.4.1
asgiref==3.5.0
# via django
astroid==2.9.3
# via
Expand All @@ -20,9 +20,8 @@ chardet==4.0.0
# via diff-cover
charset-normalizer==2.0.10
# via requests
click==7.1.2
click==8.0.3
# via
# -c requirements/constraints.txt
# click-log
# code-annotations
# edx-lint
Expand Down Expand Up @@ -131,7 +130,7 @@ pylint-plugin-utils==0.7
# via
# pylint-celery
# pylint-django
pyparsing==3.0.6
pyparsing==3.0.7
# via packaging
python-slugify==5.0.2
# via code-annotations
Expand Down
12 changes: 7 additions & 5 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,24 @@ alabaster==0.7.12
# via sphinx
amqp==5.0.9
# via kombu
asgiref==3.4.1
asgiref==3.5.0
# via django
babel==2.9.1
# via sphinx
billiard==3.6.4.0
# via celery
bleach==4.1.0
# via readme-renderer
celery==5.0.4
celery==5.2.3
# via
# -c requirements/constraints.txt
# -r requirements/base.in
certifi==2021.10.8
# via requests
charset-normalizer==2.0.10
# via requests
click==7.1.2
click==8.0.3
# via
# -c requirements/constraints.txt
# celery
# click-didyoumean
# click-plugins
Expand Down Expand Up @@ -86,7 +85,7 @@ pygments==2.11.2
# doc8
# readme-renderer
# sphinx
pyparsing==3.0.6
pyparsing==3.0.7
# via packaging
pytz==2021.3
# via
Expand Down Expand Up @@ -143,3 +142,6 @@ webencodings==0.5.1
# via bleach
zipp==3.7.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# setuptools
3 changes: 1 addition & 2 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ astroid==2.9.3
# via
# pylint
# pylint-celery
click==7.1.2
click==8.0.3
# via
# -c requirements/constraints.txt
# click-log
# code-annotations
# edx-lint
Expand Down
10 changes: 6 additions & 4 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,16 @@
# make upgrade
#
# via kombu
asgiref==3.4.1
asgiref==3.5.0
# via django
attrs==21.4.0
# via pytest
# via celery
# via
# -c requirements/constraints.txt
# -r requirements/base.in
click==7.1.2
click==8.0.3
# via
# -c requirements/constraints.txt
# celery
# click-didyoumean
# click-plugins
Expand Down Expand Up @@ -56,7 +55,7 @@ prompt-toolkit==3.0.24
# via click-repl
py==1.11.0
# via pytest
pyparsing==3.0.6
pyparsing==3.0.7
# via packaging
pytest==6.2.5
# via
Expand Down Expand Up @@ -91,3 +90,6 @@ tomli==2.0.0
# kombu
wcwidth==0.2.5
# via prompt-toolkit

# The following packages are considered to be unsafe in a requirements file:
# setuptools

0 comments on commit 2e64b26

Please sign in to comment.