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
7 changes: 5 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@ jobs:
strategy:
max-parallel: 2
matrix:
python-version: ["3.11"]
django: ["42"]
python-version: ["3.11", "3.12"]
django: ["42", "52"]
exclude:
- python-version: "3.12"
django: "42"

steps:
- name: Checkout
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ 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.0](https://github.com/eduNEXT/eox-theming/compare/v9.2.0...v9.3.0) - (2025-10-13)

### Changed

- **Ulmo Support**: Upgrade requirements base on edx-platform Ulmo
release, update GitHub Workflows with new actions version.

## [v9.2.0](https://github.com/eduNEXT/eox-theming/compare/v9.1.0...v9.2.0) - (2025-07-01)

### Added
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
$(PIP_COMPILE) -o requirements/test.txt requirements/test.in
$(PIP_COMPILE) -o requirements/tox.txt requirements/tox.in

grep -e "^django==" requirements/test.txt > requirements/django42.txt
grep -e "^django==" requirements/test.txt > requirements/django52.txt
sed '/^[dD]jango==/d;' requirements/test.txt > requirements/test.tmp
mv requirements/test.tmp requirements/test.txt

Expand Down
2 changes: 2 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ Compatibility Notes
+------------------+---------------+
| Teak | >= 9.0.0 |
+------------------+---------------+
| Ulmo | >= 9.3.0 |
+------------------+---------------+

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
2 changes: 1 addition & 1 deletion eox_theming/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

from __future__ import unicode_literals

__version__ = '9.2.0'
__version__ = '9.3.0'
8 changes: 4 additions & 4 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
#
# make upgrade
#
asgiref==3.8.1
asgiref==3.10.0
# via django
django==4.2.22
django==5.2.7
# via
# -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/base.in
eox-tenant==13.1.0
eox-tenant==14.1.1
# via -r requirements/base.in
six==1.17.0
# via -r requirements/base.in
Expand Down
15 changes: 13 additions & 2 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,16 @@
# pin when possible. Writing an issue against the offending project and
# linking to it here is good.

# Common constraints for Open edX repos
-c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
# using LTS django version
Django<6.0

# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
# See https://github.com/openedx/edx-platform/issues/35126 for more info
elasticsearch<7.14.0

# NOTE: Pylint 4.x introduces changes in how the "ignore" and "ignore-patterns" options
# are parsed from setup.cfg and other configuration files. This causes Django migration
# modules (e.g., eox_tenant/migrations) to be linted even when explicitly ignored.
# Until we find a stable fix or plugin-based workaround, we keep Pylint pinned below 4.
pylint<4
1 change: 1 addition & 0 deletions requirements/django52.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
django==5.2.7
6 changes: 3 additions & 3 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
#
# make upgrade
#
build==1.2.2.post1
build==1.3.0
# via pip-tools
click==8.2.1
click==8.3.0
# via pip-tools
packaging==25.0
# via build
pip-tools==7.4.1
pip-tools==7.5.1
# via -r requirements/pip-tools.in
pyproject-hooks==1.2.0
# via
Expand Down
50 changes: 25 additions & 25 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,82 +4,82 @@
#
# make upgrade
#
asgiref==3.8.1
asgiref==3.10.0
# via
# -r requirements/base.txt
# django
astroid==3.3.10
astroid==3.3.11
# via
# -r requirements/test.in
# pylint
certifi==2025.4.26
certifi==2025.10.5
# via requests
charset-normalizer==3.4.2
charset-normalizer==3.4.4
# via requests
coverage==7.8.2
coverage==7.10.7
# via -r requirements/test.in
dill==0.4.0
# via pylint
# via
# -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/base.txt
# -r requirements/test.in
# djangorestframework
djangorestframework==3.16.0
djangorestframework==3.16.1
# via -r requirements/test.in
eox-tenant==13.1.0
eox-tenant==14.1.1
# via -r requirements/base.txt
idna==3.10
idna==3.11
# via requests
iniconfig==2.1.0
# via pytest
isort==6.0.1
isort==6.1.0
# via pylint
mako==1.3.10
# via -r requirements/test.in
markupsafe==3.0.2
markupsafe==3.0.3
# via mako
mccabe==0.7.0
# via pylint
mock==5.2.0
# via -r requirements/test.in
packaging==25.0
# via pytest
path==17.1.0
path==17.1.1
# via path-py
path-py==12.5.0
# via -r requirements/test.in
platformdirs==4.3.8
platformdirs==4.5.0
# via pylint
pluggy==1.6.0
# via pytest
pycodestyle==2.13.0
pycodestyle==2.14.0
# via -r requirements/test.in
pygments==2.19.1
pygments==2.19.2
# via pytest
pylint==3.3.7
# via -r requirements/test.in
pytest==8.4.0
pylint==3.3.9
# via
# -c requirements/constraints.txt
# -r requirements/test.in
pytest==8.4.2
# via
# -r requirements/test.in
# pytest-django
pytest-django==4.11.1
# via -r requirements/test.in
pyyaml==6.0.2
pyyaml==6.0.3
# via -r requirements/test.in
requests==2.32.4
requests==2.32.5
# via -r requirements/test.in
six==1.17.0
# via -r requirements/base.txt
sqlparse==0.5.3
# via
# -r requirements/base.txt
# django
testfixtures==8.3.0
testfixtures==9.2.0
# via -r requirements/test.in
tomlkit==0.13.3
# via pylint
urllib3==2.2.3
# via
# -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
# requests
urllib3==2.5.0
# via requests
14 changes: 7 additions & 7 deletions requirements/tox.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,31 @@
#
# make upgrade
#
cachetools==6.0.0
cachetools==6.2.1
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
distlib==0.3.9
distlib==0.4.0
# via virtualenv
filelock==3.18.0
filelock==3.20.0
# via
# tox
# virtualenv
packaging==25.0
# via
# pyproject-api
# tox
platformdirs==4.3.8
platformdirs==4.5.0
# via
# tox
# virtualenv
pluggy==1.6.0
# via tox
pyproject-api==1.9.1
pyproject-api==1.10.0
# via tox
tox==4.26.0
tox==4.31.0
# via -r requirements/tox.in
virtualenv==20.31.2
virtualenv==20.35.3
# via tox
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 9.2.0
current_version = 9.3.0
commit = False
tag = False

Expand Down
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,12 @@ def is_requirement(line):
classifiers=[
'Development Status :: 5 - Production/Stable',
'Framework :: Django :: 4.2',
'Framework :: Django :: 5.2',
'Intended Audience :: Developers',
'License :: OSI Approved :: GNU Affero General Public License v3',
'Operating System :: OS Independent',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
],
license='AGPL',
include_package_data=True,
Expand Down
7 changes: 6 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
[tox]
envlist = py{311}-django{42}
envlist =
py311-django42
py311-django52
py312-django52


[testenv]
envdir=
py311: {toxworkdir}/py311
py312: {toxworkdir}/py312
deps =
django42: -r requirements/django42.txt
django52: -r requirements/django52.txt
-r requirements/test.txt
commands =
{posargs}
Loading