Skip to content

Commit

Permalink
Merge pull request #1091 from openedx/ashultz0/update-celery
Browse files Browse the repository at this point in the history
update celery pin to prevent version conflicts
  • Loading branch information
ashultz0 authored Dec 5, 2022
2 parents 0ae746c + 385d2c8 commit f2afb68
Show file tree
Hide file tree
Showing 12 changed files with 57 additions and 50 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ Change Log
Unreleased
~~~~~~~~~~

[4.13.3] - 2022-12-2
~~~~~~~~~~~~~~~~~~~~~
* Update celery pin to match current platform

[4.13.2] - 2022-10-27
~~~~~~~~~~~~~~~~~~~~~
* Fix onboarding expiration messaging to not say expiring soon after expiration.
Expand Down
2 changes: 1 addition & 1 deletion edx_proctoring/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"""

# Be sure to update the version number in edx_proctoring/package.json
__version__ = '4.13.2'
__version__ = '4.13.3'

default_app_config = 'edx_proctoring.apps.EdxProctoringConfig' # pylint: disable=invalid-name
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@edx/edx-proctoring",
"//": "Note that the version format is slightly different than that of the Python version when using prereleases.",
"version": "4.13.2",
"version": "4.13.3",
"main": "edx_proctoring/static/index.js",
"scripts": {
"test": "gulp test"
Expand Down
16 changes: 8 additions & 8 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
Expand All @@ -12,7 +12,7 @@ asgiref==3.5.2
# via django
billiard==3.6.4.0
# via celery
celery==5.0.4
celery==5.2.7
# via
# -c requirements/constraints.txt
# event-tracking
Expand All @@ -24,7 +24,7 @@ cffi==1.15.1
# pynacl
charset-normalizer==2.1.1
# via requests
click==7.1.2
click==8.1.3
# via
# -c requirements/constraints.txt
# celery
Expand All @@ -38,7 +38,7 @@ click-plugins==1.1.1
# via celery
click-repl==0.2.0
# via celery
cryptography==38.0.3
cryptography==38.0.4
# via pyjwt
django==3.2.16
# via
Expand Down Expand Up @@ -122,13 +122,13 @@ newrelic==8.4.0
# via edx-django-utils
pbr==5.11.0
# via stevedore
prompt-toolkit==3.0.32
prompt-toolkit==3.0.33
# via click-repl
psutil==5.9.4
# via edx-django-utils
pycparser==2.21
# via cffi
pycryptodomex==3.15.0
pycryptodomex==3.16.0
# via
# -r requirements/base.in
# pyjwkest
Expand Down Expand Up @@ -187,7 +187,7 @@ stevedore==4.1.1
# via
# edx-django-utils
# edx-opaque-keys
urllib3==1.26.12
urllib3==1.26.13
# via requests
vine==5.0.0
# via
Expand Down
6 changes: 3 additions & 3 deletions requirements/celery50.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
amqp==5.1.1
billiard==3.6.4.0
celery==5.0.4
click==7.1.2
celery==5.2.7
click==8.1.3
click-didyoumean==0.3.0
click-repl==0.2.0
kombu==5.2.4
prompt-toolkit==3.0.32
prompt-toolkit==3.0.33
vine==5.0.0
8 changes: 4 additions & 4 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
Expand Down Expand Up @@ -42,7 +42,7 @@ tox==3.27.1
# tox-battery
tox-battery==0.6.1
# via -r requirements/ci.in
urllib3==1.26.12
urllib3==1.26.13
# via requests
virtualenv==20.16.7
virtualenv==20.17.0
# via tox
10 changes: 6 additions & 4 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@
# Common constraints for edx repos
-c common_constraints.txt

# pinning it to latest release.
celery==5.0.4
# celery latest version requires click<8.0.0
click<8.0.0
# Celery and related Click pin updated to match edx-platform
# 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

# pinning because to match pin in edx-platform: https://github.com/openedx/edx-platform/blob/e25f00f35cb2ed70502bb0b28909535d55e5525e/requirements/constraints.txt#L83
django-webpack-loader<1.0.0
22 changes: 11 additions & 11 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
asgiref==3.5.2
# via django
astroid==2.12.12
astroid==2.12.13
# via
# pylint
# pylint-celery
chardet==5.0.0
chardet==5.1.0
# via diff-cover
click==7.1.2
click==8.1.3
# via
# -c requirements/constraints.txt
# click-log
Expand All @@ -27,7 +27,7 @@ colorama==0.4.6
# via typer
commonmark==0.9.1
# via rich
diff-cover==7.0.2
diff-cover==7.2.0
# via -r requirements/dev.in
dill==0.3.6
# via pylint
Expand Down Expand Up @@ -67,7 +67,7 @@ mccabe==0.7.0
# via pylint
packaging==21.3
# via tox
path==16.5.0
path==16.6.0
# via
# edx-i18n-tools
# path-py
Expand All @@ -87,7 +87,7 @@ polib==1.1.1
# via edx-i18n-tools
py==1.11.0
# via tox
pycodestyle==2.9.1
pycodestyle==2.10.0
# via -r requirements/quality.in
pydantic==1.10.2
# via rstcheck-core
Expand All @@ -97,7 +97,7 @@ pygments==2.13.0
# via
# diff-cover
# rich
pylint==2.15.5
pylint==2.15.7
# via
# edx-lint
# pylint-celery
Expand All @@ -113,7 +113,7 @@ pylint-plugin-utils==0.7
# pylint-django
pyparsing==3.0.9
# via packaging
python-slugify==6.1.2
python-slugify==7.0.0
# via code-annotations
pytz==2022.6
# via django
Expand Down Expand Up @@ -163,7 +163,7 @@ typing-extensions==4.4.0
# pydantic
# pylint
# rich
virtualenv==20.16.7
virtualenv==20.17.0
# via tox
wheel==0.38.4
# via -r requirements/dev.in
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
#
build==0.9.0
# via pip-tools
click==7.1.2
click==8.1.3
# via
# -c requirements/constraints.txt
# pip-tools
packaging==21.3
# via build
pep517==0.13.0
# via build
pip-tools==6.10.0
pip-tools==6.11.0
# via -r requirements/pip-tools.in
pyparsing==3.0.9
# via packaging
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
Expand Down
14 changes: 7 additions & 7 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
asgiref==3.5.2
# via django
astroid==2.12.12
astroid==2.12.13
# via
# pylint
# pylint-celery
click==7.1.2
click==8.1.3
# via
# -c requirements/constraints.txt
# click-log
Expand Down Expand Up @@ -51,15 +51,15 @@ pbr==5.11.0
# via stevedore
platformdirs==2.5.4
# via pylint
pycodestyle==2.9.1
pycodestyle==2.10.0
# via -r requirements/quality.in
pydantic==1.10.2
# via rstcheck-core
pydocstyle==6.1.1
# via -r requirements/quality.in
pygments==2.13.0
# via rich
pylint==2.15.5
pylint==2.15.7
# via
# edx-lint
# pylint-celery
Expand All @@ -73,7 +73,7 @@ pylint-plugin-utils==0.7
# via
# pylint-celery
# pylint-django
python-slugify==6.1.2
python-slugify==7.0.0
# via code-annotations
pytz==2022.6
# via django
Expand Down
14 changes: 7 additions & 7 deletions requirements/test.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
Expand Down Expand Up @@ -43,7 +43,7 @@ code-annotations==1.3.0
# via -r requirements/test.in
coverage[toml]==6.5.0
# via pytest-cov
cryptography==38.0.3
cryptography==38.0.4
# via pyjwt
ddt==1.6.0
# via -r requirements/test.in
Expand Down Expand Up @@ -153,7 +153,7 @@ newrelic==8.4.0
# via edx-django-utils
packaging==21.3
# via pytest
path==16.5.0
path==16.6.0
# via edx-i18n-tools
pbr==5.11.0
# via stevedore
Expand All @@ -166,7 +166,7 @@ psutil==5.9.4
# via edx-django-utils
pycparser==2.21
# via cffi
pycryptodomex==3.15.0
pycryptodomex==3.16.0
# via
# -r requirements/base.in
# pyjwkest
Expand Down Expand Up @@ -203,7 +203,7 @@ python-dateutil==2.8.2
# edx-drf-extensions
# freezegun
# xblock
python-slugify==6.1.2
python-slugify==7.0.0
# via code-annotations
pytz==2022.6
# via
Expand Down Expand Up @@ -268,7 +268,7 @@ types-toml==0.10.8.1
# via responses
typing-extensions==4.4.0
# via logilab-common
urllib3==1.26.12
urllib3==1.26.13
# via
# requests
# responses
Expand Down

0 comments on commit f2afb68

Please sign in to comment.