From 8f1dbd9970adfe9303a2cb759ba2305fd31f14fc Mon Sep 17 00:00:00 2001 From: "Glenn R. Martin" Date: Tue, 5 Sep 2023 13:47:49 -0400 Subject: [PATCH] chore: `pkg-config` added to Docker File (#118) * chore: `pkg-config` added to Docker File + PIP Reqs This is to future proof the update of mysql client in future releases. See: https://github.com/edx/edx-arch-experiments/issues/349 * fix: Docker Compose issues * fix: Bringing all pip req.s in line with those used by the code in `2u/project-theseus` * fix: make upgrade on Py3.8 This is a guess, but since im upgrading the requirements locally, and i rebuilt my venv... It swapped Python versions to 3.10 instead of 3.8 (the target of our other tooling)... ``` brew install python@3.8 python3.8 -m venv .venv . .venv/bin/activate make upgrade ``` This is based on PR #95 --- Dockerfile | 2 +- docker-compose.yml | 29 +++++++-------- requirements/base.txt | 34 +++++++++-------- requirements/ci.txt | 4 +- requirements/dev.txt | 73 ++++++++++++++++++++----------------- requirements/doc.txt | 60 +++++++++++++++--------------- requirements/pip-tools.txt | 11 ++++-- requirements/pip.txt | 4 +- requirements/production.txt | 39 ++++++++++---------- requirements/quality.txt | 62 ++++++++++++++++--------------- requirements/test.txt | 52 +++++++++++++------------- requirements/validation.txt | 64 ++++++++++++++++---------------- 12 files changed, 226 insertions(+), 208 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6f07a446..b4a48ced 100644 --- a/Dockerfile +++ b/Dockerfile @@ -66,7 +66,7 @@ RUN mkdir -p /edx/var/log USER app # Gunicorn 19 does not log to stdout or stderr by default. Once we are past gunicorn 19, the logging to STDOUT need not be specified. -CMD gunicorn --workers=2 --name commerce-coordinator -c /edx/app/commerce-coordinator/commerce_coordinator/docker_gunicorn_configuration.py --log-file - --max-requests=1000 commerce_coordinator.wsgi:application +CMD gunicorn --workers=2 --name commerce-coordinator -c /edx/app/commerce-coordinator/commerce_coordinator/docker_gunicorn_configuration.py --log-file - --max-requests=1000 commerce-coordinator.wsgi:application # This line is after the requirements so that changes to the code will not # bust the image cache diff --git a/docker-compose.yml b/docker-compose.yml index 78507e70..636dfc26 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,36 +2,35 @@ version: "2.1" services: db: image: edxops/mysql:5.7 - container_name: commerce_coordinator.db + container_name: commerce-coordinator.db environment: MYSQL_ROOT_PASSWORD: "" MYSQL_ALLOW_EMPTY_PASSWORD: "yes" - networks: - - devstack_default volumes: - - commerce_coordinator_mysql:/var/lib/mysql + - commerce-coordinator_mysql:/var/lib/mysql memcache: image: memcached:1.5.10-alpine - container_name: commerce_coordinator.memcache + container_name: commerce-coordinator.memcache app: - image: edx/commerce_coordinator - container_name: commerce_coordinator.app + image: devstack # this should exist locally from previous devstack, we will build our Dockerfile + build: . # Build Dockerfile if we need to. + container_name: commerce-coordinator.app volumes: - - .:/edx/app/commerce_coordinator/ - command: bash -c 'while true; do python /edx/app/commerce_coordinator/manage.py runserver 0.0.0.0:8140; sleep 2; done' - depends_on: - - db + - .:/edx/app/commerce-coordinator/ + command: bash -c 'while true; do python /edx/app/commerce-coordinator/manage.py runserver 0.0.0.0:8140; sleep 2; done' environment: DJANGO_SETTINGS_MODULE: commerce_coordinator.settings.devstack ports: - "8140:8140" - networks: - - devstack_default - - default # Just these containers. stdin_open: true tty: true + depends_on: + - "db" + networks: + - devstack_default # edX Dev Stack + - default # Just these containers networks: default: @@ -39,4 +38,4 @@ networks: external: true volumes: - commerce_coordinator_mysql: + commerce-coordinator_mysql: diff --git a/requirements/base.txt b/requirements/base.txt index ea190398..2b27662d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -19,13 +19,13 @@ billiard==4.1.0 # via celery celery[redis]==5.3.4 # via -r requirements/base.in -certifi==2023.5.7 +certifi==2023.7.22 # via requests cffi==1.15.1 # via # cryptography # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via requests click==8.1.7 # via @@ -70,15 +70,15 @@ django==4.2.5 # edx-drf-extensions # openedx-filters # social-auth-app-django -django-cors-headers==4.0.0 +django-cors-headers==4.2.0 # via -r requirements/base.in django-crum==0.7.9 # via edx-django-utils -django-extensions==3.2.1 +django-extensions==3.2.3 # via -r requirements/base.in django-rest-swagger==2.2.0 # via -r requirements/base.in -django-waffle==3.0.0 +django-waffle==4.0.0 # via # -r requirements/base.in # edx-django-utils @@ -95,7 +95,7 @@ edx-auth-backends==4.2.0 # via -r requirements/base.in edx-django-release-util==1.3.0 # via -r requirements/base.in -edx-django-utils==5.5.0 +edx-django-utils==5.7.0 # via # -r requirements/base.in # edx-drf-extensions @@ -104,7 +104,7 @@ edx-drf-extensions==8.10.0 # via -r requirements/base.in edx-opaque-keys==2.5.1 # via edx-drf-extensions -edx-rest-api-client==5.5.2 +edx-rest-api-client==5.6.0 # via -r requirements/base.in idna==3.4 # via requests @@ -112,7 +112,7 @@ itypes==1.2.0 # via coreapi jinja2==3.1.2 # via coreschema -kombu==5.3.0 +kombu==5.3.2 # via celery markupsafe==2.1.3 # via jinja2 @@ -126,17 +126,17 @@ oauthlib==3.2.2 # social-auth-core openapi-codec==1.3.2 # via django-rest-swagger -openedx-filters==1.3.0 +openedx-filters==1.6.0 # via -r requirements/base.in pbr==5.11.1 # via stevedore -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via click-repl psutil==5.9.5 # via edx-django-utils pycparser==2.21 # via cffi -pyjwt[crypto]==2.7.0 +pyjwt[crypto]==2.8.0 # via # drf-jwt # edx-auth-backends @@ -151,13 +151,13 @@ python-dateutil==2.8.2 # via celery python3-openid==3.2.0 # via social-auth-core -pytz==2023.3 +pytz==2023.3.post1 # via # -r requirements/base.in # djangorestframework pyyaml==6.0.1 # via edx-django-release-util -redis==4.5.5 +redis==4.6.0 # via celery requests==2.31.0 # via @@ -181,7 +181,7 @@ six==1.16.0 # python-dateutil slumber==0.7.1 # via edx-rest-api-client -social-auth-app-django==5.2.0 +social-auth-app-django==5.3.0 # via edx-auth-backends social-auth-core==4.4.2 # via @@ -198,9 +198,13 @@ stripe==6.6.0 typing-extensions==4.8.0 # via # asgiref + # edx-opaque-keys # kombu + # stripe tzdata==2023.3 - # via backports-zoneinfo + # via + # backports-zoneinfo + # celery uritemplate==4.1.1 # via coreapi urllib3==2.0.5 diff --git a/requirements/ci.txt b/requirements/ci.txt index bbba6478..c48fac8e 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,7 +4,7 @@ # # make upgrade # -distlib==0.3.6 +distlib==0.3.7 # via virtualenv filelock==3.12.4 # via @@ -12,7 +12,7 @@ filelock==3.12.4 # virtualenv packaging==23.1 # via tox -platformdirs==3.5.1 +platformdirs==3.10.0 # via virtualenv pluggy==1.3.0 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 18e376a9..50e09468 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -37,7 +37,7 @@ build==1.0.3 # pip-tools celery[redis]==5.3.4 # via -r requirements/validation.txt -certifi==2023.5.7 +certifi==2023.7.22 # via # -r requirements/validation.txt # requests @@ -46,9 +46,9 @@ cffi==1.15.1 # -r requirements/validation.txt # cryptography # pynacl -chardet==5.1.0 +chardet==5.2.0 # via diff-cover -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via # -r requirements/validation.txt # requests @@ -110,9 +110,9 @@ defusedxml==0.8.0rc1 # -r requirements/validation.txt # python3-openid # social-auth-core -diff-cover==7.5.0 +diff-cover==7.7.0 # via -r requirements/dev.in -dill==0.3.6 +dill==0.3.7 # via # -r requirements/validation.txt # pylint @@ -137,23 +137,23 @@ django==4.2.5 # edx-i18n-tools # openedx-filters # social-auth-app-django -django-cors-headers==4.0.0 +django-cors-headers==4.2.0 # via -r requirements/validation.txt django-crum==0.7.9 # via # -r requirements/validation.txt # edx-django-utils -django-debug-toolbar==4.1.0 +django-debug-toolbar==4.2.0 # via # -r requirements/dev.in # -r requirements/validation.txt django-dynamic-fixture==4.0.1 # via -r requirements/validation.txt -django-extensions==3.2.1 +django-extensions==3.2.3 # via -r requirements/validation.txt django-rest-swagger==2.2.0 # via -r requirements/validation.txt -django-waffle==3.0.0 +django-waffle==4.0.0 # via # -r requirements/validation.txt # edx-django-utils @@ -176,7 +176,7 @@ edx-auth-backends==4.2.0 # via -r requirements/validation.txt edx-django-release-util==1.3.0 # via -r requirements/validation.txt -edx-django-utils==5.5.0 +edx-django-utils==5.7.0 # via # -r requirements/validation.txt # edx-drf-extensions @@ -191,9 +191,9 @@ edx-opaque-keys==2.5.1 # via # -r requirements/validation.txt # edx-drf-extensions -edx-rest-api-client==5.5.2 +edx-rest-api-client==5.6.0 # via -r requirements/validation.txt -exceptiongroup==1.1.1 +exceptiongroup==1.1.3 # via # -r requirements/validation.txt # pytest @@ -205,9 +205,11 @@ idna==3.4 # via # -r requirements/validation.txt # requests -importlib-metadata==6.6.0 +importlib-metadata==6.8.0 # via + # -r requirements/pip-tools.txt # -r requirements/validation.txt + # build # keyring # twine importlib-resources==6.1.0 @@ -226,7 +228,7 @@ itypes==1.2.0 # via # -r requirements/validation.txt # coreapi -jaraco-classes==3.2.3 +jaraco-classes==3.3.0 # via # -r requirements/validation.txt # keyring @@ -236,11 +238,11 @@ jinja2==3.1.2 # code-annotations # coreschema # diff-cover -keyring==23.13.1 +keyring==24.2.0 # via # -r requirements/validation.txt # twine -kombu==5.3.0 +kombu==5.3.2 # via # -r requirements/validation.txt # celery @@ -248,7 +250,7 @@ lazy-object-proxy==1.9.0 # via # -r requirements/validation.txt # astroid -markdown-it-py==2.2.0 +markdown-it-py==3.0.0 # via # -r requirements/validation.txt # rich @@ -264,13 +266,13 @@ mdurl==0.1.2 # via # -r requirements/validation.txt # markdown-it-py -mock==5.0.2 +mock==5.1.0 # via -r requirements/validation.txt -more-itertools==9.1.0 +more-itertools==10.1.0 # via # -r requirements/validation.txt # jaraco-classes -mysqlclient==2.1.1 +mysqlclient==2.2.0 # via -r requirements/validation.txt newrelic==9.1.0 # via @@ -289,7 +291,7 @@ openapi-codec==1.3.2 # via # -r requirements/validation.txt # django-rest-swagger -openedx-filters==1.3.0 +openedx-filters==1.6.0 # via -r requirements/validation.txt packaging==23.1 # via @@ -298,24 +300,24 @@ packaging==23.1 # build # pytest # tox -path==16.6.0 +path==16.7.1 # via edx-i18n-tools pbr==5.11.1 # via # -r requirements/validation.txt # stevedore -pip-tools==6.13.0 +pip-tools==7.3.0 # via -r requirements/pip-tools.txt pkginfo==1.9.6 # via # -r requirements/validation.txt # twine -platformdirs==3.5.1 +platformdirs==3.10.0 # via # -r requirements/validation.txt # pylint # virtualenv -pluggy==1.0.0 +pluggy==1.3.0 # via # -r requirements/validation.txt # diff-cover @@ -323,7 +325,7 @@ pluggy==1.0.0 # tox polib==1.2.0 # via edx-i18n-tools -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via # -r requirements/validation.txt # click-repl @@ -335,7 +337,7 @@ py==1.11.0 # via # -r requirements/validation.txt # tox -pycodestyle==2.10.0 +pycodestyle==2.11.0 # via -r requirements/validation.txt pycparser==2.21 # via @@ -343,13 +345,13 @@ pycparser==2.21 # cffi pydocstyle==6.3.0 # via -r requirements/validation.txt -pygments==2.15.1 +pygments==2.16.1 # via # -r requirements/validation.txt # diff-cover # readme-renderer # rich -pyjwt[crypto]==2.7.0 +pyjwt[crypto]==2.8.0 # via # -r requirements/validation.txt # drf-jwt @@ -410,7 +412,7 @@ python3-openid==3.2.0 # via # -r requirements/validation.txt # social-auth-core -pytz==2023.3 +pytz==2023.3.post1 # via # -r requirements/validation.txt # djangorestframework @@ -425,7 +427,7 @@ readme-renderer==42.0 # via # -r requirements/validation.txt # twine -redis==4.5.5 +redis==4.6.0 # via # -r requirements/validation.txt # celery @@ -450,7 +452,7 @@ requests-toolbelt==1.0.0 # via # -r requirements/validation.txt # twine -responses==0.23.1 +responses==0.23.3 # via -r requirements/validation.txt rfc3986==2.0.0 # via @@ -484,7 +486,7 @@ snowballstemmer==2.2.0 # via # -r requirements/validation.txt # pydocstyle -social-auth-app-django==5.2.0 +social-auth-app-django==5.3.0 # via # -r requirements/validation.txt # edx-auth-backends @@ -518,11 +520,12 @@ tomli==2.0.1 # -r requirements/validation.txt # build # coverage + # pip-tools # pylint # pyproject-hooks # pytest # tox -tomlkit==0.11.8 +tomlkit==0.12.1 # via # -r requirements/validation.txt # pylint @@ -543,10 +546,12 @@ typing-extensions==4.8.0 # kombu # pylint # rich + # stripe tzdata==2023.3 # via # -r requirements/validation.txt # backports-zoneinfo + # celery uritemplate==4.1.1 # via # -r requirements/validation.txt diff --git a/requirements/doc.txt b/requirements/doc.txt index 24b7f344..6fd41387 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -28,8 +28,9 @@ babel==2.12.1 backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/test.txt + # celery # kombu -billiard==3.6.4.0 +billiard==4.1.0 # via # -r requirements/test.txt # celery @@ -41,9 +42,9 @@ billiard==4.1.0 # celery build==1.0.3 # via -r requirements/doc.in -celery[redis]==5.2.7 +celery[redis]==5.3.4 # via -r requirements/test.txt -certifi==2023.5.7 +certifi==2023.7.22 # via # -r requirements/test.txt # requests @@ -52,7 +53,7 @@ cffi==1.15.1 # -r requirements/test.txt # cryptography # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via # -r requirements/test.txt # requests @@ -112,7 +113,7 @@ defusedxml==0.8.0rc1 # -r requirements/test.txt # python3-openid # social-auth-core -dill==0.3.6 +dill==0.3.7 # via # -r requirements/test.txt # pylint @@ -136,7 +137,7 @@ django==4.2.5 # edx-drf-extensions # openedx-filters # social-auth-app-django -django-cors-headers==4.0.0 +django-cors-headers==4.2.0 # via -r requirements/test.txt django-crum==0.7.9 # via @@ -144,11 +145,11 @@ django-crum==0.7.9 # edx-django-utils django-dynamic-fixture==4.0.1 # via -r requirements/test.txt -django-extensions==3.2.1 +django-extensions==3.2.3 # via -r requirements/test.txt django-rest-swagger==2.2.0 # via -r requirements/test.txt -django-waffle==3.0.0 +django-waffle==4.0.0 # via # -r requirements/test.txt # edx-django-utils @@ -175,7 +176,7 @@ edx-auth-backends==4.2.0 # via -r requirements/test.txt edx-django-release-util==1.3.0 # via -r requirements/test.txt -edx-django-utils==5.5.0 +edx-django-utils==5.7.0 # via # -r requirements/test.txt # edx-drf-extensions @@ -188,11 +189,11 @@ edx-opaque-keys==2.5.1 # via # -r requirements/test.txt # edx-drf-extensions -edx-rest-api-client==5.5.2 +edx-rest-api-client==5.6.0 # via -r requirements/test.txt edx-sphinx-theme==3.1.0 # via -r requirements/doc.in -exceptiongroup==1.1.1 +exceptiongroup==1.1.3 # via # -r requirements/test.txt # pytest @@ -226,7 +227,7 @@ itypes==1.2.0 # via # -r requirements/test.txt # coreapi -jaraco-classes==3.2.3 +jaraco-classes==3.3.0 # via keyring jinja2==3.1.2 # via @@ -234,9 +235,9 @@ jinja2==3.1.2 # code-annotations # coreschema # sphinx -keyring==23.13.1 +keyring==24.2.0 # via twine -kombu==5.3.0 +kombu==5.3.2 # via # -r requirements/test.txt # celery @@ -244,7 +245,7 @@ lazy-object-proxy==1.9.0 # via # -r requirements/test.txt # astroid -markdown-it-py==2.2.0 +markdown-it-py==3.0.0 # via rich markupsafe==2.1.3 # via @@ -256,11 +257,11 @@ mccabe==0.7.0 # pylint mdurl==0.1.2 # via markdown-it-py -mock==5.0.2 +mock==5.1.0 # via -r requirements/test.txt -more-itertools==9.1.0 +more-itertools==10.1.0 # via jaraco-classes -mysqlclient==2.1.1 +mysqlclient==2.2.0 # via -r requirements/test.txt newrelic==9.1.0 # via @@ -277,7 +278,7 @@ openapi-codec==1.3.2 # via # -r requirements/test.txt # django-rest-swagger -openedx-filters==1.3.0 +openedx-filters==1.6.0 # via -r requirements/test.txt packaging==23.1 # via @@ -292,17 +293,17 @@ pbr==5.11.1 # stevedore pkginfo==1.9.6 # via twine -platformdirs==3.5.1 +platformdirs==3.10.0 # via # -r requirements/test.txt # pylint # virtualenv -pluggy==1.0.0 +pluggy==1.3.0 # via # -r requirements/test.txt # pytest # tox -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via # -r requirements/test.txt # click-repl @@ -318,13 +319,13 @@ pycparser==2.21 # via # -r requirements/test.txt # cffi -pygments==2.15.1 +pygments==2.16.1 # via # doc8 # readme-renderer # rich # sphinx -pyjwt[crypto]==2.7.0 +pyjwt[crypto]==2.8.0 # via # -r requirements/test.txt # drf-jwt @@ -383,7 +384,7 @@ python3-openid==3.2.0 # via # -r requirements/test.txt # social-auth-core -pytz==2023.3 +pytz==2023.3.post1 # via # -r requirements/test.txt # babel @@ -420,7 +421,7 @@ requests-oauthlib==1.3.1 # social-auth-core requests-toolbelt==1.0.0 # via twine -responses==0.23.1 +responses==0.23.3 # via -r requirements/test.txt restructuredtext-lint==1.4.0 # via doc8 @@ -451,7 +452,7 @@ slumber==0.7.1 # edx-rest-api-client snowballstemmer==2.2.0 # via sphinx -social-auth-app-django==5.2.0 +social-auth-app-django==5.3.0 # via # -r requirements/test.txt # edx-auth-backends @@ -462,7 +463,6 @@ social-auth-core==4.4.2 # social-auth-app-django sphinx==5.3.0 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/doc.in # edx-sphinx-theme sphinxcontrib-applehelp==1.0.4 @@ -506,7 +506,7 @@ tomli==2.0.1 # pyproject-hooks # pytest # tox -tomlkit==0.11.8 +tomlkit==0.12.1 # via # -r requirements/test.txt # pylint @@ -529,10 +529,12 @@ typing-extensions==4.8.0 # kombu # pylint # rich + # stripe tzdata==2023.3 # via # -r requirements/test.txt # backports-zoneinfo + # celery uritemplate==4.1.1 # via # -r requirements/test.txt diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 8e893f51..894fa179 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -8,15 +8,20 @@ build==1.0.3 # via pip-tools click==8.1.7 # via pip-tools +importlib-metadata==6.8.0 + # via build packaging==23.1 # via build -pip-tools==6.13.0 +pip-tools==7.3.0 # via -r requirements/pip-tools.in pyproject-hooks==1.0.0 # via build tomli==2.0.1 - # via build -wheel==0.40.0 + # via + # build + # pip-tools + # pyproject-hooks +wheel==0.41.2 # via pip-tools zipp==3.17.0 # via importlib-metadata diff --git a/requirements/pip.txt b/requirements/pip.txt index 3a207c80..3e7d8f4a 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.40.0 +wheel==0.41.2 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==23.1.2 +pip==23.2.1 # via -r requirements/pip.in setuptools==68.2.2 # via -r requirements/pip.in diff --git a/requirements/production.txt b/requirements/production.txt index 896599fb..6a613d7b 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -17,10 +17,6 @@ async-timeout==4.0.3 # -r requirements/base.txt # redis backports-zoneinfo[tzdata]==0.2.1 - # via - # -r requirements/base.txt - # kombu -billiard==3.6.4.0 # via # -r requirements/base.txt # celery @@ -32,7 +28,7 @@ billiard==4.1.0 # celery celery[redis]==5.3.4 # via -r requirements/base.txt -certifi==2023.5.7 +certifi==2023.7.22 # via # -r requirements/base.txt # requests @@ -41,7 +37,7 @@ cffi==1.15.1 # -r requirements/base.txt # cryptography # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via # -r requirements/base.txt # requests @@ -99,17 +95,17 @@ django==4.2.5 # edx-drf-extensions # openedx-filters # social-auth-app-django -django-cors-headers==4.0.0 +django-cors-headers==4.2.0 # via -r requirements/base.txt django-crum==0.7.9 # via # -r requirements/base.txt # edx-django-utils -django-extensions==3.2.1 +django-extensions==3.2.3 # via -r requirements/base.txt django-rest-swagger==2.2.0 # via -r requirements/base.txt -django-waffle==3.0.0 +django-waffle==4.0.0 # via # -r requirements/base.txt # edx-django-utils @@ -128,7 +124,7 @@ edx-auth-backends==4.2.0 # via -r requirements/base.txt edx-django-release-util==1.3.0 # via -r requirements/base.txt -edx-django-utils==5.5.0 +edx-django-utils==5.7.0 # via # -r requirements/base.txt # edx-drf-extensions @@ -139,7 +135,7 @@ edx-opaque-keys==2.5.1 # via # -r requirements/base.txt # edx-drf-extensions -edx-rest-api-client==5.5.2 +edx-rest-api-client==5.6.0 # via -r requirements/base.txt gevent==23.9.1 # via -r requirements/production.in @@ -159,7 +155,7 @@ jinja2==3.1.2 # via # -r requirements/base.txt # coreschema -kombu==5.3.0 +kombu==5.3.2 # via # -r requirements/base.txt # celery @@ -184,13 +180,15 @@ openapi-codec==1.3.2 # via # -r requirements/base.txt # django-rest-swagger -openedx-filters==1.3.0 +openedx-filters==1.6.0 # via -r requirements/base.txt +packaging==23.1 + # via gunicorn pbr==5.11.1 # via # -r requirements/base.txt # stevedore -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via # -r requirements/base.txt # click-repl @@ -202,7 +200,7 @@ pycparser==2.21 # via # -r requirements/base.txt # cffi -pyjwt[crypto]==2.7.0 +pyjwt[crypto]==2.8.0 # via # -r requirements/base.txt # drf-jwt @@ -228,7 +226,7 @@ python3-openid==3.2.0 # via # -r requirements/base.txt # social-auth-core -pytz==2023.3 +pytz==2023.3.post1 # via # -r requirements/base.txt # djangorestframework @@ -237,7 +235,7 @@ pyyaml==6.0.1 # -r requirements/base.txt # -r requirements/production.in # edx-django-release-util -redis==4.5.5 +redis==4.6.0 # via # -r requirements/base.txt # celery @@ -273,7 +271,7 @@ slumber==0.7.1 # via # -r requirements/base.txt # edx-rest-api-client -social-auth-app-django==5.2.0 +social-auth-app-django==5.3.0 # via # -r requirements/base.txt # edx-auth-backends @@ -297,11 +295,14 @@ typing-extensions==4.8.0 # via # -r requirements/base.txt # asgiref + # edx-opaque-keys # kombu + # stripe tzdata==2023.3 # via # -r requirements/base.txt # backports-zoneinfo + # celery uritemplate==4.1.1 # via # -r requirements/base.txt @@ -320,7 +321,7 @@ wcwidth==0.2.6 # via # -r requirements/base.txt # prompt-toolkit -zope-event==4.6 +zope-event==5.0 # via gevent zope-interface==6.0 # via gevent diff --git a/requirements/quality.txt b/requirements/quality.txt index 526bc892..86247620 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -33,7 +33,7 @@ billiard==4.1.0 # celery celery[redis]==5.3.4 # via -r requirements/test.txt -certifi==2023.5.7 +certifi==2023.7.22 # via # -r requirements/test.txt # requests @@ -42,7 +42,7 @@ cffi==1.15.1 # -r requirements/test.txt # cryptography # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via # -r requirements/test.txt # requests @@ -102,7 +102,7 @@ defusedxml==0.8.0rc1 # -r requirements/test.txt # python3-openid # social-auth-core -dill==0.3.6 +dill==0.3.7 # via # -r requirements/test.txt # pylint @@ -127,21 +127,21 @@ django==4.2.5 # edx-drf-extensions # openedx-filters # social-auth-app-django -django-cors-headers==4.0.0 +django-cors-headers==4.2.0 # via -r requirements/test.txt django-crum==0.7.9 # via # -r requirements/test.txt # edx-django-utils -django-debug-toolbar==4.1.0 +django-debug-toolbar==4.2.0 # via -r requirements/quality.in django-dynamic-fixture==4.0.1 # via -r requirements/test.txt -django-extensions==3.2.1 +django-extensions==3.2.3 # via -r requirements/test.txt django-rest-swagger==2.2.0 # via -r requirements/test.txt -django-waffle==3.0.0 +django-waffle==4.0.0 # via # -r requirements/test.txt # edx-django-utils @@ -162,7 +162,7 @@ edx-auth-backends==4.2.0 # via -r requirements/test.txt edx-django-release-util==1.3.0 # via -r requirements/test.txt -edx-django-utils==5.5.0 +edx-django-utils==5.7.0 # via # -r requirements/test.txt # edx-drf-extensions @@ -177,9 +177,9 @@ edx-opaque-keys==2.5.1 # via # -r requirements/test.txt # edx-drf-extensions -edx-rest-api-client==5.5.2 +edx-rest-api-client==5.6.0 # via -r requirements/test.txt -exceptiongroup==1.1.1 +exceptiongroup==1.1.3 # via # -r requirements/test.txt # pytest @@ -191,7 +191,7 @@ idna==3.4 # via # -r requirements/test.txt # requests -importlib-metadata==6.6.0 +importlib-metadata==6.8.0 # via # keyring # twine @@ -210,16 +210,16 @@ itypes==1.2.0 # via # -r requirements/test.txt # coreapi -jaraco-classes==3.2.3 +jaraco-classes==3.3.0 # via keyring jinja2==3.1.2 # via # -r requirements/test.txt # code-annotations # coreschema -keyring==23.13.1 +keyring==24.2.0 # via twine -kombu==5.3.0 +kombu==5.3.2 # via # -r requirements/test.txt # celery @@ -227,7 +227,7 @@ lazy-object-proxy==1.9.0 # via # -r requirements/test.txt # astroid -markdown-it-py==2.2.0 +markdown-it-py==3.0.0 # via rich markupsafe==2.1.3 # via @@ -239,11 +239,11 @@ mccabe==0.7.0 # pylint mdurl==0.1.2 # via markdown-it-py -mock==5.0.2 +mock==5.1.0 # via -r requirements/test.txt -more-itertools==9.1.0 +more-itertools==10.1.0 # via jaraco-classes -mysqlclient==2.1.1 +mysqlclient==2.2.0 # via -r requirements/test.txt newrelic==9.1.0 # via @@ -260,7 +260,7 @@ openapi-codec==1.3.2 # via # -r requirements/test.txt # django-rest-swagger -openedx-filters==1.3.0 +openedx-filters==1.6.0 # via -r requirements/test.txt packaging==23.1 # via @@ -273,17 +273,17 @@ pbr==5.11.1 # stevedore pkginfo==1.9.6 # via twine -platformdirs==3.5.1 +platformdirs==3.10.0 # via # -r requirements/test.txt # pylint # virtualenv -pluggy==1.0.0 +pluggy==1.3.0 # via # -r requirements/test.txt # pytest # tox -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via # -r requirements/test.txt # click-repl @@ -295,7 +295,7 @@ py==1.11.0 # via # -r requirements/test.txt # tox -pycodestyle==2.10.0 +pycodestyle==2.11.0 # via -r requirements/quality.in pycparser==2.21 # via @@ -303,11 +303,11 @@ pycparser==2.21 # cffi pydocstyle==6.3.0 # via -r requirements/quality.in -pygments==2.15.1 +pygments==2.16.1 # via # readme-renderer # rich -pyjwt[crypto]==2.7.0 +pyjwt[crypto]==2.8.0 # via # -r requirements/test.txt # drf-jwt @@ -364,7 +364,7 @@ python3-openid==3.2.0 # via # -r requirements/test.txt # social-auth-core -pytz==2023.3 +pytz==2023.3.post1 # via # -r requirements/test.txt # djangorestframework @@ -376,7 +376,7 @@ pyyaml==6.0.1 # responses readme-renderer==42.0 # via twine -redis==4.5.5 +redis==4.6.0 # via # -r requirements/test.txt # celery @@ -399,7 +399,7 @@ requests-oauthlib==1.3.1 # social-auth-core requests-toolbelt==1.0.0 # via twine -responses==0.23.1 +responses==0.23.3 # via -r requirements/test.txt rfc3986==2.0.0 # via twine @@ -427,7 +427,7 @@ slumber==0.7.1 # edx-rest-api-client snowballstemmer==2.2.0 # via pydocstyle -social-auth-app-django==5.2.0 +social-auth-app-django==5.3.0 # via # -r requirements/test.txt # edx-auth-backends @@ -462,7 +462,7 @@ tomli==2.0.1 # pylint # pytest # tox -tomlkit==0.11.8 +tomlkit==0.12.1 # via # -r requirements/test.txt # pylint @@ -485,10 +485,12 @@ typing-extensions==4.8.0 # kombu # pylint # rich + # stripe tzdata==2023.3 # via # -r requirements/test.txt # backports-zoneinfo + # celery uritemplate==4.1.1 # via # -r requirements/test.txt diff --git a/requirements/test.txt b/requirements/test.txt index 0df01871..536ded90 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -21,10 +21,6 @@ async-timeout==4.0.3 # -r requirements/base.txt # redis backports-zoneinfo[tzdata]==0.2.1 - # via - # -r requirements/base.txt - # kombu -billiard==3.6.4.0 # via # -r requirements/base.txt # celery @@ -36,7 +32,7 @@ billiard==4.1.0 # celery celery[redis]==5.3.4 # via -r requirements/base.txt -certifi==2023.5.7 +certifi==2023.7.22 # via # -r requirements/base.txt # requests @@ -45,7 +41,7 @@ cffi==1.15.1 # -r requirements/base.txt # cryptography # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via # -r requirements/base.txt # requests @@ -103,9 +99,9 @@ defusedxml==0.8.0rc1 # -r requirements/base.txt # python3-openid # social-auth-core -dill==0.3.6 +dill==0.3.7 # via pylint -distlib==0.3.6 +distlib==0.3.7 # via virtualenv # via # -c requirements/constraints.txt @@ -122,7 +118,7 @@ distlib==0.3.6 # edx-drf-extensions # openedx-filters # social-auth-app-django -django-cors-headers==4.0.0 +django-cors-headers==4.2.0 # via -r requirements/base.txt django-crum==0.7.9 # via @@ -130,11 +126,11 @@ django-crum==0.7.9 # edx-django-utils django-dynamic-fixture==4.0.1 # via -r requirements/test.in -django-extensions==3.2.1 +django-extensions==3.2.3 # via -r requirements/base.txt django-rest-swagger==2.2.0 # via -r requirements/base.txt -django-waffle==3.0.0 +django-waffle==4.0.0 # via # -r requirements/base.txt # edx-django-utils @@ -153,7 +149,7 @@ edx-auth-backends==4.2.0 # via -r requirements/base.txt edx-django-release-util==1.3.0 # via -r requirements/base.txt -edx-django-utils==5.5.0 +edx-django-utils==5.7.0 # via # -r requirements/base.txt # edx-drf-extensions @@ -166,9 +162,9 @@ edx-opaque-keys==2.5.1 # via # -r requirements/base.txt # edx-drf-extensions -edx-rest-api-client==5.5.2 +edx-rest-api-client==5.6.0 # via -r requirements/base.txt -exceptiongroup==1.1.1 +exceptiongroup==1.1.3 # via pytest filelock==3.12.4 # via @@ -191,7 +187,7 @@ jinja2==3.1.2 # -r requirements/base.txt # code-annotations # coreschema -kombu==5.3.0 +kombu==5.3.2 # via # -r requirements/base.txt # celery @@ -203,7 +199,7 @@ markupsafe==2.1.3 # jinja2 mccabe==0.7.0 # via pylint -mock==5.0.2 +mock==5.1.0 # via -r requirements/test.in mysqlclient==2.2.0 # via -r requirements/base.txt @@ -220,7 +216,7 @@ openapi-codec==1.3.2 # via # -r requirements/base.txt # django-rest-swagger -openedx-filters==1.3.0 +openedx-filters==1.6.0 # via -r requirements/base.txt packaging==23.1 # via @@ -230,15 +226,15 @@ pbr==5.11.1 # via # -r requirements/base.txt # stevedore -platformdirs==3.5.1 +platformdirs==3.10.0 # via # pylint # virtualenv -pluggy==1.0.0 +pluggy==1.3.0 # via # pytest # tox -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via # -r requirements/base.txt # click-repl @@ -252,7 +248,7 @@ pycparser==2.21 # via # -r requirements/base.txt # cffi -pyjwt[crypto]==2.7.0 +pyjwt[crypto]==2.8.0 # via # -r requirements/base.txt # drf-jwt @@ -300,7 +296,7 @@ python3-openid==3.2.0 # via # -r requirements/base.txt # social-auth-core -pytz==2023.3 +pytz==2023.3.post1 # via # -r requirements/base.txt # djangorestframework @@ -310,7 +306,7 @@ pyyaml==6.0.1 # code-annotations # edx-django-release-util # responses -redis==4.5.5 +redis==4.6.0 # via # -r requirements/base.txt # celery @@ -329,7 +325,7 @@ requests-oauthlib==1.3.1 # via # -r requirements/base.txt # social-auth-core -responses==0.23.1 +responses==0.23.3 # via -r requirements/test.in semantic-version==2.10.0 # via @@ -351,7 +347,7 @@ slumber==0.7.1 # via # -r requirements/base.txt # edx-rest-api-client -social-auth-app-django==5.2.0 +social-auth-app-django==5.3.0 # via # -r requirements/base.txt # edx-auth-backends @@ -382,13 +378,13 @@ tomli==2.0.1 # pylint # pytest # tox -tomlkit==0.11.8 +tomlkit==0.12.1 # via pylint tox==3.28.0 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.in -types-pyyaml==6.0.12.10 +types-pyyaml==6.0.12.11 # via responses typing-extensions==4.5.0 # via @@ -404,10 +400,12 @@ typing-extensions==4.8.0 # edx-opaque-keys # kombu # pylint + # stripe tzdata==2023.3 # via # -r requirements/base.txt # backports-zoneinfo + # celery uritemplate==4.1.1 # via # -r requirements/base.txt diff --git a/requirements/validation.txt b/requirements/validation.txt index a89d892c..443908f1 100644 --- a/requirements/validation.txt +++ b/requirements/validation.txt @@ -41,7 +41,7 @@ celery[redis]==5.3.4 # via # -r requirements/quality.txt # -r requirements/test.txt -certifi==2023.5.7 +certifi==2023.7.22 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -52,7 +52,7 @@ cffi==1.15.1 # -r requirements/test.txt # cryptography # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -126,7 +126,7 @@ defusedxml==0.8.0rc1 # -r requirements/test.txt # python3-openid # social-auth-core -dill==0.3.6 +dill==0.3.7 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -153,7 +153,7 @@ django==4.2.5 # edx-drf-extensions # openedx-filters # social-auth-app-django -django-cors-headers==4.0.0 +django-cors-headers==4.2.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -162,13 +162,13 @@ django-crum==0.7.9 # -r requirements/quality.txt # -r requirements/test.txt # edx-django-utils -django-debug-toolbar==4.1.0 +django-debug-toolbar==4.2.0 # via -r requirements/quality.txt django-dynamic-fixture==4.0.1 # via # -r requirements/quality.txt # -r requirements/test.txt -django-extensions==3.2.1 +django-extensions==3.2.3 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -176,7 +176,7 @@ django-rest-swagger==2.2.0 # via # -r requirements/quality.txt # -r requirements/test.txt -django-waffle==3.0.0 +django-waffle==4.0.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -206,7 +206,7 @@ edx-django-release-util==1.3.0 # via # -r requirements/quality.txt # -r requirements/test.txt -edx-django-utils==5.5.0 +edx-django-utils==5.7.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -225,11 +225,11 @@ edx-opaque-keys==2.5.1 # -r requirements/quality.txt # -r requirements/test.txt # edx-drf-extensions -edx-rest-api-client==5.5.2 +edx-rest-api-client==5.6.0 # via # -r requirements/quality.txt # -r requirements/test.txt -exceptiongroup==1.1.1 +exceptiongroup==1.1.3 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -244,7 +244,7 @@ idna==3.4 # -r requirements/quality.txt # -r requirements/test.txt # requests -importlib-metadata==6.6.0 +importlib-metadata==6.8.0 # via # -r requirements/quality.txt # keyring @@ -268,7 +268,7 @@ itypes==1.2.0 # -r requirements/quality.txt # -r requirements/test.txt # coreapi -jaraco-classes==3.2.3 +jaraco-classes==3.3.0 # via # -r requirements/quality.txt # keyring @@ -278,11 +278,11 @@ jinja2==3.1.2 # -r requirements/test.txt # code-annotations # coreschema -keyring==23.13.1 +keyring==24.2.0 # via # -r requirements/quality.txt # twine -kombu==5.3.0 +kombu==5.3.2 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -292,7 +292,7 @@ lazy-object-proxy==1.9.0 # -r requirements/quality.txt # -r requirements/test.txt # astroid -markdown-it-py==2.2.0 +markdown-it-py==3.0.0 # via # -r requirements/quality.txt # rich @@ -310,15 +310,15 @@ mdurl==0.1.2 # via # -r requirements/quality.txt # markdown-it-py -mock==5.0.2 +mock==5.1.0 # via # -r requirements/quality.txt # -r requirements/test.txt -more-itertools==9.1.0 +more-itertools==10.1.0 # via # -r requirements/quality.txt # jaraco-classes -mysqlclient==2.1.1 +mysqlclient==2.2.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -342,7 +342,7 @@ openapi-codec==1.3.2 # -r requirements/quality.txt # -r requirements/test.txt # django-rest-swagger -openedx-filters==1.3.0 +openedx-filters==1.6.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -361,19 +361,19 @@ pkginfo==1.9.6 # via # -r requirements/quality.txt # twine -platformdirs==3.5.1 +platformdirs==3.10.0 # via # -r requirements/quality.txt # -r requirements/test.txt # pylint # virtualenv -pluggy==1.0.0 +pluggy==1.3.0 # via # -r requirements/quality.txt # -r requirements/test.txt # pytest # tox -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -388,7 +388,7 @@ py==1.11.0 # -r requirements/quality.txt # -r requirements/test.txt # tox -pycodestyle==2.10.0 +pycodestyle==2.11.0 # via -r requirements/quality.txt pycparser==2.21 # via @@ -397,12 +397,12 @@ pycparser==2.21 # cffi pydocstyle==6.3.0 # via -r requirements/quality.txt -pygments==2.15.1 +pygments==2.16.1 # via # -r requirements/quality.txt # readme-renderer # rich -pyjwt[crypto]==2.7.0 +pyjwt[crypto]==2.8.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -474,7 +474,7 @@ python3-openid==3.2.0 # -r requirements/quality.txt # -r requirements/test.txt # social-auth-core -pytz==2023.3 +pytz==2023.3.post1 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -490,7 +490,7 @@ readme-renderer==42.0 # via # -r requirements/quality.txt # twine -redis==4.5.5 +redis==4.6.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -518,7 +518,7 @@ requests-toolbelt==1.0.0 # via # -r requirements/quality.txt # twine -responses==0.23.1 +responses==0.23.3 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -558,7 +558,7 @@ snowballstemmer==2.2.0 # via # -r requirements/quality.txt # pydocstyle -social-auth-app-django==5.2.0 +social-auth-app-django==5.3.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -603,7 +603,7 @@ tomli==2.0.1 # pylint # pytest # tox -tomlkit==0.11.8 +tomlkit==0.12.1 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -614,7 +614,7 @@ tox==3.28.0 # -r requirements/test.txt twine==4.0.2 # via -r requirements/quality.txt -types-pyyaml==6.0.12.10 +types-pyyaml==6.0.12.11 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -640,11 +640,13 @@ typing-extensions==4.8.0 # kombu # pylint # rich + # stripe tzdata==2023.3 # via # -r requirements/quality.txt # -r requirements/test.txt # backports-zoneinfo + # celery uritemplate==4.1.1 # via # -r requirements/quality.txt