Skip to content
Open
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
4 changes: 2 additions & 2 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
strategy:
fail-fast: false
matrix:
tutor_version: ['<21.0.0', '<22.0.0', 'main']
tutor_version: ['<22.0.0', '<21.0.0', 'main']
steps:
- name: Run Integration Tests
uses: eduNEXT/[email protected].3
uses: eduNEXT/[email protected].0
with:
tutor_version: ${{ matrix.tutor_version }}
app_name: 'eox-theming'
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [v9.3.1](https://github.com/eduNEXT/eox-theming/compare/v9.3.0...v9.3.1) - (2026-01-20)
## [v9.3.1](https://github.com/eduNEXT/eox-theming/compare/v9.3.0...v9.3.1) - (2026-01-18)

### Changed

- Update Tutor integration-tests GitHub Action version to avoid integration test failures.
- **Django 5.2 Compatibility**: Migrated static files storage configuration from the deprecated `STATICFILES_STORAGE` setting to the new `STORAGES` dictionary.

## [v9.3.0](https://github.com/eduNEXT/eox-theming/compare/v9.2.0...v9.3.0) - (2025-10-13)

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ quality: clean ## check coding style with pycodestyle and pylint
test-python: clean ## Run test suite.
$(TOX) pip install -r requirements/test.txt --exists-action w
$(TOX) coverage run --source="." -m pytest ./eox_theming --ignore-glob='**/integration/*'
$(TOX) coverage report -m --fail-under=74
$(TOX) coverage report -m --fail-under=73

run-tests: test-python quality
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Compatibility Notes
+------------------+---------------+
| Teak | >= 9.0.0 |
+------------------+---------------+
| Ulmo | >= 9.3.0 |
| Ulmo | >= 9.3.1 |
+------------------+---------------+

The plugin is configured for the latest release (Teak). If you need compatibility for previous releases, go to the README of the relevant version tag and if it is necessary you can change the configuration in ``eox_theming/settings/common.py``.
Expand Down
11 changes: 10 additions & 1 deletion eox_theming/settings/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,15 @@ def plugin_settings(settings):
settings.EOX_THEMING_CONFIGURATION_HELPER_BACKEND = 'eox_theming.edxapp_wrapper.backends.j_configuration_helpers'
settings.EOX_THEMING_THEMING_HELPER_BACKEND = 'eox_theming.edxapp_wrapper.backends.j_theming_helpers'
settings.EOX_THEMING_STORAGE_BACKEND = 'eox_theming.edxapp_wrapper.backends.l_storage'
settings.STATICFILES_STORAGE = 'eox_theming.theming.storage.EoxProductionStorage'

if hasattr(settings, 'DEFAULT_FILE_STORAGE'):
settings.STATICFILES_STORAGE = (
'eox_theming.theming.storage.EoxProductionStorage'
)
else:
settings.STORAGES = getattr(settings, 'STORAGES', {})
settings.STORAGES.setdefault('staticfiles', {})['BACKEND'] = (
'eox_theming.theming.storage.EoxProductionStorage'
)

settings.EOX_THEMING_EDXMAKO_BACKEND = 'eox_theming.edxapp_wrapper.backends.l_mako'
5 changes: 4 additions & 1 deletion eox_theming/settings/devstack.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,7 @@ def plugin_settings(settings):
'eox_theming.theming.finders.EoxThemeFilesFinder',
] + settings.STATICFILES_FINDERS

settings.STATICFILES_STORAGE = 'eox_theming.theming.storage.EoxDevelopmentStorage'
if not hasattr(settings, 'STORAGES'):
settings.STATICFILES_STORAGE = 'eox_theming.theming.storage.EoxProductionStorage'
else:
settings.STORAGES.setdefault('staticfiles', {})['BACKEND'] = 'eox_theming.theming.storage.EoxProductionStorage'
7 changes: 6 additions & 1 deletion eox_theming/settings/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,12 @@ def plugin_settings(settings): # pylint: disable=function-redefined
except AttributeError:
pass

settings.STATICFILES_STORAGE = 'openedx.core.storage.ProductionStorage'
settings.STATICFILES_STORAGE = 'eox_theming.theming.storage.EoxProductionStorage'

if not hasattr(settings, 'STORAGES'):
settings.STORAGES = {}

settings.STORAGES.setdefault('staticfiles', {})['BACKEND'] = 'eox_theming.theming.storage.EoxProductionStorage'

settings.STATICFILES_FINDERS = [
x for x in settings.STATICFILES_FINDERS if 'EoxThemeFilesFinder' not in x
Expand Down
Loading