From 348d5f99e4c44b61da9999a50a08be50024c9b34 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Tue, 8 Apr 2025 12:33:09 +0500 Subject: [PATCH] fix: add support for django 5.2 --- .github/workflows/ci.yml | 2 +- CHANGELOG.rst | 5 +++++ setup.py | 1 + tox.ini | 4 +++- xblock/__init__.py | 2 +- xblock/test/settings.py | 4 ---- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4536ddae3..9949d3538 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: fail-fast: false matrix: python-version: ['3.11', '3.12'] - toxenv: [quality, django42] + toxenv: [quality, django42, django52] steps: - uses: actions/checkout@v4 diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1f411a65d..831846984 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,11 @@ Change history for XBlock Unreleased ---------- +5.2.0 - 2025-04-08 +------------------ + +* Added support for Django 5.2 + 5.1.2 - 2025-02-07 ------------------ diff --git a/setup.py b/setup.py index 77a3c93ae..8260aa7bf 100755 --- a/setup.py +++ b/setup.py @@ -70,6 +70,7 @@ def get_version(*file_paths): 'Development Status :: 5 - Production/Stable', 'Framework :: Django', 'Framework :: Django :: 4.2', + 'Framework :: Django :: 5.2', 'Intended Audience :: Developers', 'License :: OSI Approved :: Apache Software License', 'Natural Language :: English', diff --git a/tox.ini b/tox.ini index bf7c2fb86..9db82b407 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{311,312}-django{42}, quality, docs +envlist = py{311,312}-django{42,52}, quality, docs [pytest] DJANGO_SETTINGS_MODULE = xblock.test.settings @@ -10,6 +10,7 @@ norecursedirs = .* docs requirements [testenv] deps = django42: Django>=4.2,<5.0 + django52: Django>=5.2,<6.0 -r requirements/test.txt changedir = {envsitepackagesdir} commands = @@ -33,6 +34,7 @@ commands = [testenv:quality] deps = django42: Django>=4.2,<5.0 + django52: Django>=5.2,<6.0 -r requirements/test.txt changedir = {toxinidir} commands = diff --git a/xblock/__init__.py b/xblock/__init__.py index 1fa8a5fc6..f27076e42 100644 --- a/xblock/__init__.py +++ b/xblock/__init__.py @@ -2,4 +2,4 @@ XBlock Courseware Components """ -__version__ = '5.1.2' +__version__ = '5.2.0' diff --git a/xblock/test/settings.py b/xblock/test/settings.py index e89bba65c..9f349dd4d 100644 --- a/xblock/test/settings.py +++ b/xblock/test/settings.py @@ -40,10 +40,6 @@ # to load the internationalization machinery. USE_I18N = True -# If you set this to False, Django will not format dates, numbers and -# calendars according to the current locale. -USE_L10N = True - # If you set this to False, Django will not use timezone-aware datetimes. USE_TZ = True