From 72b1b488f4ed6e08332d031de34ec57413fb383a Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Tue, 30 Apr 2024 06:08:53 -0700 Subject: [PATCH] feat: update celery version (#605) chore: Updating Python Requirements (#617) chore: add catalog-info.yml chore: enable github issues via config file fix: change linting for catalog-info.yaml file docs: Update README * Remove outdated Travis CI badge * s/edX/Open edX/ * Add note about Tutor - currently unknown if this package works on Tutor, but Devstack is deprecated. chore: Drop codecov to 90, which is a sane amount --- .github/ISSUE_TEMPLATE/config.yml | 2 +- .github/workflows/ci.yml | 4 +- README.rst | 12 ++-- catalog-info.yaml | 29 ++++++++ codecov.yml | 4 +- requirements/base.txt | 44 ++++++++++--- requirements/constraints.txt | 2 +- requirements/devstack.txt | 66 ++++++++++++++----- requirements/local.txt | 66 ++++++++++++++----- requirements/monitoring/requirements.txt | 84 +++++++++++++++++++----- requirements/pip-tools.txt | 3 +- requirements/production.txt | 53 ++++++++++++--- requirements/test.txt | 66 ++++++++++++++----- 13 files changed, 334 insertions(+), 101 deletions(-) create mode 100644 catalog-info.yaml diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 7f11af5d3..8614a2838 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -5,7 +5,7 @@ ## ready to accept Issues of all types, this file must be deleted so inheritance ## of standard openedx configuration works properly. -blank_issues_enabled: false +blank_issues_enabled: true contact_links: - name: Open edX Community Support url: https://discuss.openedx.org/ diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce02c6d87..f96490a2a 100644 --- 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/README.rst b/README.rst index fd41332a6..b3d6b335b 100644 --- a/README.rst +++ b/README.rst @@ -1,12 +1,10 @@ Registrar service |Travis|_ |Codecov|_ =================================================== -.. |Travis| image:: https://travis-ci.com/edx/registrar.svg?branch=master -.. _Travis: https://travis-ci.com/edx/registrar -.. |Codecov| image:: http://codecov.io/github/edx/registrar/coverage.svg?branch=master -.. _Codecov: http://codecov.io/github/edx/registrar?branch=master +.. |Codecov| image:: http://codecov.io/github/openedx/registrar/coverage.svg?branch=master +.. _Codecov: http://codecov.io/github/openedx/registrar?branch=master -The Registrar service allows external organizations to integrate with edX programs, +The Registrar service allows external organizations to integrate with Open edX programs, providing REST APIs involving program structure, enrollment, and grading. Through Django Admin, it allows the definition of access roles for different API users. @@ -28,6 +26,8 @@ as well as important information about PII annotation. Using with Devstack ----------------- +! Note ! This section may be outdated. Tutor (https://docs.tutor.edly.io/gettingstarted.html) is now the supported development environment for the Open edX project, but we have not currently verified if Registrar works on Tutor. + The best way to run Registrar is within the edX Devstack: https://github.com/openedx/devstack. See the Devstack README for information on how to install and run Registrar. @@ -35,7 +35,7 @@ See the Devstack README for information on how to install and run Registrar. Using Standalone ----------------- -Alternatively, you may run Registrar locally without the edX Devstack. Note that in this configuration, functionality that depends on communication with other edX services (e.g. LMS authentication) will not work by default. +Alternatively, you may run Registrar locally. Note that in this configuration, functionality that depends on communication with other Open edX services (e.g. LMS authentication) will not work by default. Requirements: diff --git a/catalog-info.yaml b/catalog-info.yaml new file mode 100644 index 000000000..21f83d9cc --- /dev/null +++ b/catalog-info.yaml @@ -0,0 +1,29 @@ +# This file records information about this repo. Its use is described in OEP-55: +# https://open-edx-proposals.readthedocs.io/en/latest/processes/oep-0055-proc-project-maintainers.html + +apiVersion: backstage.io/v1alpha1 +kind: Component +metadata: + # (Required) Must be the name of the repo, without the owning organization. + name: 'registrar' + description: > + The Registrar service allows external organizations to + integrate with Open edX programs, providing REST APIs involving + program structure, enrollment, and grading." + links: + - url: "https://github.com/openedx/registrar" + title: "openedx/registrar" + icon: "GitHub" + annotations: + openedx.org/arch-interest-groups: "" + openedx.org/release: "main" +spec: + # If you need a new team created, create an issue with Axim engineering: + # https://github.com/openedx/axim-engineering/issues/new/choose + owner: group:openedx-unmaintained + + # (Required) Acceptable Type Values: service, website, library + type: 'service' + + # (Required) Acceptable Lifecycle Values: experimental, production, deprecated + lifecycle: 'production' diff --git a/codecov.yml b/codecov.yml index c37995ce6..2d4f2f623 100644 --- a/codecov.yml +++ b/codecov.yml @@ -3,9 +3,9 @@ coverage: status: patch: default: - target: 100 + target: 90 project: default: - target: 100 + target: 90 ignore: - "registrar/apps/core/permissions.py" diff --git a/requirements/base.txt b/requirements/base.txt index c6c8d0308..410e218c7 100644 --- 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 @@ -120,7 +133,7 @@ edx-auth-backends==4.3.0 # via -r requirements/base.in edx-django-release-util==1.4.0 # via -r requirements/base.in -edx-django-utils==5.12.0 +edx-django-utils==5.13.0 # via # edx-drf-extensions # edx-rest-api-client @@ -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/constraints.txt b/requirements/constraints.txt index eca21e895..9f837379a 100644 --- 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 index 7811bcf49..dba0d4219 100644 --- 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 @@ -233,7 +251,7 @@ edx-auth-backends==4.3.0 # via -r requirements/local.txt edx-django-release-util==1.4.0 # via -r requirements/local.txt -edx-django-utils==5.12.0 +edx-django-utils==5.13.0 # via # -r requirements/local.txt # edx-drf-extensions @@ -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,7 +652,7 @@ 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 @@ -638,9 +660,14 @@ typing-extensions==4.11.0 # 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 diff --git a/requirements/local.txt b/requirements/local.txt index a70d57148..efa97b336 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -12,7 +12,7 @@ alabaster==0.7.13 # via # -r requirements/docs.txt # sphinx -amqp==2.6.1 +amqp==5.2.0 # via # -r requirements/test.txt # kombu @@ -42,25 +42,27 @@ backoff==1.10.0 # via # -r requirements/test.txt # analytics-python -backports-zoneinfo==0.2.1 +backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/test.txt + # celery # django # djangorestframework + # kombu beautifulsoup4==4.12.3 # via # -r requirements/docs.txt # pydata-sphinx-theme -billiard==3.6.4.0 +billiard==4.2.0 # via # -r requirements/test.txt # celery -boto3==1.34.92 +boto3==1.34.94 # via # -c requirements/constraints.txt # -r requirements/test.txt # moto -botocore==1.34.92 +botocore==1.34.94 # via # -r requirements/test.txt # boto3 @@ -70,7 +72,7 @@ cachetools==5.3.3 # via # -r requirements/test.txt # tox -celery==4.4.7 +celery==5.4.0 # via # -c requirements/constraints.txt # -r requirements/test.txt @@ -97,14 +99,30 @@ charset-normalizer==3.3.2 click==8.1.7 # via # -r requirements/test.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/test.txt + # celery click-log==0.4.0 # via # -r requirements/test.txt # edx-lint +click-plugins==1.1.1 + # via + # -r requirements/test.txt + # celery +click-repl==0.3.0 + # via + # -r requirements/test.txt + # celery code-annotations==1.8.0 # via # -c requirements/constraints.txt @@ -233,7 +251,7 @@ edx-auth-backends==4.3.0 # via -r requirements/test.txt edx-django-release-util==1.4.0 # via -r requirements/test.txt -edx-django-utils==5.12.0 +edx-django-utils==5.13.0 # via # -r requirements/test.txt # edx-drf-extensions @@ -256,11 +274,11 @@ exceptiongroup==1.2.1 # pytest factory-boy==3.3.0 # via -r requirements/test.txt -faker==24.14.0 +faker==25.0.0 # via # -r requirements/test.txt # factory-boy -filelock==3.13.4 +filelock==3.14.0 # via # -r requirements/test.txt # tox @@ -305,7 +323,7 @@ jmespath==1.0.1 # -r requirements/test.txt # boto3 # botocore -kombu==4.6.11 +kombu==5.3.7 # via # -r requirements/test.txt # celery @@ -331,7 +349,7 @@ monotonic==1.6 # via # -r requirements/test.txt # analytics-python -moto==5.0.5 +moto==5.0.6 # via -r requirements/test.txt newrelic==5.24.0.153 # via @@ -376,6 +394,10 @@ pluggy==1.5.0 # tox polib==1.2.0 # via edx-i18n-tools +prompt-toolkit==3.0.43 + # via + # -r requirements/test.txt + # click-repl psutil==5.9.8 # via # -r requirements/test.txt @@ -436,7 +458,7 @@ pyproject-api==1.6.1 # via # -r requirements/test.txt # tox -pytest==8.1.1 +pytest==8.2.0 # via # -r requirements/test.txt # pytest-cov @@ -450,6 +472,7 @@ python-dateutil==2.9.0.post0 # -r requirements/test.txt # analytics-python # botocore + # celery # faker # freezegun # moto @@ -468,7 +491,6 @@ pytz==2024.1 # -r requirements/docs.txt # -r requirements/test.txt # babel - # celery # drf-yasg pywatchman==2.0.0 # via -r requirements/local.in @@ -614,7 +636,7 @@ tomlkit==0.12.4 # via # -r requirements/test.txt # pylint -tox==4.14.2 +tox==4.15.0 # via -r requirements/test.txt typing-extensions==4.11.0 # via @@ -623,9 +645,14 @@ typing-extensions==4.11.0 # asgiref # astroid # edx-opaque-keys - # faker + # kombu # pydata-sphinx-theme # pylint +tzdata==2024.1 + # via + # -r requirements/test.txt + # backports-zoneinfo + # celery uritemplate==4.1.1 # via # -r requirements/test.txt @@ -638,15 +665,20 @@ urllib3==1.26.18 # botocore # requests # responses -vine==1.3.0 +vine==5.1.0 # via # -r requirements/test.txt # amqp # celery -virtualenv==20.26.0 + # kombu +virtualenv==20.26.1 # via # -r requirements/test.txt # tox +wcwidth==0.2.13 + # via + # -r requirements/test.txt + # prompt-toolkit werkzeug==3.0.2 # via # -r requirements/test.txt diff --git a/requirements/monitoring/requirements.txt b/requirements/monitoring/requirements.txt index 8d1062679..e69711a49 100644 --- a/requirements/monitoring/requirements.txt +++ b/requirements/monitoring/requirements.txt @@ -14,7 +14,7 @@ alabaster==0.7.13 # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # sphinx -amqp==2.6.1 +amqp==5.2.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -63,34 +63,36 @@ backoff==1.10.0 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # analytics-python -backports-zoneinfo==0.2.1 +backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt + # celery # django # djangorestframework + # kombu beautifulsoup4==4.12.3 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # pydata-sphinx-theme -billiard==3.6.4.0 +billiard==4.2.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # celery -boto3==1.34.92 +boto3==1.34.94 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # moto -botocore==1.34.92 +botocore==1.34.94 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -105,7 +107,7 @@ cachetools==5.3.3 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt # tox -celery==4.4.7 +celery==5.4.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -146,16 +148,41 @@ click==8.1.7 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.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/monitoring/../devstack.txt + # -r requirements/monitoring/../local.txt + # -r requirements/monitoring/../production.txt + # -r requirements/monitoring/../test.txt + # celery click-log==0.4.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt # edx-lint +click-plugins==1.1.1 + # via + # -r requirements/monitoring/../devstack.txt + # -r requirements/monitoring/../local.txt + # -r requirements/monitoring/../production.txt + # -r requirements/monitoring/../test.txt + # celery +click-repl==0.3.0 + # via + # -r requirements/monitoring/../devstack.txt + # -r requirements/monitoring/../local.txt + # -r requirements/monitoring/../production.txt + # -r requirements/monitoring/../test.txt + # celery code-annotations==1.8.0 # via # -r requirements/monitoring/../devstack.txt @@ -369,7 +396,7 @@ edx-django-release-util==1.4.0 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt -edx-django-utils==5.12.0 +edx-django-utils==5.13.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -416,13 +443,13 @@ factory-boy==3.3.0 # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt -faker==24.14.0 +faker==25.0.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt # factory-boy -filelock==3.13.4 +filelock==3.14.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -494,7 +521,7 @@ jmespath==1.0.1 # -r requirements/monitoring/../test.txt # boto3 # botocore -kombu==4.6.11 +kombu==5.3.7 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -536,7 +563,7 @@ monotonic==1.6 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # analytics-python -moto==5.0.5 +moto==5.0.6 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -612,6 +639,13 @@ polib==1.2.0 # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # edx-i18n-tools +prompt-toolkit==3.0.43 + # via + # -r requirements/monitoring/../devstack.txt + # -r requirements/monitoring/../local.txt + # -r requirements/monitoring/../production.txt + # -r requirements/monitoring/../test.txt + # click-repl psutil==5.9.8 # via # -r requirements/monitoring/../devstack.txt @@ -706,7 +740,7 @@ pyproject-api==1.6.1 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt # tox -pytest==8.1.1 +pytest==8.2.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -731,6 +765,7 @@ python-dateutil==2.9.0.post0 # -r requirements/monitoring/../test.txt # analytics-python # botocore + # celery # faker # freezegun # moto @@ -760,7 +795,6 @@ pytz==2024.1 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # babel - # celery # drf-yasg pywatchman==2.0.0 # via @@ -976,7 +1010,7 @@ tomlkit==0.12.4 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt # pylint -tox==4.14.2 +tox==4.15.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -990,9 +1024,17 @@ typing-extensions==4.11.0 # asgiref # astroid # edx-opaque-keys - # faker + # kombu # pydata-sphinx-theme # pylint +tzdata==2024.1 + # via + # -r requirements/monitoring/../devstack.txt + # -r requirements/monitoring/../local.txt + # -r requirements/monitoring/../production.txt + # -r requirements/monitoring/../test.txt + # backports-zoneinfo + # celery uritemplate==4.1.1 # via # -r requirements/monitoring/../devstack.txt @@ -1009,7 +1051,7 @@ urllib3==1.26.18 # botocore # requests # responses -vine==1.3.0 +vine==5.1.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -1017,12 +1059,20 @@ vine==1.3.0 # -r requirements/monitoring/../test.txt # amqp # celery -virtualenv==20.26.0 + # kombu +virtualenv==20.26.1 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt # tox +wcwidth==0.2.13 + # via + # -r requirements/monitoring/../devstack.txt + # -r requirements/monitoring/../local.txt + # -r requirements/monitoring/../production.txt + # -r requirements/monitoring/../test.txt + # prompt-toolkit werkzeug==3.0.2 # via # -r requirements/monitoring/../devstack.txt diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 1471eddf1..cd3398619 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -14,7 +14,7 @@ packaging==24.0 # via build pip-tools==7.4.1 # via -r requirements/pip-tools.in -pyproject-hooks==1.0.0 +pyproject-hooks==1.1.0 # via # build # pip-tools @@ -22,7 +22,6 @@ tomli==2.0.1 # via # build # pip-tools - # pyproject-hooks wheel==0.43.0 # via pip-tools zipp==3.18.1 diff --git a/requirements/production.txt b/requirements/production.txt index 5b2b43bc7..e6b56519f 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -4,7 +4,7 @@ # # make upgrade # -amqp==2.6.1 +amqp==5.2.0 # via # -r requirements/base.txt # kombu @@ -24,24 +24,26 @@ backoff==1.10.0 # via # -r requirements/base.txt # analytics-python -backports-zoneinfo==0.2.1 +backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/base.txt + # celery # django # djangorestframework -billiard==3.6.4.0 + # kombu +billiard==4.2.0 # via # -r requirements/base.txt # celery -boto3==1.34.92 +boto3==1.34.94 # via # -c requirements/constraints.txt # -r requirements/production.in -botocore==1.34.92 +botocore==1.34.94 # via # boto3 # s3transfer -celery==4.4.7 +celery==5.4.0 # via # -c requirements/constraints.txt # -r requirements/base.txt @@ -62,7 +64,23 @@ charset-normalizer==3.3.2 click==8.1.7 # via # -r requirements/base.txt + # celery + # click-didyoumean + # click-plugins + # click-repl # edx-django-utils +click-didyoumean==0.3.1 + # via + # -r requirements/base.txt + # celery +click-plugins==1.1.1 + # via + # -r requirements/base.txt + # celery +click-repl==0.3.0 + # via + # -r requirements/base.txt + # celery cryptography==42.0.5 # via # -r requirements/base.txt @@ -154,7 +172,7 @@ edx-auth-backends==4.3.0 # via -r requirements/base.txt edx-django-release-util==1.4.0 # via -r requirements/base.txt -edx-django-utils==5.12.0 +edx-django-utils==5.13.0 # via # -r requirements/base.txt # edx-drf-extensions @@ -185,7 +203,7 @@ jmespath==1.0.1 # via # boto3 # botocore -kombu==4.6.11 +kombu==5.3.7 # via # -r requirements/base.txt # celery @@ -216,6 +234,10 @@ pbr==6.0.0 # via # -r requirements/base.txt # stevedore +prompt-toolkit==3.0.43 + # via + # -r requirements/base.txt + # click-repl psutil==5.9.8 # via # -r requirements/base.txt @@ -247,6 +269,7 @@ python-dateutil==2.9.0.post0 # -r requirements/base.txt # analytics-python # botocore + # celery python-memcached==1.62 # via -r requirements/nonlocal.txt python-slugify==4.0.1 @@ -260,7 +283,6 @@ python3-openid==3.2.0 pytz==2024.1 # via # -r requirements/base.txt - # celery # drf-yasg pyyaml==6.0.1 # via @@ -327,6 +349,12 @@ typing-extensions==4.11.0 # -r requirements/base.txt # asgiref # edx-opaque-keys + # kombu +tzdata==2024.1 + # via + # -r requirements/base.txt + # backports-zoneinfo + # celery uritemplate==4.1.1 # via # -r requirements/base.txt @@ -337,11 +365,16 @@ urllib3==1.26.18 # -r requirements/base.txt # botocore # requests -vine==1.3.0 +vine==5.1.0 # via # -r requirements/base.txt # amqp # celery + # kombu +wcwidth==0.2.13 + # via + # -r requirements/base.txt + # prompt-toolkit zope-event==5.0 # via gevent zope-interface==6.3 diff --git a/requirements/test.txt b/requirements/test.txt index 4a00165cc..af0d024d5 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,7 +4,7 @@ # # make upgrade # -amqp==2.6.1 +amqp==5.2.0 # via # -r requirements/base.txt # kombu @@ -28,27 +28,29 @@ backoff==1.10.0 # via # -r requirements/base.txt # analytics-python -backports-zoneinfo==0.2.1 +backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/base.txt + # celery # django # djangorestframework -billiard==3.6.4.0 + # kombu +billiard==4.2.0 # via # -r requirements/base.txt # celery -boto3==1.34.92 +boto3==1.34.94 # via # -c requirements/constraints.txt # moto -botocore==1.34.92 +botocore==1.34.94 # via # boto3 # moto # s3transfer cachetools==5.3.3 # via tox -celery==4.4.7 +celery==5.4.0 # via # -c requirements/constraints.txt # -r requirements/base.txt @@ -71,12 +73,28 @@ charset-normalizer==3.3.2 click==8.1.7 # via # -r requirements/base.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/base.txt + # celery click-log==0.4.0 # via edx-lint +click-plugins==1.1.1 + # via + # -r requirements/base.txt + # celery +click-repl==0.3.0 + # via + # -r requirements/base.txt + # celery code-annotations==1.8.0 # via # -c requirements/constraints.txt @@ -187,7 +205,7 @@ edx-auth-backends==4.3.0 # via -r requirements/base.txt edx-django-release-util==1.4.0 # via -r requirements/base.txt -edx-django-utils==5.12.0 +edx-django-utils==5.13.0 # via # -r requirements/base.txt # edx-drf-extensions @@ -206,11 +224,11 @@ exceptiongroup==1.2.1 # via pytest factory-boy==3.3.0 # via -r requirements/test.in -faker==24.14.0 +faker==25.0.0 # via # -r requirements/test.in # factory-boy -filelock==3.13.4 +filelock==3.14.0 # via # tox # virtualenv @@ -238,7 +256,7 @@ jmespath==1.0.1 # via # boto3 # botocore -kombu==4.6.11 +kombu==5.3.7 # via # -r requirements/base.txt # celery @@ -252,7 +270,7 @@ monotonic==1.6 # via # -r requirements/base.txt # analytics-python -moto==5.0.5 +moto==5.0.6 # via -r requirements/test.in newrelic==5.24.0.153 # via @@ -286,6 +304,10 @@ pluggy==1.5.0 # via # pytest # tox +prompt-toolkit==3.0.43 + # via + # -r requirements/base.txt + # click-repl psutil==5.9.8 # via # -r requirements/base.txt @@ -328,7 +350,7 @@ pynacl==1.5.0 # edx-django-utils pyproject-api==1.6.1 # via tox -pytest==8.1.1 +pytest==8.2.0 # via # -r requirements/test.in # pytest-cov @@ -342,6 +364,7 @@ python-dateutil==2.9.0.post0 # -r requirements/base.txt # analytics-python # botocore + # celery # faker # freezegun # moto @@ -357,7 +380,6 @@ python3-openid==3.2.0 pytz==2024.1 # via # -r requirements/base.txt - # celery # drf-yasg pyyaml==6.0.1 # via @@ -439,7 +461,7 @@ tomli==2.0.1 # tox tomlkit==0.12.4 # via pylint -tox==4.14.2 +tox==4.15.0 # via -r requirements/test.in typing-extensions==4.11.0 # via @@ -447,8 +469,13 @@ typing-extensions==4.11.0 # asgiref # astroid # edx-opaque-keys - # faker + # kombu # pylint +tzdata==2024.1 + # via + # -r requirements/base.txt + # backports-zoneinfo + # celery uritemplate==4.1.1 # via # -r requirements/base.txt @@ -460,13 +487,18 @@ urllib3==1.26.18 # botocore # requests # responses -vine==1.3.0 +vine==5.1.0 # via # -r requirements/base.txt # amqp # celery -virtualenv==20.26.0 + # kombu +virtualenv==20.26.1 # via tox +wcwidth==0.2.13 + # via + # -r requirements/base.txt + # prompt-toolkit werkzeug==3.0.2 # via moto xmltodict==0.13.0