From 4bdf47afc69e888c6ae10cda06ff8979e21423f3 Mon Sep 17 00:00:00 2001 From: Vaibhav Gulati Date: Thu, 3 Sep 2026 10:54:32 +0000 Subject: [PATCH 1/2] chore: added Django 5.2 tox and CI compatibility checks --- .github/workflows/ci.yml | 4 ++-- CHANGELOG.rst | 4 ++++ enterprise_data/__init__.py | 2 +- tox.ini | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 30212c6a..f122f496 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: matrix: os: [ubuntu-latest] python-version: ['3.12'] - toxenv: [quality, data-django42, reporting-django42] + toxenv: [quality, data-django42, reporting-django42, data-django52, reporting-django52] steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -49,7 +49,7 @@ jobs: run: tox - name: Run Coverage - if: matrix.python-version == '3.12' && (matrix.toxenv=='django42-data' || matrix.toxenv=='django42-reporting') + if: matrix.python-version == '3.12' && (matrix.toxenv=='data-django42' || matrix.toxenv=='reporting-django42') uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0 with: token: ${{ secrets.CODECOV_TOKEN }} diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0b981c42..e3cf09ec 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -13,6 +13,10 @@ Change Log Unreleased +[10.22.15] - 2026-09-06 +----------------------- + * chore: added Django 5.2 tox and CI compatibility checks + [10.22.14] - 2026-08-06 ----------------------- * fix: simplify unlinked-learner exclusion in the Learner Progress Report [ENT-12136] diff --git a/enterprise_data/__init__.py b/enterprise_data/__init__.py index 3011ab80..75d825d9 100644 --- a/enterprise_data/__init__.py +++ b/enterprise_data/__init__.py @@ -2,4 +2,4 @@ Enterprise data api application. This Django app exposes API endpoints used by enterprises. """ -__version__ = "10.22.14" +__version__ = "10.22.15" diff --git a/tox.ini b/tox.ini index 18a4e050..76a56e3a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = {data, reporting}-django{42} +envlist = {data, reporting}-django{42,52} [wheel] universal = 1 @@ -39,6 +39,8 @@ setenv = deps = setuptools django42: Django>=4.2,<4.3 + django52: Django>=5.2,<5.3 + data: -r{toxinidir}/requirements/test-master.txt reporting: -r{toxinidir}/requirements/test-reporting.txt commands = From c0d34be7ee7dee4be2569133b67fe859f49ec4a1 Mon Sep 17 00:00:00 2001 From: Vaibhav Gulati Date: Tue, 8 Sep 2026 23:53:21 +0000 Subject: [PATCH 2/2] chore: added Django 5.2 tox and CI compatibility checks --- .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 f122f496..15f7959f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: run: tox - name: Run Coverage - if: matrix.python-version == '3.12' && (matrix.toxenv=='data-django42' || matrix.toxenv=='reporting-django42') + if: matrix.python-version == '3.12' && (matrix.toxenv=='django42-data' || matrix.toxenv=='django42-reporting') uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0 with: token: ${{ secrets.CODECOV_TOKEN }}