From dac9f7e1fb8679439527ace69d883bc3ad93dcd9 Mon Sep 17 00:00:00 2001 From: Andy Shultz Date: Fri, 2 Dec 2022 11:04:08 -0500 Subject: [PATCH 1/2] fix: the celery pin in platform has moved on, update to match this gets us out of a conflict in the click version with pip-tools and is beneficial anyway since proctoring will run in platform with platform's celery version --- requirements/base.txt | 16 ++++++++-------- requirements/celery50.txt | 6 +++--- requirements/ci.txt | 8 ++++---- requirements/constraints.txt | 10 ++++++---- requirements/dev.txt | 22 +++++++++++----------- requirements/pip-tools.txt | 4 ++-- requirements/pip.txt | 4 ++-- requirements/quality.txt | 14 +++++++------- requirements/test.txt | 14 +++++++------- 9 files changed, 50 insertions(+), 48 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 4efb750228..08542dfed5 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -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 # @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/requirements/celery50.txt b/requirements/celery50.txt index d63127a939..98216ecbc7 100644 --- a/requirements/celery50.txt +++ b/requirements/celery50.txt @@ -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 diff --git a/requirements/ci.txt b/requirements/ci.txt index 388c782a97..fda9638eab 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -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 # @@ -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 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index c50554fac4..a577ad2dac 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -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 diff --git a/requirements/dev.txt b/requirements/dev.txt index 04b9a8d301..2522a4fa56 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index bf33dbd553..d768751814 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -6,7 +6,7 @@ # build==0.9.0 # via pip-tools -click==7.1.2 +click==8.1.3 # via # -c requirements/constraints.txt # pip-tools @@ -14,7 +14,7 @@ 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 diff --git a/requirements/pip.txt b/requirements/pip.txt index 0e29c52b28..4c5ce5d3ae 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -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 # diff --git a/requirements/quality.txt b/requirements/quality.txt index e5c35101f0..57a4ab3094 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -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 @@ -51,7 +51,7 @@ 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 @@ -59,7 +59,7 @@ 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 @@ -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 diff --git a/requirements/test.txt b/requirements/test.txt index 61408ec8e6..a35774e2f5 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -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 # @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 From 385d2c8d7812c0000cbc3c16aa947763a49e5d90 Mon Sep 17 00:00:00 2001 From: Andy Shultz Date: Fri, 2 Dec 2022 11:07:51 -0500 Subject: [PATCH 2/2] chore: bump version for celery update --- CHANGELOG.rst | 5 +++++ edx_proctoring/__init__.py | 2 +- package.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9f834e1004..918ecbf956 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -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. diff --git a/edx_proctoring/__init__.py b/edx_proctoring/__init__.py index 075f4c8356..6b22ea53cc 100644 --- a/edx_proctoring/__init__.py +++ b/edx_proctoring/__init__.py @@ -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 diff --git a/package.json b/package.json index 4214dd8a95..1faf6acd83 100644 --- a/package.json +++ b/package.json @@ -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"