diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b5ec8ff4..2b626eb1 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,6 +14,12 @@ Change Log Unreleased ~~~~~~~~~~ +[4.0.4] - 2024-06-13 +~~~~~~~~~~~~~~~~~~~~ + +* Emit tracking log events for `openedx.completion_aggregator.progress.*` and + `openedx.completion_aggregator.completion.*` for the various block/course types + [4.0.3] - 2023-10-24 ~~~~~~~~~~~~~~~~~~~~ diff --git a/completion_aggregator/__init__.py b/completion_aggregator/__init__.py index a9a396aa..fcb5b98c 100644 --- a/completion_aggregator/__init__.py +++ b/completion_aggregator/__init__.py @@ -5,4 +5,4 @@ from __future__ import absolute_import, unicode_literals -__version__ = '4.0.3' +__version__ = '4.0.4' diff --git a/completion_aggregator/models.py b/completion_aggregator/models.py index 17a44d9e..cd0c9497 100644 --- a/completion_aggregator/models.py +++ b/completion_aggregator/models.py @@ -193,7 +193,7 @@ def emit_completion_aggregator_logs(updated_aggregators): if event_type not in settings.ALLOWED_COMPLETION_AGGREGATOR_EVENT_TYPES.get(event, {}): continue - event_name = f"edx.completion_aggregator.{event}.{event_type}" + event_name = f"openedx.completion_aggregator.{event}.{event_type}" tracker.emit( event_name, diff --git a/requirements/base.txt b/requirements/base.txt index 5f13f786..2744713d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -10,15 +10,17 @@ appdirs==1.4.4 # via fs asgiref==3.7.2 # via django +attrs==23.2.0 + # via openedx-events backports-zoneinfo[tzdata]==0.2.1 # via # celery # kombu billiard==4.2.0 # via celery -boto3==1.33.6 +boto3==1.34.49 # via fs-s3fs -botocore==1.33.6 +botocore==1.34.49 # via # boto3 # s3transfer @@ -27,7 +29,7 @@ celery==5.3.6 # -r requirements/base.in # edx-celeryutils # event-tracking -certifi==2023.11.17 +certifi==2024.2.2 # via requests cffi==1.16.0 # via @@ -49,11 +51,11 @@ click-plugins==1.1.1 # via celery click-repl==0.3.0 # via celery -code-annotations==1.5.0 +code-annotations==1.6.0 # via edx-toggles -cryptography==41.0.7 +cryptography==42.0.5 # via pyjwt -django==3.2.23 +django==3.2.24 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in @@ -70,16 +72,17 @@ django==3.2.23 # event-tracking # jsonfield # openedx-django-pyfs + # openedx-events django-crum==0.7.9 # via # edx-django-utils # edx-toggles -django-model-utils==4.3.1 +django-model-utils==4.4.0 # via # -r requirements/base.in # edx-celeryutils # edx-completion -django-waffle==4.0.0 +django-waffle==4.1.0 # via # edx-django-utils # edx-drf-extensions @@ -92,30 +95,35 @@ djangorestframework==3.14.0 # edx-drf-extensions drf-jwt==1.19.2 # via edx-drf-extensions -edx-celeryutils==1.2.3 +edx-celeryutils==1.2.5 # via -r requirements/base.in -edx-completion==4.4.0 +edx-completion==4.6.0 # via -r requirements/base.in -edx-django-utils==5.9.0 +edx-django-utils==5.10.1 # via # edx-drf-extensions # edx-toggles # event-tracking -edx-drf-extensions==9.0.0 + # openedx-events +edx-drf-extensions==10.2.0 # via edx-completion -edx-opaque-keys==2.5.1 +edx-opaque-keys[django]==2.5.1 # via # -r requirements/base.in # edx-completion # edx-drf-extensions -edx-toggles==5.1.0 + # openedx-events +edx-toggles==5.1.1 # via # -r requirements/base.in # edx-completion -event-tracking==2.2.0 + # event-tracking +event-tracking==2.3.0 # via # -r requirements/base.in - # edx-completion + # edx-completion +fastavro==1.9.4 + # via openedx-events fs==2.4.16 # via # fs-s3fs @@ -125,7 +133,7 @@ fs-s3fs==1.1.1 # via openedx-django-pyfs idna==3.6 # via requests -jinja2==3.1.2 +jinja2==3.1.3 # via code-annotations jmespath==1.0.1 # via @@ -133,28 +141,30 @@ jmespath==1.0.1 # botocore jsonfield==3.1.0 # via edx-celeryutils -kombu==5.3.4 +kombu==5.3.5 # via celery lazy==1.6 # via xblock -lxml==4.9.3 +lxml==5.1.0 # via xblock -mako==1.3.0 +mako==1.3.2 # via xblock -markupsafe==2.1.3 +markupsafe==2.1.5 # via # jinja2 # mako # xblock -newrelic==9.2.0 +newrelic==9.7.0 # via edx-django-utils -openedx-django-pyfs==3.4.0 +openedx-django-pyfs==3.5.0 # via xblock +openedx-events==9.5.2 + # via event-tracking pbr==6.0.0 # via stevedore -prompt-toolkit==3.0.41 +prompt-toolkit==3.0.43 # via click-repl -psutil==5.9.6 +psutil==5.9.8 # via edx-django-utils pycparser==2.21 # via cffi @@ -162,7 +172,6 @@ pyjwt[crypto]==2.8.0 # via # drf-jwt # edx-drf-extensions - # pyjwt pymongo==3.13.0 # via # edx-opaque-keys @@ -174,9 +183,9 @@ python-dateutil==2.8.2 # botocore # celery # xblock -python-slugify==8.0.1 +python-slugify==8.0.4 # via code-annotations -pytz==2023.3.post1 +pytz==2024.1 # via # django # djangorestframework @@ -189,7 +198,7 @@ pyyaml==6.0.1 # xblock requests==2.31.0 # via edx-drf-extensions -s3transfer==0.8.2 +s3transfer==0.10.0 # via boto3 semantic-version==2.10.0 # via edx-drf-extensions @@ -204,19 +213,19 @@ six==1.16.0 # python-dateutil sqlparse==0.4.4 # via django -stevedore==5.1.0 +stevedore==5.2.0 # via # code-annotations # edx-django-utils # edx-opaque-keys text-unidecode==1.3 # via python-slugify -typing-extensions==4.8.0 +typing-extensions==4.10.0 # via # asgiref # edx-opaque-keys # kombu -tzdata==2023.3 +tzdata==2024.1 # via # backports-zoneinfo # celery @@ -229,13 +238,13 @@ vine==5.1.0 # amqp # celery # kombu -wcwidth==0.2.12 +wcwidth==0.2.13 # via prompt-toolkit web-fragments==2.1.0 # via xblock webob==1.8.7 # via xblock -xblock[django]==1.8.1 +xblock[django]==1.10.0 # via # -r requirements/base.in # edx-completion diff --git a/requirements/ci.txt b/requirements/ci.txt index 2cad46bd..62990009 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,7 +4,7 @@ # # make upgrade # -distlib==0.3.7 +distlib==0.3.8 # via virtualenv filelock==3.13.1 # via @@ -12,9 +12,8 @@ filelock==3.13.1 # virtualenv packaging==23.2 # via tox -platformdirs==3.11.0 +platformdirs==4.2.0 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # tox # virtualenv pluggy==0.13.1 @@ -33,5 +32,5 @@ tox==3.28.0 # tox-battery tox-battery==0.6.2 # via -r requirements/ci.in -virtualenv==20.25.0 +virtualenv==20.25.1 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 70179afc..b398bce8 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -16,7 +16,7 @@ asgiref==3.7.2 # via # -r requirements/quality.txt # django -astroid==3.0.1 +astroid==3.1.0 # via # -r requirements/quality.txt # pylint @@ -25,25 +25,25 @@ async-timeout==4.0.3 # via # -r requirements/quality.txt # redis -attrs==23.1.0 +attrs==23.2.0 # via # -r requirements/quality.txt + # openedx-events # pytest backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/quality.txt - # backports-zoneinfo # celery # kombu billiard==4.2.0 # via # -r requirements/quality.txt # celery -boto3==1.33.6 +boto3==1.34.49 # via # -r requirements/quality.txt # fs-s3fs -botocore==1.33.6 +botocore==1.34.49 # via # -r requirements/quality.txt # boto3 @@ -57,7 +57,7 @@ celery==5.3.6 # -r requirements/quality.txt # edx-celeryutils # event-tracking -certifi==2023.11.17 +certifi==2024.2.2 # via # -r requirements/quality.txt # requests @@ -99,36 +99,31 @@ click-repl==0.3.0 # via # -r requirements/quality.txt # celery -code-annotations==1.5.0 +code-annotations==1.6.0 # via # -r requirements/quality.txt # edx-lint # edx-toggles -coverage[toml]==7.3.2 +coverage[toml]==7.4.3 # via # -r requirements/quality.txt - # coverage # pytest-cov -cryptography==41.0.7 +cryptography==42.0.5 # via # -r requirements/quality.txt # jwcrypto # pyjwt -ddt==1.7.0 +ddt==1.7.1 # via -r requirements/quality.txt -deprecated==1.2.14 - # via - # -r requirements/quality.txt - # jwcrypto -dill==0.3.7 +dill==0.3.8 # via # -r requirements/quality.txt # pylint -distlib==0.3.7 +distlib==0.3.8 # via # -r requirements/ci.txt # virtualenv -django==3.2.23 +django==3.2.24 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/quality.txt @@ -147,19 +142,20 @@ django==3.2.23 # event-tracking # jsonfield # openedx-django-pyfs + # openedx-events django-crum==0.7.9 # via # -r requirements/quality.txt # edx-django-utils # edx-toggles -django-model-utils==4.3.1 +django-model-utils==4.4.0 # via # -r requirements/quality.txt # edx-celeryutils # edx-completion django-oauth-toolkit==2.3.0 # via -r requirements/quality.txt -django-waffle==4.0.0 +django-waffle==4.1.0 # via # -r requirements/quality.txt # edx-django-utils @@ -175,17 +171,18 @@ drf-jwt==1.19.2 # via # -r requirements/quality.txt # edx-drf-extensions -edx-celeryutils==1.2.3 +edx-celeryutils==1.2.5 # via -r requirements/quality.txt -edx-completion==4.4.0 +edx-completion==4.6.0 # via -r requirements/quality.txt -edx-django-utils==5.9.0 +edx-django-utils==5.10.1 # via # -r requirements/quality.txt # edx-drf-extensions # edx-toggles # event-tracking -edx-drf-extensions==9.0.0 + # openedx-events +edx-drf-extensions==10.2.0 # via # -r requirements/quality.txt # edx-completion @@ -193,19 +190,25 @@ edx-i18n-tools==1.3.0 # via -r requirements/quality.txt edx-lint==5.3.6 # via -r requirements/quality.txt -edx-opaque-keys==2.5.1 +edx-opaque-keys[django]==2.5.1 # via # -r requirements/quality.txt # edx-completion # edx-drf-extensions -edx-toggles==5.1.0 + # openedx-events +edx-toggles==5.1.1 # via # -r requirements/quality.txt # edx-completion -event-tracking==2.2.0 + # event-tracking +event-tracking==2.3.0 # via # -r requirements/quality.txt # edx-completion +fastavro==1.9.4 + # via + # -r requirements/quality.txt + # openedx-events filelock==3.13.1 # via # -r requirements/ci.txt @@ -227,15 +230,15 @@ idna==3.6 # via # -r requirements/quality.txt # requests -importlib-metadata==7.0.0 +importlib-metadata==7.0.1 # via # -r requirements/pip-tools.txt # build -isort==5.12.0 +isort==5.13.2 # via # -r requirements/quality.txt # pylint -jinja2==3.1.2 +jinja2==3.1.3 # via # -r requirements/quality.txt # code-annotations @@ -248,11 +251,11 @@ jsonfield==3.1.0 # via # -r requirements/quality.txt # edx-celeryutils -jwcrypto==1.5.0 +jwcrypto==1.5.4 # via # -r requirements/quality.txt # django-oauth-toolkit -kombu==5.3.4 +kombu==5.3.5 # via # -r requirements/quality.txt # celery @@ -260,16 +263,16 @@ lazy==1.6 # via # -r requirements/quality.txt # xblock -lxml==4.9.3 +lxml==5.1.0 # via # -r requirements/quality.txt # edx-i18n-tools # xblock -mako==1.3.0 +mako==1.3.2 # via # -r requirements/quality.txt # xblock -markupsafe==2.1.3 +markupsafe==2.1.5 # via # -r requirements/quality.txt # jinja2 @@ -285,9 +288,9 @@ more-itertools==5.0.0 # via # -r requirements/quality.txt # pytest -mysqlclient==2.2.0 +mysqlclient==2.2.4 # via -r requirements/quality.txt -newrelic==9.2.0 +newrelic==9.7.0 # via # -r requirements/quality.txt # edx-django-utils @@ -295,10 +298,14 @@ oauthlib==3.2.2 # via # -r requirements/quality.txt # django-oauth-toolkit -openedx-django-pyfs==3.4.0 +openedx-django-pyfs==3.5.0 # via # -r requirements/quality.txt # xblock +openedx-events==9.5.2 + # via + # -r requirements/quality.txt + # event-tracking packaging==23.2 # via # -r requirements/ci.txt @@ -307,7 +314,7 @@ packaging==23.2 # build # pytest # tox -path==16.7.1 +path==16.10.0 # via # -r requirements/quality.txt # edx-i18n-tools @@ -315,11 +322,10 @@ pbr==6.0.0 # via # -r requirements/quality.txt # stevedore -pip-tools==7.3.0 +pip-tools==7.4.0 # via -r requirements/pip-tools.txt -platformdirs==3.11.0 +platformdirs==4.2.0 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/ci.txt # -r requirements/quality.txt # pylint @@ -335,11 +341,11 @@ polib==1.2.0 # via # -r requirements/quality.txt # edx-i18n-tools -prompt-toolkit==3.0.41 +prompt-toolkit==3.0.43 # via # -r requirements/quality.txt # click-repl -psutil==5.9.6 +psutil==5.9.8 # via # -r requirements/quality.txt # edx-django-utils @@ -362,8 +368,7 @@ pyjwt[crypto]==2.8.0 # -r requirements/quality.txt # drf-jwt # edx-drf-extensions - # pyjwt -pylint==3.0.2 +pylint==3.1.0 # via # -r requirements/quality.txt # edx-lint @@ -396,6 +401,7 @@ pyproject-hooks==1.0.0 # via # -r requirements/pip-tools.txt # build + # pip-tools pytest==5.4.3 # via # -c requirements/constraints.txt @@ -413,11 +419,11 @@ python-dateutil==2.8.2 # celery # freezegun # xblock -python-slugify==8.0.1 +python-slugify==8.0.4 # via # -r requirements/quality.txt # code-annotations -pytz==2023.3.post1 +pytz==2024.1 # via # -r requirements/quality.txt # django @@ -438,7 +444,7 @@ requests==2.31.0 # -r requirements/quality.txt # django-oauth-toolkit # edx-drf-extensions -s3transfer==0.8.2 +s3transfer==0.10.0 # via # -r requirements/quality.txt # boto3 @@ -471,7 +477,7 @@ sqlparse==0.4.4 # via # -r requirements/quality.txt # django -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/quality.txt # code-annotations @@ -502,15 +508,16 @@ tox==3.28.0 # tox-battery tox-battery==0.6.2 # via -r requirements/ci.txt -typing-extensions==4.8.0 +typing-extensions==4.10.0 # via # -r requirements/quality.txt # asgiref # astroid # edx-opaque-keys + # jwcrypto # kombu # pylint -tzdata==2023.3 +tzdata==2024.1 # via # -r requirements/quality.txt # backports-zoneinfo @@ -526,11 +533,11 @@ vine==5.1.0 # amqp # celery # kombu -virtualenv==20.25.0 +virtualenv==20.25.1 # via # -r requirements/ci.txt # tox -wcwidth==0.2.12 +wcwidth==0.2.13 # via # -r requirements/quality.txt # prompt-toolkit @@ -547,15 +554,10 @@ wheel==0.42.0 # via # -r requirements/pip-tools.txt # pip-tools -wrapt==1.16.0 - # via - # -r requirements/quality.txt - # deprecated -xblock[django]==1.8.1 +xblock[django]==1.10.0 # via # -r requirements/quality.txt # edx-completion - # xblock zipp==3.17.0 # via # -r requirements/pip-tools.txt diff --git a/requirements/doc.txt b/requirements/doc.txt index 3b6aa317..17b75bf1 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -25,17 +25,18 @@ async-timeout==4.0.3 # via # -r requirements/test.txt # redis -attrs==23.1.0 +attrs==23.2.0 # via + # -r requirements/base.txt # -r requirements/test.txt + # openedx-events # pytest -babel==2.13.1 +babel==2.14.0 # via sphinx backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/base.txt # -r requirements/test.txt - # backports-zoneinfo # celery # kombu billiard==4.2.0 @@ -43,12 +44,12 @@ billiard==4.2.0 # -r requirements/base.txt # -r requirements/test.txt # celery -boto3==1.33.6 +boto3==1.34.49 # via # -r requirements/base.txt # -r requirements/test.txt # fs-s3fs -botocore==1.33.6 +botocore==1.34.49 # via # -r requirements/base.txt # -r requirements/test.txt @@ -60,7 +61,7 @@ celery==5.3.6 # -r requirements/test.txt # edx-celeryutils # event-tracking -certifi==2023.11.17 +certifi==2024.2.2 # via # -r requirements/base.txt # -r requirements/test.txt @@ -101,29 +102,24 @@ click-repl==0.3.0 # -r requirements/base.txt # -r requirements/test.txt # celery -code-annotations==1.5.0 +code-annotations==1.6.0 # via # -r requirements/base.txt # -r requirements/test.txt # edx-toggles -coverage[toml]==7.3.2 +coverage[toml]==7.4.3 # via # -r requirements/test.txt - # coverage # pytest-cov -cryptography==41.0.7 +cryptography==42.0.5 # via # -r requirements/base.txt # -r requirements/test.txt # jwcrypto # pyjwt -ddt==1.7.0 +ddt==1.7.1 # via -r requirements/test.txt -deprecated==1.2.14 - # via - # -r requirements/test.txt - # jwcrypto -django==3.2.23 +django==3.2.24 # via # -r requirements/base.txt # -r requirements/test.txt @@ -142,13 +138,14 @@ django==3.2.23 # event-tracking # jsonfield # openedx-django-pyfs + # openedx-events django-crum==0.7.9 # via # -r requirements/base.txt # -r requirements/test.txt # edx-django-utils # edx-toggles -django-model-utils==4.3.1 +django-model-utils==4.4.0 # via # -r requirements/base.txt # -r requirements/test.txt @@ -156,7 +153,7 @@ django-model-utils==4.3.1 # edx-completion django-oauth-toolkit==2.3.0 # via -r requirements/test.txt -django-waffle==4.0.0 +django-waffle==4.1.0 # via # -r requirements/base.txt # -r requirements/test.txt @@ -183,46 +180,54 @@ drf-jwt==1.19.2 # -r requirements/base.txt # -r requirements/test.txt # edx-drf-extensions -edx-celeryutils==1.2.3 +edx-celeryutils==1.2.5 # via # -r requirements/base.txt # -r requirements/test.txt -edx-completion==4.4.0 +edx-completion==4.6.0 # via # -r requirements/base.txt # -r requirements/test.txt -edx-django-utils==5.9.0 +edx-django-utils==5.10.1 # via # -r requirements/base.txt # -r requirements/test.txt # edx-drf-extensions # edx-toggles # event-tracking -edx-drf-extensions==9.0.0 + # openedx-events +edx-drf-extensions==10.2.0 # via # -r requirements/base.txt # -r requirements/test.txt # edx-completion edx-i18n-tools==1.3.0 # via -r requirements/test.txt -edx-opaque-keys==2.5.1 +edx-opaque-keys[django]==2.5.1 # via # -r requirements/base.txt # -r requirements/test.txt # edx-completion # edx-drf-extensions + # openedx-events edx-sphinx-theme==3.1.0 # via -r requirements/doc.in -edx-toggles==5.1.0 +edx-toggles==5.1.1 # via # -r requirements/base.txt # -r requirements/test.txt # edx-completion -event-tracking==2.2.0 + # event-tracking +event-tracking==2.3.0 # via # -r requirements/base.txt # -r requirements/test.txt # edx-completion +fastavro==1.9.4 + # via + # -r requirements/base.txt + # -r requirements/test.txt + # openedx-events freezegun==0.3.15 # via -r requirements/test.txt fs==2.4.16 @@ -244,9 +249,9 @@ idna==3.6 # requests imagesize==1.4.1 # via sphinx -importlib-metadata==7.0.0 +importlib-metadata==7.0.1 # via sphinx -jinja2==3.1.2 +jinja2==3.1.3 # via # -r requirements/base.txt # -r requirements/test.txt @@ -263,11 +268,11 @@ jsonfield==3.1.0 # -r requirements/base.txt # -r requirements/test.txt # edx-celeryutils -jwcrypto==1.5.0 +jwcrypto==1.5.4 # via # -r requirements/test.txt # django-oauth-toolkit -kombu==5.3.4 +kombu==5.3.5 # via # -r requirements/base.txt # -r requirements/test.txt @@ -277,18 +282,18 @@ lazy==1.6 # -r requirements/base.txt # -r requirements/test.txt # xblock -lxml==4.9.3 +lxml==5.1.0 # via # -r requirements/base.txt # -r requirements/test.txt # edx-i18n-tools # xblock -mako==1.3.0 +mako==1.3.2 # via # -r requirements/base.txt # -r requirements/test.txt # xblock -markupsafe==2.1.3 +markupsafe==2.1.5 # via # -r requirements/base.txt # -r requirements/test.txt @@ -301,30 +306,35 @@ more-itertools==5.0.0 # via # -r requirements/test.txt # pytest -mysqlclient==2.2.0 +mysqlclient==2.2.4 # via -r requirements/test.txt -newrelic==9.2.0 +newrelic==9.7.0 # via # -r requirements/base.txt # -r requirements/test.txt # edx-django-utils -nh3==0.2.14 +nh3==0.2.15 # via readme-renderer oauthlib==3.2.2 # via # -r requirements/test.txt # django-oauth-toolkit -openedx-django-pyfs==3.4.0 +openedx-django-pyfs==3.5.0 # via # -r requirements/base.txt # -r requirements/test.txt # xblock +openedx-events==9.5.2 + # via + # -r requirements/base.txt + # -r requirements/test.txt + # event-tracking packaging==23.2 # via # -r requirements/test.txt # pytest # sphinx -path==16.7.1 +path==16.10.0 # via # -r requirements/test.txt # edx-i18n-tools @@ -341,12 +351,12 @@ polib==1.2.0 # via # -r requirements/test.txt # edx-i18n-tools -prompt-toolkit==3.0.41 +prompt-toolkit==3.0.43 # via # -r requirements/base.txt # -r requirements/test.txt # click-repl -psutil==5.9.6 +psutil==5.9.8 # via # -r requirements/base.txt # -r requirements/test.txt @@ -371,7 +381,6 @@ pyjwt[crypto]==2.8.0 # -r requirements/test.txt # drf-jwt # edx-drf-extensions - # pyjwt pymongo==3.13.0 # via # -r requirements/base.txt @@ -400,12 +409,12 @@ python-dateutil==2.8.2 # celery # freezegun # xblock -python-slugify==8.0.1 +python-slugify==8.0.4 # via # -r requirements/base.txt # -r requirements/test.txt # code-annotations -pytz==2023.3.post1 +pytz==2024.1 # via # -r requirements/base.txt # -r requirements/test.txt @@ -435,7 +444,7 @@ requests==2.31.0 # sphinx restructuredtext-lint==1.4.0 # via doc8 -s3transfer==0.8.2 +s3transfer==0.10.0 # via # -r requirements/base.txt # -r requirements/test.txt @@ -485,7 +494,7 @@ sqlparse==0.4.4 # -r requirements/base.txt # -r requirements/test.txt # django -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/base.txt # -r requirements/test.txt @@ -503,14 +512,15 @@ tomli==2.0.1 # -r requirements/test.txt # coverage # doc8 -typing-extensions==4.8.0 +typing-extensions==4.10.0 # via # -r requirements/base.txt # -r requirements/test.txt # asgiref # edx-opaque-keys + # jwcrypto # kombu -tzdata==2023.3 +tzdata==2024.1 # via # -r requirements/base.txt # -r requirements/test.txt @@ -529,7 +539,7 @@ vine==5.1.0 # amqp # celery # kombu -wcwidth==0.2.12 +wcwidth==0.2.13 # via # -r requirements/base.txt # -r requirements/test.txt @@ -545,16 +555,11 @@ webob==1.8.7 # -r requirements/base.txt # -r requirements/test.txt # xblock -wrapt==1.16.0 - # via - # -r requirements/test.txt - # deprecated -xblock[django]==1.8.1 +xblock[django]==1.10.0 # via # -r requirements/base.txt # -r requirements/test.txt # edx-completion - # xblock zipp==3.17.0 # via importlib-metadata diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 93a9cee2..44c48d99 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -8,14 +8,16 @@ build==1.0.3 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==7.0.0 +importlib-metadata==7.0.1 # via build packaging==23.2 # via build -pip-tools==7.3.0 +pip-tools==7.4.0 # via -r requirements/pip-tools.in pyproject-hooks==1.0.0 - # via build + # via + # build + # pip-tools tomli==2.0.1 # via # build diff --git a/requirements/pip.txt b/requirements/pip.txt index 14cb99cd..66656035 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -8,7 +8,7 @@ wheel==0.42.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==23.3.1 +pip==24.0 # via -r requirements/pip.in -setuptools==69.0.2 +setuptools==69.1.1 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index b8e1f054..4ef12726 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -16,7 +16,7 @@ asgiref==3.7.2 # via # -r requirements/test.txt # django -astroid==3.0.1 +astroid==3.1.0 # via # pylint # pylint-celery @@ -24,25 +24,25 @@ async-timeout==4.0.3 # via # -r requirements/test.txt # redis -attrs==23.1.0 +attrs==23.2.0 # via # -r requirements/test.txt + # openedx-events # pytest backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/test.txt - # backports-zoneinfo # celery # kombu billiard==4.2.0 # via # -r requirements/test.txt # celery -boto3==1.33.6 +boto3==1.34.49 # via # -r requirements/test.txt # fs-s3fs -botocore==1.33.6 +botocore==1.34.49 # via # -r requirements/test.txt # boto3 @@ -52,7 +52,7 @@ celery==5.3.6 # -r requirements/test.txt # edx-celeryutils # event-tracking -certifi==2023.11.17 +certifi==2024.2.2 # via # -r requirements/test.txt # requests @@ -90,30 +90,25 @@ click-repl==0.3.0 # via # -r requirements/test.txt # celery -code-annotations==1.5.0 +code-annotations==1.6.0 # via # -r requirements/test.txt # edx-lint # edx-toggles -coverage[toml]==7.3.2 +coverage[toml]==7.4.3 # via # -r requirements/test.txt - # coverage # pytest-cov -cryptography==41.0.7 +cryptography==42.0.5 # via # -r requirements/test.txt # jwcrypto # pyjwt -ddt==1.7.0 +ddt==1.7.1 # via -r requirements/test.txt -deprecated==1.2.14 - # via - # -r requirements/test.txt - # jwcrypto -dill==0.3.7 +dill==0.3.8 # via pylint -django==3.2.23 +django==3.2.24 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt @@ -132,19 +127,20 @@ django==3.2.23 # event-tracking # jsonfield # openedx-django-pyfs + # openedx-events django-crum==0.7.9 # via # -r requirements/test.txt # edx-django-utils # edx-toggles -django-model-utils==4.3.1 +django-model-utils==4.4.0 # via # -r requirements/test.txt # edx-celeryutils # edx-completion django-oauth-toolkit==2.3.0 # via -r requirements/test.txt -django-waffle==4.0.0 +django-waffle==4.1.0 # via # -r requirements/test.txt # edx-django-utils @@ -160,17 +156,18 @@ drf-jwt==1.19.2 # via # -r requirements/test.txt # edx-drf-extensions -edx-celeryutils==1.2.3 +edx-celeryutils==1.2.5 # via -r requirements/test.txt -edx-completion==4.4.0 +edx-completion==4.6.0 # via -r requirements/test.txt -edx-django-utils==5.9.0 +edx-django-utils==5.10.1 # via # -r requirements/test.txt # edx-drf-extensions # edx-toggles # event-tracking -edx-drf-extensions==9.0.0 + # openedx-events +edx-drf-extensions==10.2.0 # via # -r requirements/test.txt # edx-completion @@ -178,19 +175,25 @@ edx-i18n-tools==1.3.0 # via -r requirements/test.txt edx-lint==5.3.6 # via -r requirements/quality.in -edx-opaque-keys==2.5.1 +edx-opaque-keys[django]==2.5.1 # via # -r requirements/test.txt # edx-completion # edx-drf-extensions -edx-toggles==5.1.0 + # openedx-events +edx-toggles==5.1.1 # via # -r requirements/test.txt # edx-completion -event-tracking==2.2.0 + # event-tracking +event-tracking==2.3.0 # via # -r requirements/test.txt # edx-completion +fastavro==1.9.4 + # via + # -r requirements/test.txt + # openedx-events freezegun==0.3.15 # via -r requirements/test.txt fs==2.4.16 @@ -207,11 +210,11 @@ idna==3.6 # via # -r requirements/test.txt # requests -isort==5.12.0 +isort==5.13.2 # via # -r requirements/quality.in # pylint -jinja2==3.1.2 +jinja2==3.1.3 # via # -r requirements/test.txt # code-annotations @@ -224,11 +227,11 @@ jsonfield==3.1.0 # via # -r requirements/test.txt # edx-celeryutils -jwcrypto==1.5.0 +jwcrypto==1.5.4 # via # -r requirements/test.txt # django-oauth-toolkit -kombu==5.3.4 +kombu==5.3.5 # via # -r requirements/test.txt # celery @@ -236,16 +239,16 @@ lazy==1.6 # via # -r requirements/test.txt # xblock -lxml==4.9.3 +lxml==5.1.0 # via # -r requirements/test.txt # edx-i18n-tools # xblock -mako==1.3.0 +mako==1.3.2 # via # -r requirements/test.txt # xblock -markupsafe==2.1.3 +markupsafe==2.1.5 # via # -r requirements/test.txt # jinja2 @@ -259,9 +262,9 @@ more-itertools==5.0.0 # via # -r requirements/test.txt # pytest -mysqlclient==2.2.0 +mysqlclient==2.2.4 # via -r requirements/test.txt -newrelic==9.2.0 +newrelic==9.7.0 # via # -r requirements/test.txt # edx-django-utils @@ -269,15 +272,19 @@ oauthlib==3.2.2 # via # -r requirements/test.txt # django-oauth-toolkit -openedx-django-pyfs==3.4.0 +openedx-django-pyfs==3.5.0 # via # -r requirements/test.txt # xblock +openedx-events==9.5.2 + # via + # -r requirements/test.txt + # event-tracking packaging==23.2 # via # -r requirements/test.txt # pytest -path==16.7.1 +path==16.10.0 # via # -r requirements/test.txt # edx-i18n-tools @@ -285,10 +292,8 @@ pbr==6.0.0 # via # -r requirements/test.txt # stevedore -platformdirs==3.11.0 - # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt - # pylint +platformdirs==4.2.0 + # via pylint pluggy==0.13.1 # via # -c requirements/constraints.txt @@ -298,11 +303,11 @@ polib==1.2.0 # via # -r requirements/test.txt # edx-i18n-tools -prompt-toolkit==3.0.41 +prompt-toolkit==3.0.43 # via # -r requirements/test.txt # click-repl -psutil==5.9.6 +psutil==5.9.8 # via # -r requirements/test.txt # edx-django-utils @@ -323,8 +328,7 @@ pyjwt[crypto]==2.8.0 # -r requirements/test.txt # drf-jwt # edx-drf-extensions - # pyjwt -pylint==3.0.2 +pylint==3.1.0 # via # edx-lint # pylint-celery @@ -364,11 +368,11 @@ python-dateutil==2.8.2 # celery # freezegun # xblock -python-slugify==8.0.1 +python-slugify==8.0.4 # via # -r requirements/test.txt # code-annotations -pytz==2023.3.post1 +pytz==2024.1 # via # -r requirements/test.txt # django @@ -389,7 +393,7 @@ requests==2.31.0 # -r requirements/test.txt # django-oauth-toolkit # edx-drf-extensions -s3transfer==0.8.2 +s3transfer==0.10.0 # via # -r requirements/test.txt # boto3 @@ -418,7 +422,7 @@ sqlparse==0.4.4 # via # -r requirements/test.txt # django -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/test.txt # code-annotations @@ -435,15 +439,16 @@ tomli==2.0.1 # pylint tomlkit==0.12.3 # via pylint -typing-extensions==4.8.0 +typing-extensions==4.10.0 # via # -r requirements/test.txt # asgiref # astroid # edx-opaque-keys + # jwcrypto # kombu # pylint -tzdata==2023.3 +tzdata==2024.1 # via # -r requirements/test.txt # backports-zoneinfo @@ -459,7 +464,7 @@ vine==5.1.0 # amqp # celery # kombu -wcwidth==0.2.12 +wcwidth==0.2.13 # via # -r requirements/test.txt # prompt-toolkit @@ -472,15 +477,10 @@ webob==1.8.7 # via # -r requirements/test.txt # xblock -wrapt==1.16.0 - # via - # -r requirements/test.txt - # deprecated -xblock[django]==1.8.1 +xblock[django]==1.10.0 # via # -r requirements/test.txt # edx-completion - # xblock # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/test.txt b/requirements/test.txt index 11470b5c..041bb5ae 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -18,23 +18,25 @@ asgiref==3.7.2 # django async-timeout==4.0.3 # via redis -attrs==23.1.0 - # via pytest +attrs==23.2.0 + # via + # -r requirements/base.txt + # openedx-events + # pytest backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/base.txt - # backports-zoneinfo # celery # kombu billiard==4.2.0 # via # -r requirements/base.txt # celery -boto3==1.33.6 +boto3==1.34.49 # via # -r requirements/base.txt # fs-s3fs -botocore==1.33.6 +botocore==1.34.49 # via # -r requirements/base.txt # boto3 @@ -44,7 +46,7 @@ celery==5.3.6 # -r requirements/base.txt # edx-celeryutils # event-tracking -certifi==2023.11.17 +certifi==2024.2.2 # via # -r requirements/base.txt # requests @@ -78,23 +80,19 @@ click-repl==0.3.0 # via # -r requirements/base.txt # celery -code-annotations==1.5.0 +code-annotations==1.6.0 # via # -r requirements/base.txt # edx-toggles -coverage[toml]==7.3.2 - # via - # coverage - # pytest-cov -cryptography==41.0.7 +coverage[toml]==7.4.3 + # via pytest-cov +cryptography==42.0.5 # via # -r requirements/base.txt # jwcrypto # pyjwt -ddt==1.7.0 +ddt==1.7.1 # via -r requirements/test.in -deprecated==1.2.14 - # via jwcrypto # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt @@ -113,12 +111,13 @@ deprecated==1.2.14 # event-tracking # jsonfield # openedx-django-pyfs + # openedx-events django-crum==0.7.9 # via # -r requirements/base.txt # edx-django-utils # edx-toggles -django-model-utils==4.3.1 +django-model-utils==4.4.0 # via # -r requirements/base.txt # -r requirements/test.in @@ -126,7 +125,7 @@ django-model-utils==4.3.1 # edx-completion django-oauth-toolkit==2.3.0 # via -r requirements/test.in -django-waffle==4.0.0 +django-waffle==4.1.0 # via # -r requirements/base.txt # edx-django-utils @@ -142,35 +141,42 @@ drf-jwt==1.19.2 # via # -r requirements/base.txt # edx-drf-extensions -edx-celeryutils==1.2.3 +edx-celeryutils==1.2.5 # via -r requirements/base.txt -edx-completion==4.4.0 +edx-completion==4.6.0 # via -r requirements/base.txt -edx-django-utils==5.9.0 +edx-django-utils==5.10.1 # via # -r requirements/base.txt # edx-drf-extensions # edx-toggles # event-tracking -edx-drf-extensions==9.0.0 + # openedx-events +edx-drf-extensions==10.2.0 # via # -r requirements/base.txt # edx-completion edx-i18n-tools==1.3.0 # via -r requirements/test.in -edx-opaque-keys==2.5.1 +edx-opaque-keys[django]==2.5.1 # via # -r requirements/base.txt # edx-completion # edx-drf-extensions -edx-toggles==5.1.0 + # openedx-events +edx-toggles==5.1.1 # via # -r requirements/base.txt # edx-completion -event-tracking==2.2.0 + # event-tracking +event-tracking==2.3.0 # via # -r requirements/base.txt # edx-completion +fastavro==1.9.4 + # via + # -r requirements/base.txt + # openedx-events freezegun==0.3.15 # via -r requirements/test.in fs==2.4.16 @@ -187,7 +193,7 @@ idna==3.6 # via # -r requirements/base.txt # requests -jinja2==3.1.2 +jinja2==3.1.3 # via # -r requirements/base.txt # code-annotations @@ -200,9 +206,9 @@ jsonfield==3.1.0 # via # -r requirements/base.txt # edx-celeryutils -jwcrypto==1.5.0 +jwcrypto==1.5.4 # via django-oauth-toolkit -kombu==5.3.4 +kombu==5.3.5 # via # -r requirements/base.txt # celery @@ -210,16 +216,16 @@ lazy==1.6 # via # -r requirements/base.txt # xblock -lxml==4.9.3 +lxml==5.1.0 # via # -r requirements/base.txt # edx-i18n-tools # xblock -mako==1.3.0 +mako==1.3.2 # via # -r requirements/base.txt # xblock -markupsafe==2.1.3 +markupsafe==2.1.5 # via # -r requirements/base.txt # jinja2 @@ -231,21 +237,25 @@ more-itertools==5.0.0 # via # -r requirements/test.in # pytest -mysqlclient==2.2.0 +mysqlclient==2.2.4 # via -r requirements/test.in -newrelic==9.2.0 +newrelic==9.7.0 # via # -r requirements/base.txt # edx-django-utils oauthlib==3.2.2 # via django-oauth-toolkit -openedx-django-pyfs==3.4.0 +openedx-django-pyfs==3.5.0 # via # -r requirements/base.txt # xblock +openedx-events==9.5.2 + # via + # -r requirements/base.txt + # event-tracking packaging==23.2 # via pytest -path==16.7.1 +path==16.10.0 # via edx-i18n-tools pbr==6.0.0 # via @@ -257,11 +267,11 @@ pluggy==0.13.1 # pytest polib==1.2.0 # via edx-i18n-tools -prompt-toolkit==3.0.41 +prompt-toolkit==3.0.43 # via # -r requirements/base.txt # click-repl -psutil==5.9.6 +psutil==5.9.8 # via # -r requirements/base.txt # edx-django-utils @@ -276,7 +286,6 @@ pyjwt[crypto]==2.8.0 # -r requirements/base.txt # drf-jwt # edx-drf-extensions - # pyjwt pymongo==3.13.0 # via # -r requirements/base.txt @@ -303,11 +312,11 @@ python-dateutil==2.8.2 # celery # freezegun # xblock -python-slugify==8.0.1 +python-slugify==8.0.4 # via # -r requirements/base.txt # code-annotations -pytz==2023.3.post1 +pytz==2024.1 # via # -r requirements/base.txt # django @@ -328,7 +337,7 @@ requests==2.31.0 # -r requirements/base.txt # django-oauth-toolkit # edx-drf-extensions -s3transfer==0.8.2 +s3transfer==0.10.0 # via # -r requirements/base.txt # boto3 @@ -354,7 +363,7 @@ sqlparse==0.4.4 # via # -r requirements/base.txt # django -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/base.txt # code-annotations @@ -366,13 +375,14 @@ text-unidecode==1.3 # python-slugify tomli==2.0.1 # via coverage -typing-extensions==4.8.0 +typing-extensions==4.10.0 # via # -r requirements/base.txt # asgiref # edx-opaque-keys + # jwcrypto # kombu -tzdata==2023.3 +tzdata==2024.1 # via # -r requirements/base.txt # backports-zoneinfo @@ -388,7 +398,7 @@ vine==5.1.0 # amqp # celery # kombu -wcwidth==0.2.12 +wcwidth==0.2.13 # via # -r requirements/base.txt # prompt-toolkit @@ -401,13 +411,10 @@ webob==1.8.7 # via # -r requirements/base.txt # xblock -wrapt==1.16.0 - # via deprecated -xblock[django]==1.8.1 +xblock[django]==1.10.0 # via # -r requirements/base.txt # edx-completion - # xblock # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/tests/test_models.py b/tests/test_models.py index 7ab1ce74..3476d146 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -234,7 +234,7 @@ def assert_emit_method_called(self, obj): event = "progress" if obj.percent < 1 else "completion" self.tracker_mock.emit.assert_called_once_with( - f"edx.completion_aggregator.{event}.{obj.aggregation_name}", + f"openedx.completion_aggregator.{event}.{obj.aggregation_name}", { "user_id": obj.user_id, "course_id": str(obj.course_key),