From 58bf9f65895d96900e0ae4b40b532d101845c7d6 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Tue, 29 Apr 2025 11:22:39 -0400 Subject: [PATCH 1/2] chore: Upgrade Python requirements --- requirements/base.txt | 14 +++++++------- requirements/dev.txt | 14 +++++++------- requirements/doc.txt | 14 +++++++------- requirements/pip.txt | 4 ++-- requirements/production.txt | 16 ++++++++-------- requirements/test.txt | 14 +++++++------- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 60181b3d..f49d1d8e 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -11,13 +11,13 @@ asgiref==3.8.1 # django-countries boto==2.49.0 # via -r requirements/base.in -boto3==1.38.0 +boto3==1.38.4 # via -r requirements/base.in -botocore==1.38.0 +botocore==1.38.4 # via # boto3 # s3transfer -certifi==2025.1.31 +certifi==2025.4.26 # via requests cffi==1.17.1 # via @@ -103,7 +103,7 @@ edx-api-doc-tools==2.0.0 # via -r requirements/base.in edx-ccx-keys==2.0.2 # via -r requirements/base.in -edx-django-release-util==1.4.0 +edx-django-release-util==1.5.0 # via -r requirements/base.in edx-django-utils==7.4.0 # via @@ -116,9 +116,9 @@ edx-drf-extensions==10.6.0 # -r requirements/base.in # edx-enterprise-data # edx-rbac -edx-enterprise-data==10.14.0 +edx-enterprise-data==10.15.0 # via -r requirements/base.in -edx-opaque-keys==2.13.0 +edx-opaque-keys==3.0.0 # via # -r requirements/base.in # edx-ccx-keys @@ -154,7 +154,7 @@ markupsafe==3.0.2 # via jinja2 mysql-connector-python==9.3.0 # via edx-enterprise-data -newrelic==10.9.0 +newrelic==10.10.0 # via edx-django-utils numpy==2.2.5 # via diff --git a/requirements/dev.txt b/requirements/dev.txt index 141ca204..ac43cce0 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -11,13 +11,13 @@ asgiref==3.8.1 # django-countries boto==2.49.0 # via -r requirements/base.in -boto3==1.38.0 +boto3==1.38.4 # via -r requirements/base.in -botocore==1.38.0 +botocore==1.38.4 # via # boto3 # s3transfer -certifi==2025.1.31 +certifi==2025.4.26 # via requests cffi==1.17.1 # via @@ -103,7 +103,7 @@ edx-api-doc-tools==2.0.0 # via -r requirements/base.in edx-ccx-keys==2.0.2 # via -r requirements/base.in -edx-django-release-util==1.4.0 +edx-django-release-util==1.5.0 # via -r requirements/base.in edx-django-utils==7.4.0 # via @@ -116,9 +116,9 @@ edx-drf-extensions==10.6.0 # -r requirements/base.in # edx-enterprise-data # edx-rbac -edx-enterprise-data==10.14.0 +edx-enterprise-data==10.15.0 # via -r requirements/base.in -edx-opaque-keys==2.13.0 +edx-opaque-keys==3.0.0 # via # -r requirements/base.in # edx-ccx-keys @@ -156,7 +156,7 @@ mysql-connector-python==9.3.0 # via edx-enterprise-data mysqlclient==2.2.7 # via -r requirements/dev.in -newrelic==10.9.0 +newrelic==10.10.0 # via edx-django-utils numpy==2.2.5 # via diff --git a/requirements/doc.txt b/requirements/doc.txt index 8aac2dd0..22c04b97 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -21,13 +21,13 @@ beautifulsoup4==4.13.4 # via pydata-sphinx-theme boto==2.49.0 # via -r requirements/base.in -boto3==1.38.0 +boto3==1.38.4 # via -r requirements/base.in -botocore==1.38.0 +botocore==1.38.4 # via # boto3 # s3transfer -certifi==2025.1.31 +certifi==2025.4.26 # via requests cffi==1.17.1 # via @@ -117,7 +117,7 @@ edx-api-doc-tools==2.0.0 # via -r requirements/base.in edx-ccx-keys==2.0.2 # via -r requirements/base.in -edx-django-release-util==1.4.0 +edx-django-release-util==1.5.0 # via -r requirements/base.in edx-django-utils==7.4.0 # via @@ -130,9 +130,9 @@ edx-drf-extensions==10.6.0 # -r requirements/base.in # edx-enterprise-data # edx-rbac -edx-enterprise-data==10.14.0 +edx-enterprise-data==10.15.0 # via -r requirements/base.in -edx-opaque-keys==2.13.0 +edx-opaque-keys==3.0.0 # via # -r requirements/base.in # edx-ccx-keys @@ -172,7 +172,7 @@ markupsafe==3.0.2 # via jinja2 mysql-connector-python==9.3.0 # via edx-enterprise-data -newrelic==10.9.0 +newrelic==10.10.0 # via edx-django-utils numpy==2.2.5 # via diff --git a/requirements/pip.txt b/requirements/pip.txt index 2cd541e8..ebb53506 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -10,7 +10,7 @@ wheel==0.45.1 # The following packages are considered to be unsafe in a requirements file: pip==24.2 # via - # -c /edx/app/analytics_api/analytics_api/requirements/constraints.txt + # -c /home/runner/work/edx-analytics-data-api/edx-analytics-data-api/requirements/constraints.txt # -r requirements/pip.in -setuptools==79.0.0 +setuptools==80.0.0 # via -r requirements/pip.in diff --git a/requirements/production.txt b/requirements/production.txt index 28f0c314..ba8627cb 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -11,13 +11,13 @@ asgiref==3.8.1 # django-countries boto==2.49.0 # via -r requirements/base.in -boto3==1.38.0 +boto3==1.38.4 # via -r requirements/base.in -botocore==1.38.0 +botocore==1.38.4 # via # boto3 # s3transfer -certifi==2025.1.31 +certifi==2025.4.26 # via requests cffi==1.17.1 # via @@ -103,7 +103,7 @@ edx-api-doc-tools==2.0.0 # via -r requirements/base.in edx-ccx-keys==2.0.2 # via -r requirements/base.in -edx-django-release-util==1.4.0 +edx-django-release-util==1.5.0 # via -r requirements/base.in edx-django-utils==7.4.0 # via @@ -116,9 +116,9 @@ edx-drf-extensions==10.6.0 # -r requirements/base.in # edx-enterprise-data # edx-rbac -edx-enterprise-data==10.14.0 +edx-enterprise-data==10.15.0 # via -r requirements/base.in -edx-opaque-keys==2.13.0 +edx-opaque-keys==3.0.0 # via # -r requirements/base.in # edx-ccx-keys @@ -134,7 +134,7 @@ factory-boy==3.3.3 # via edx-enterprise-data faker==37.1.0 # via factory-boy -gevent==25.4.1 +gevent==25.4.2 # via -r requirements/production.in greenlet==3.2.1 # via gevent @@ -162,7 +162,7 @@ mysql-connector-python==9.3.0 # via edx-enterprise-data mysqlclient==2.2.7 # via -r requirements/production.in -newrelic==10.9.0 +newrelic==10.10.0 # via # -r requirements/production.in # edx-django-utils diff --git a/requirements/test.txt b/requirements/test.txt index ba000584..686df4ef 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -13,13 +13,13 @@ astroid==3.3.9 # via pylint boto==2.49.0 # via -r requirements/base.in -boto3==1.38.0 +boto3==1.38.4 # via -r requirements/base.in -botocore==1.38.0 +botocore==1.38.4 # via # boto3 # s3transfer -certifi==2025.1.31 +certifi==2025.4.26 # via requests cffi==1.17.1 # via @@ -118,7 +118,7 @@ edx-api-doc-tools==2.0.0 # via -r requirements/base.in edx-ccx-keys==2.0.2 # via -r requirements/base.in -edx-django-release-util==1.4.0 +edx-django-release-util==1.5.0 # via -r requirements/base.in edx-django-utils==7.4.0 # via @@ -131,9 +131,9 @@ edx-drf-extensions==10.6.0 # -r requirements/base.in # edx-enterprise-data # edx-rbac -edx-enterprise-data==10.14.0 +edx-enterprise-data==10.15.0 # via -r requirements/base.in -edx-opaque-keys==2.13.0 +edx-opaque-keys==3.0.0 # via # -r requirements/base.in # edx-ccx-keys @@ -179,7 +179,7 @@ mccabe==0.7.0 # via pylint mysql-connector-python==9.3.0 # via edx-enterprise-data -newrelic==10.9.0 +newrelic==10.10.0 # via edx-django-utils numpy==2.2.5 # via From 6d3b78510f16e683550017addd6032ba3cc32cd7 Mon Sep 17 00:00:00 2001 From: Michael Roytman Date: Fri, 2 May 2025 09:32:12 -0400 Subject: [PATCH 2/2] test: update CI and MySQL8 check migrations test runner from Ubuntu 20.04 to Ubuntu latest The Ubuntu 20.04 actions runner was deprecated, resulting in GitHub actions failing. This commit updates the OS used by the CI and MySQL8 check migration actions from Ubuntu 20.04 to Ubuntu latest. See the following issue for more details: https://github.com/actions/runner-images/issues/11101. --- .github/workflows/ci.yml | 2 +- .github/workflows/mysql8-migrations.yml | 2 +- .readthedocs.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8074a019..3e34eced 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: os: - - ubuntu-20.04 + - ubuntu-latest python-version: - 3.11 targets: [ 'quality','main.test','docs' ] diff --git a/.github/workflows/mysql8-migrations.yml b/.github/workflows/mysql8-migrations.yml index 64d91d03..123478d2 100644 --- a/.github/workflows/mysql8-migrations.yml +++ b/.github/workflows/mysql8-migrations.yml @@ -13,7 +13,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-20.04 ] + os: [ ubuntu-latest ] python-version: [ 3.11 ] steps: diff --git a/.readthedocs.yaml b/.readthedocs.yaml index d7e391ef..c3efebdd 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -6,7 +6,7 @@ version: 2 build: - os: "ubuntu-20.04" + os: "ubuntu-latest" tools: python: "3.11"