Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
------------------

Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 3 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 =
Expand All @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion xblock/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
XBlock Courseware Components
"""

__version__ = '5.1.2'
__version__ = '5.2.0'
4 changes: 0 additions & 4 deletions xblock/test/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down