From d8d37943d1ec934ecba1d851307ed1a08b97691f Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Tue, 20 Aug 2024 11:24:42 -0400 Subject: [PATCH 1/2] chore: Upgrade Python requirements --- requirements/base.txt | 24 ++++++++--------- requirements/common_constraints.txt | 9 ------- requirements/django.txt | 2 +- requirements/doc.txt | 35 ++++++++++--------------- requirements/github.txt | 6 ++--- requirements/local.txt | 40 ++++++++++++----------------- requirements/optional.txt | 2 +- requirements/pip.txt | 4 +-- requirements/pip_tools.txt | 10 +++----- requirements/production.txt | 25 ++++++++---------- requirements/test.txt | 27 ++++++++----------- requirements/tox.txt | 4 +-- 12 files changed, 75 insertions(+), 113 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 6063327a6..680170235 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -16,7 +16,7 @@ backports-zoneinfo==0.2.1 # djangorestframework certifi==2024.7.4 # via requests -cffi==1.16.0 +cffi==1.17.0 # via # cryptography # pynacl @@ -36,7 +36,7 @@ defusedxml==0.8.0rc2 # via # python3-openid # social-auth-core -django==4.2.14 +django==4.2.15 # via # -c requirements/common_constraints.txt # -c requirements/constraints.txt @@ -107,7 +107,7 @@ edx-ccx-keys==1.3.0 # via -r requirements/base.in edx-django-release-util==1.4.0 # via -r requirements/base.in -edx-django-utils==5.14.2 +edx-django-utils==5.15.0 # via # -r requirements/base.in # edx-drf-extensions @@ -115,7 +115,7 @@ edx-django-utils==5.14.2 # edx-toggles edx-drf-extensions==10.3.0 # via -r requirements/base.in -edx-i18n-tools==1.6.1 +edx-i18n-tools==1.6.2 # via -r requirements/base.in edx-opaque-keys==2.10.0 # via @@ -134,21 +134,17 @@ libsass==0.23.0 # via -r requirements/base.in logutils==0.3.5 # via -r requirements/base.in -lxml[html-clean,html_clean]==5.2.2 - # via - # edx-i18n-tools - # lxml-html-clean -lxml-html-clean==0.2.0 - # via lxml +lxml==5.3.0 + # via edx-i18n-tools markupsafe==2.1.5 # via jinja2 -newrelic==9.12.0 +newrelic==9.13.0 # via edx-django-utils oauthlib==3.2.2 # via # requests-oauthlib # social-auth-core -path==17.0.0 +path==16.16.0 # via # edx-i18n-tools # path-py @@ -162,7 +158,7 @@ psutil==6.0.0 # via edx-django-utils pycparser==2.22 # via cffi -pyjwt[crypto]==2.8.0 +pyjwt[crypto]==2.9.0 # via # drf-jwt # edx-auth-backends @@ -181,7 +177,7 @@ python3-openid==3.2.0 # via social-auth-core pytz==2024.1 # via -r requirements/base.in -pyyaml==6.0.1 +pyyaml==6.0.2 # via # code-annotations # edx-django-release-util diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index b957ec4cd..31879f79e 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -23,15 +23,6 @@ elasticsearch<7.14.0 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected django-simple-history==3.0.0 -# opentelemetry requires version 6.x at the moment: -# https://github.com/open-telemetry/opentelemetry-python/issues/3570 -# Normally this could be added as a constraint in edx-django-utils, where we're -# adding the opentelemetry dependency. However, when we compile pip-tools.txt, -# that uses version 7.x, and then there's no undoing that when compiling base.txt. -# So we need to pin it globally, for now. -# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407 -importlib-metadata<7 - # Cause: https://github.com/openedx/event-tracking/pull/290 # event-tracking 2.4.1 upgrades to pymongo 4.4.0 which is not supported on edx-platform. # We will pin event-tracking to do not break existing installations diff --git a/requirements/django.txt b/requirements/django.txt index 549c1f8bb..16bc98be5 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -1 +1 @@ -django==4.2.14 +django==4.2.15 diff --git a/requirements/doc.txt b/requirements/doc.txt index bb917521f..bab442db2 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -15,7 +15,7 @@ asgiref==3.8.1 # -r requirements/base.txt # django # django-countries -babel==2.15.0 +babel==2.16.0 # via # pydata-sphinx-theme # sphinx @@ -30,7 +30,7 @@ certifi==2024.7.4 # via # -r requirements/base.txt # requests -cffi==1.16.0 +cffi==1.17.0 # via # -r requirements/base.txt # cryptography @@ -58,7 +58,7 @@ defusedxml==0.8.0rc2 # -r requirements/base.txt # python3-openid # social-auth-core -django==4.2.14 +django==4.2.15 # via # -c requirements/common_constraints.txt # -c requirements/constraints.txt @@ -138,7 +138,7 @@ edx-ccx-keys==1.3.0 # via -r requirements/base.txt edx-django-release-util==1.4.0 # via -r requirements/base.txt -edx-django-utils==5.14.2 +edx-django-utils==5.15.0 # via # -r requirements/base.txt # edx-drf-extensions @@ -146,7 +146,7 @@ edx-django-utils==5.14.2 # edx-toggles edx-drf-extensions==10.3.0 # via -r requirements/base.txt -edx-i18n-tools==1.6.1 +edx-i18n-tools==1.6.2 # via -r requirements/base.txt edx-opaque-keys==2.10.0 # via @@ -163,10 +163,8 @@ idna==3.7 # requests imagesize==1.4.1 # via sphinx -importlib-metadata==6.11.0 - # via - # -c requirements/common_constraints.txt - # sphinx +importlib-metadata==8.3.0 + # via sphinx jinja2==3.1.4 # via # -r requirements/base.txt @@ -176,20 +174,15 @@ libsass==0.23.0 # via -r requirements/base.txt logutils==0.3.5 # via -r requirements/base.txt -lxml[html-clean]==5.2.2 +lxml==5.3.0 # via # -r requirements/base.txt # edx-i18n-tools - # lxml-html-clean -lxml-html-clean==0.2.0 - # via - # -r requirements/base.txt - # lxml markupsafe==2.1.5 # via # -r requirements/base.txt # jinja2 -newrelic==9.12.0 +newrelic==9.13.0 # via # -r requirements/base.txt # edx-django-utils @@ -202,7 +195,7 @@ packaging==24.1 # via # pydata-sphinx-theme # sphinx -path==17.0.0 +path==16.16.0 # via # -r requirements/base.txt # edx-i18n-tools @@ -232,7 +225,7 @@ pygments==2.18.0 # accessible-pygments # pydata-sphinx-theme # sphinx -pyjwt[crypto]==2.8.0 +pyjwt[crypto]==2.9.0 # via # -r requirements/base.txt # drf-jwt @@ -260,7 +253,7 @@ pytz==2024.1 # via # -r requirements/base.txt # babel -pyyaml==6.0.1 +pyyaml==6.0.2 # via # -r requirements/base.txt # code-annotations @@ -305,7 +298,7 @@ social-auth-core==4.5.4 # -r requirements/base.txt # edx-auth-backends # social-auth-app-django -soupsieve==2.5 +soupsieve==2.6 # via beautifulsoup4 sphinx==6.2.1 # via @@ -352,7 +345,7 @@ urllib3==1.26.19 # -c requirements/constraints.txt # -r requirements/base.txt # requests -zipp==3.19.2 +zipp==3.20.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/github.txt b/requirements/github.txt index 7a4aab4df..3a943a23b 100644 --- a/requirements/github.txt +++ b/requirements/github.txt @@ -4,7 +4,7 @@ # # make upgrade # -cachetools==5.4.0 +cachetools==5.5.0 # via # -r requirements/tox.txt # tox @@ -16,7 +16,7 @@ colorama==0.4.6 # via # -r requirements/tox.txt # tox -coverage==7.6.0 +coverage==7.6.1 # via -r requirements/github.in distlib==0.3.8 # via @@ -50,7 +50,7 @@ tomli==2.0.1 # -r requirements/tox.txt # pyproject-api # tox -tox==4.16.0 +tox==4.18.0 # via -r requirements/tox.txt virtualenv==20.26.3 # via diff --git a/requirements/local.txt b/requirements/local.txt index 183dbc891..c5f27b5ef 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -25,7 +25,7 @@ build==1.2.1 # via # -r requirements/pip_tools.txt # pip-tools -cachetools==5.4.0 +cachetools==5.5.0 # via # -r requirements/tox.txt # tox @@ -33,7 +33,7 @@ certifi==2024.7.4 # via # -r requirements/test.txt # requests -cffi==1.16.0 +cffi==1.17.0 # via # -r requirements/test.txt # cryptography @@ -68,7 +68,7 @@ colorama==0.4.6 # via # -r requirements/tox.txt # tox -coverage[toml]==7.6.0 +coverage[toml]==7.6.1 # via # -r requirements/test.txt # pytest-cov @@ -92,7 +92,7 @@ distlib==0.3.8 # via # -r requirements/tox.txt # virtualenv -django==4.2.14 +django==4.2.15 # via # -c requirements/common_constraints.txt # -c requirements/constraints.txt @@ -173,7 +173,7 @@ edx-ccx-keys==1.3.0 # via -r requirements/test.txt edx-django-release-util==1.4.0 # via -r requirements/test.txt -edx-django-utils==5.14.2 +edx-django-utils==5.15.0 # via # -r requirements/test.txt # edx-drf-extensions @@ -181,7 +181,7 @@ edx-django-utils==5.14.2 # edx-toggles edx-drf-extensions==10.3.0 # via -r requirements/test.txt -edx-i18n-tools==1.6.1 +edx-i18n-tools==1.6.2 # via -r requirements/test.txt edx-lint==5.3.7 # via -r requirements/test.txt @@ -209,9 +209,8 @@ idna==3.7 # via # -r requirements/test.txt # requests -importlib-metadata==6.11.0 +importlib-metadata==8.3.0 # via - # -c requirements/common_constraints.txt # -r requirements/pip_tools.txt # build iniconfig==2.0.0 @@ -230,15 +229,10 @@ libsass==0.23.0 # via -r requirements/test.txt logutils==0.3.5 # via -r requirements/test.txt -lxml[html-clean]==5.2.2 +lxml==5.3.0 # via # -r requirements/test.txt # edx-i18n-tools - # lxml-html-clean -lxml-html-clean==0.2.0 - # via - # -r requirements/test.txt - # lxml markupsafe==2.1.5 # via # -r requirements/test.txt @@ -249,7 +243,7 @@ mccabe==0.7.0 # pylint mysqlclient==2.2.4 # via -r requirements/local.in -newrelic==9.12.0 +newrelic==9.13.0 # via # -r requirements/test.txt # edx-django-utils @@ -267,7 +261,7 @@ packaging==24.1 # pyproject-api # pytest # tox -path==17.0.0 +path==16.16.0 # via # -r requirements/test.txt # edx-i18n-tools @@ -301,7 +295,7 @@ psutil==6.0.0 # via # -r requirements/test.txt # edx-django-utils -pycodestyle==2.12.0 +pycodestyle==2.12.1 # via -r requirements/test.txt pycparser==2.22 # via @@ -309,7 +303,7 @@ pycparser==2.22 # cffi pydocstyle==6.3.0 # via -r requirements/test.txt -pyjwt[crypto]==2.8.0 +pyjwt[crypto]==2.9.0 # via # -r requirements/test.txt # drf-jwt @@ -373,7 +367,7 @@ python3-openid==3.2.0 # social-auth-core pytz==2024.1 # via -r requirements/test.txt -pyyaml==6.0.1 +pyyaml==6.0.2 # via # -r requirements/test.txt # code-annotations @@ -449,11 +443,11 @@ tomli==2.0.1 # pyproject-api # pytest # tox -tomlkit==0.13.0 +tomlkit==0.13.2 # via # -r requirements/test.txt # pylint -tox==4.16.0 +tox==4.18.0 # via -r requirements/tox.txt typing-extensions==4.12.2 # via @@ -472,11 +466,11 @@ virtualenv==20.26.3 # via # -r requirements/tox.txt # tox -wheel==0.43.0 +wheel==0.44.0 # via # -r requirements/pip_tools.txt # pip-tools -zipp==3.19.2 +zipp==3.20.0 # via # -r requirements/pip_tools.txt # importlib-metadata diff --git a/requirements/optional.txt b/requirements/optional.txt index 56cb9a9e3..1b0722382 100644 --- a/requirements/optional.txt +++ b/requirements/optional.txt @@ -4,5 +4,5 @@ # # make upgrade # -newrelic==9.12.0 +newrelic==9.13.0 # via -r requirements/optional.in diff --git a/requirements/pip.txt b/requirements/pip.txt index 7b187b8d0..de0f8b8da 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.43.0 +wheel==0.44.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: pip==24.2 # via -r requirements/pip.in -setuptools==72.1.0 +setuptools==73.0.0 # via -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index cd5c274bd..bc373e383 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -8,10 +8,8 @@ build==1.2.1 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==6.11.0 - # via - # -c requirements/common_constraints.txt - # build +importlib-metadata==8.3.0 + # via build packaging==24.1 # via build pip-tools==7.4.1 @@ -24,9 +22,9 @@ tomli==2.0.1 # via # build # pip-tools -wheel==0.43.0 +wheel==0.44.0 # via pip-tools -zipp==3.19.2 +zipp==3.20.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/production.txt b/requirements/production.txt index 80f2f576b..a4917aee1 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -20,7 +20,7 @@ certifi==2024.7.4 # via # -r requirements/base.txt # requests -cffi==1.16.0 +cffi==1.17.0 # via # -r requirements/base.txt # cryptography @@ -48,7 +48,7 @@ defusedxml==0.8.0rc2 # -r requirements/base.txt # python3-openid # social-auth-core -django==4.2.14 +django==4.2.15 # via # -c requirements/common_constraints.txt # -c requirements/constraints.txt @@ -124,7 +124,7 @@ edx-ccx-keys==1.3.0 # via -r requirements/base.txt edx-django-release-util==1.4.0 # via -r requirements/base.txt -edx-django-utils==5.14.2 +edx-django-utils==5.15.0 # via # -r requirements/base.txt # edx-drf-extensions @@ -132,7 +132,7 @@ edx-django-utils==5.14.2 # edx-toggles edx-drf-extensions==10.3.0 # via -r requirements/base.txt -edx-i18n-tools==1.6.1 +edx-i18n-tools==1.6.2 # via -r requirements/base.txt edx-opaque-keys==2.10.0 # via @@ -143,7 +143,7 @@ edx-rest-api-client==5.7.1 # via -r requirements/base.txt edx-toggles==5.2.0 # via -r requirements/base.txt -gunicorn==22.0.0 +gunicorn==23.0.0 # via -r requirements/production.in idna==3.7 # via @@ -157,22 +157,17 @@ libsass==0.23.0 # via -r requirements/base.txt logutils==0.3.5 # via -r requirements/base.txt -lxml[html-clean]==5.2.2 +lxml==5.3.0 # via # -r requirements/base.txt # edx-i18n-tools - # lxml-html-clean -lxml-html-clean==0.2.0 - # via - # -r requirements/base.txt - # lxml markupsafe==2.1.5 # via # -r requirements/base.txt # jinja2 mysqlclient==2.2.4 # via -r requirements/production.in -newrelic==9.12.0 +newrelic==9.13.0 # via # -r requirements/base.txt # edx-django-utils @@ -185,7 +180,7 @@ oauthlib==3.2.2 # social-auth-core packaging==24.1 # via gunicorn -path==17.0.0 +path==16.16.0 # via # -r requirements/base.txt # edx-i18n-tools @@ -208,7 +203,7 @@ pycparser==2.22 # via # -r requirements/base.txt # cffi -pyjwt[crypto]==2.8.0 +pyjwt[crypto]==2.9.0 # via # -r requirements/base.txt # drf-jwt @@ -238,7 +233,7 @@ python3-openid==3.2.0 # social-auth-core pytz==2024.1 # via -r requirements/base.txt -pyyaml==6.0.1 +pyyaml==6.0.2 # via # -r requirements/base.txt # -r requirements/production.in diff --git a/requirements/test.txt b/requirements/test.txt index 20833b024..d0aa7bf8b 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -25,7 +25,7 @@ certifi==2024.7.4 # via # -r requirements/base.txt # requests -cffi==1.16.0 +cffi==1.17.0 # via # -r requirements/base.txt # cryptography @@ -48,7 +48,7 @@ code-annotations==1.8.0 # -r requirements/base.txt # edx-lint # edx-toggles -coverage[toml]==7.6.0 +coverage[toml]==7.6.1 # via # -r requirements/test.in # pytest-cov @@ -143,7 +143,7 @@ edx-ccx-keys==1.3.0 # via -r requirements/base.txt edx-django-release-util==1.4.0 # via -r requirements/base.txt -edx-django-utils==5.14.2 +edx-django-utils==5.15.0 # via # -r requirements/base.txt # edx-drf-extensions @@ -151,7 +151,7 @@ edx-django-utils==5.14.2 # edx-toggles edx-drf-extensions==10.3.0 # via -r requirements/base.txt -edx-i18n-tools==1.6.1 +edx-i18n-tools==1.6.2 # via -r requirements/base.txt edx-lint==5.3.7 # via -r requirements/test.in @@ -184,22 +184,17 @@ libsass==0.23.0 # via -r requirements/base.txt logutils==0.3.5 # via -r requirements/base.txt -lxml[html-clean]==5.2.2 +lxml==5.3.0 # via # -r requirements/base.txt # edx-i18n-tools - # lxml-html-clean -lxml-html-clean==0.2.0 - # via - # -r requirements/base.txt - # lxml markupsafe==2.1.5 # via # -r requirements/base.txt # jinja2 mccabe==0.7.0 # via pylint -newrelic==9.12.0 +newrelic==9.13.0 # via # -r requirements/base.txt # edx-django-utils @@ -210,7 +205,7 @@ oauthlib==3.2.2 # social-auth-core packaging==24.1 # via pytest -path==17.0.0 +path==16.16.0 # via # -r requirements/base.txt # edx-i18n-tools @@ -233,7 +228,7 @@ psutil==6.0.0 # via # -r requirements/base.txt # edx-django-utils -pycodestyle==2.12.0 +pycodestyle==2.12.1 # via -r requirements/test.in pycparser==2.22 # via @@ -241,7 +236,7 @@ pycparser==2.22 # cffi pydocstyle==6.3.0 # via -r requirements/test.in -pyjwt[crypto]==2.8.0 +pyjwt[crypto]==2.9.0 # via # -r requirements/base.txt # drf-jwt @@ -291,7 +286,7 @@ python3-openid==3.2.0 # social-auth-core pytz==2024.1 # via -r requirements/base.txt -pyyaml==6.0.1 +pyyaml==6.0.2 # via # -r requirements/base.txt # code-annotations @@ -357,7 +352,7 @@ tomli==2.0.1 # coverage # pylint # pytest -tomlkit==0.13.0 +tomlkit==0.13.2 # via pylint typing-extensions==4.12.2 # via diff --git a/requirements/tox.txt b/requirements/tox.txt index 67e374e21..71ceb4959 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -4,7 +4,7 @@ # # make upgrade # -cachetools==5.4.0 +cachetools==5.5.0 # via tox chardet==5.2.0 # via tox @@ -32,7 +32,7 @@ tomli==2.0.1 # via # pyproject-api # tox -tox==4.16.0 +tox==4.18.0 # via -r requirements/tox.in virtualenv==20.26.3 # via tox From 9ecac8f161ac99be106ffd893c2277c1c46c6fb5 Mon Sep 17 00:00:00 2001 From: ilee2u Date: Wed, 21 Aug 2024 15:02:05 -0400 Subject: [PATCH 2/2] fix: docker compose syntax --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b042423e9..b9419b047 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: with: fetch-depth: 0 - name: start container - run: docker-compose -f .github/docker-compose-github.yml up -d + run: docker compose -f .github/docker-compose-github.yml up -d - name: setup analytics-api run: | docker exec analytics_api bash -c "