From 8862cc03e6f0d15bc02d80ca68f9a3c9a71c0c08 Mon Sep 17 00:00:00 2001 From: Steven Giron Date: Wed, 24 Jun 2026 16:51:09 -0500 Subject: [PATCH] chore: add verawood release support --- .github/workflows/integration-test.yml | 2 +- .github/workflows/tests.yml | 3 ++- CHANGELOG.md | 8 ++++++ README.rst | 2 ++ eox_theming/__init__.py | 2 +- requirements/base.txt | 6 ++--- requirements/django52.txt | 2 +- requirements/pip-tools.txt | 10 +++---- requirements/test.txt | 36 ++++++++++++++------------ requirements/tox.txt | 28 ++++++++++++-------- setup.cfg | 8 +++--- 11 files changed, 63 insertions(+), 44 deletions(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 61af1c1..90f9b04 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - tutor_version: ['<22.0.0', 'main'] + tutor_version: ['<22.0.0', '<23.0.0', 'main'] steps: - name: Run Integration Tests uses: eduNEXT/integration-test-in-tutor@v0.1.3 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2e391e2..61191a1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -36,7 +36,8 @@ jobs: - name: Run Python Tests run: | - export TOXENV=${TOX_ENV//./} + export TOX_ENV=${TOX_ENV//./} + export TOXENV=$TOX_ENV make run-tests env: TOX_ENV: py${{matrix.python-version}}-django${{matrix.django}} diff --git a/CHANGELOG.md b/CHANGELOG.md index e0acdba..b11eb41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,14 @@ 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). +## [v10.1.0](https://github.com/eduNEXT/eox-theming/compare/v10.0.0...v10.1.0) - (2026-06-24) + +### Changed + +- **Verawood Support**: Update integration tests to use new Verawood release with Tutor, + update GitHub Actions versions, and update integration-test workflow to add Verawood + and remove oldest Tutor version support. + ## [v10.0.0](https://github.com/eduNEXT/eox-theming/compare/v9.3.1...v10.0.0) - (2026-02-11) #### ⚠ BREAKING CHANGES diff --git a/README.rst b/README.rst index cd1b52b..f1ee0b2 100644 --- a/README.rst +++ b/README.rst @@ -50,6 +50,8 @@ Compatibility Notes +------------------+-----------------+ | Ulmo | >= 10.0.0 | +------------------+-----------------+ +| Verawood | >= 10.1.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``. diff --git a/eox_theming/__init__.py b/eox_theming/__init__.py index fb23d4a..93d140a 100644 --- a/eox_theming/__init__.py +++ b/eox_theming/__init__.py @@ -4,4 +4,4 @@ from __future__ import unicode_literals -__version__ = '10.0.0' +__version__ = '10.1.0' diff --git a/requirements/base.txt b/requirements/base.txt index 2b1a345..35aefbc 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,16 +1,16 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # asgiref==3.11.1 # via django -django==5.2.11 +django==5.2.15 # via # -c requirements/constraints.txt # -r requirements/base.in -eox-tenant==14.2.1 +eox-tenant==14.3.0 # via -r requirements/base.in six==1.17.0 # via -r requirements/base.in diff --git a/requirements/django52.txt b/requirements/django52.txt index 331730a..f480bed 100644 --- a/requirements/django52.txt +++ b/requirements/django52.txt @@ -1 +1 @@ -django==5.2.11 +django==5.2.15 diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index d89516b..f995567 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -1,14 +1,14 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # -build==1.4.0 +build==1.5.0 # via pip-tools -click==8.3.1 +click==8.4.2 # via pip-tools -packaging==26.0 +packaging==26.2 # via # build # wheel @@ -18,7 +18,7 @@ pyproject-hooks==1.2.0 # via # build # pip-tools -wheel==0.46.3 +wheel==0.47.0 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index b015e81..fee86e5 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -12,11 +12,11 @@ astroid==3.3.11 # via # -r requirements/test.in # pylint -certifi==2026.1.4 +certifi==2026.6.17 # via requests -charset-normalizer==3.4.4 +charset-normalizer==3.4.7 # via requests -coverage==7.13.4 +coverage==7.14.3 # via -r requirements/test.in dill==0.4.1 # via pylint @@ -25,17 +25,17 @@ dill==0.4.1 # -r requirements/base.txt # -r requirements/test.in # djangorestframework -djangorestframework==3.16.1 +djangorestframework==3.17.1 # via -r requirements/test.in -eox-tenant==14.2.1 +eox-tenant==14.3.0 # via -r requirements/base.txt -idna==3.11 +idna==3.18 # via requests iniconfig==2.3.0 # via pytest isort==6.1.0 # via pylint -mako==1.3.10 +mako==1.3.12 # via -r requirements/test.in markupsafe==3.0.3 # via mako @@ -43,33 +43,33 @@ mccabe==0.7.0 # via pylint mock==5.2.0 # via -r requirements/test.in -packaging==26.0 +packaging==26.2 # via pytest path==17.1.1 # via path-py path-py==12.5.0 # via -r requirements/test.in -platformdirs==4.5.1 +platformdirs==4.10.0 # via pylint pluggy==1.6.0 # via pytest pycodestyle==2.14.0 # via -r requirements/test.in -pygments==2.19.2 +pygments==2.20.0 # via pytest pylint==3.3.9 # via # -c requirements/constraints.txt # -r requirements/test.in -pytest==9.0.2 +pytest==9.1.1 # via # -r requirements/test.in # pytest-django -pytest-django==4.11.1 +pytest-django==4.12.0 # via -r requirements/test.in pyyaml==6.0.3 # via -r requirements/test.in -requests==2.32.5 +requests==2.34.2 # via -r requirements/test.in six==1.17.0 # via -r requirements/base.txt @@ -77,9 +77,11 @@ sqlparse==0.5.5 # via # -r requirements/base.txt # django -testfixtures==10.0.0 +testfixtures==12.2.0 # via -r requirements/test.in -tomlkit==0.14.0 +tomlkit==0.15.0 # via pylint -urllib3==2.6.3 +typing-extensions==4.15.0 + # via testfixtures +urllib3==2.7.0 # via requests diff --git a/requirements/tox.txt b/requirements/tox.txt index eef31cb..103d8a0 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -1,34 +1,40 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # -cachetools==7.0.1 - # via tox -chardet==5.2.0 +cachetools==7.1.4 # via tox colorama==0.4.6 # via tox -distlib==0.4.0 +distlib==0.4.3 # via virtualenv -filelock==3.20.3 +filelock==3.29.4 # via + # python-discovery # tox # virtualenv -packaging==26.0 +packaging==26.2 # via # pyproject-api # tox -platformdirs==4.5.1 +platformdirs==4.10.0 # via + # python-discovery # tox # virtualenv pluggy==1.6.0 # via tox -pyproject-api==1.10.0 +pyproject-api==1.10.1 + # via tox +python-discovery==1.4.2 + # via + # tox + # virtualenv +tomli-w==1.2.0 # via tox -tox==4.34.1 +tox==4.56.1 # via -r requirements/tox.in -virtualenv==20.36.1 +virtualenv==21.5.1 # via tox diff --git a/setup.cfg b/setup.cfg index 603c82b..2421578 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 10.0.0 +current_version = 10.1.0 commit = False tag = False @@ -19,7 +19,7 @@ line_length = 120 multi_line_output = 3 [pylint.messages_control] -enable = +enable = line-too-long, syntax-error, init-is-generator, @@ -190,7 +190,7 @@ enable = useless-suppression, bad-inline-option, deprecated-pragma, -disable = +disable = invalid-name, file-ignored, bad-indentation, @@ -216,7 +216,7 @@ disable = [coverage:run] data_file = .coverage -omit = +omit = venv/* eox_theming/edxapp_wrapper/backends/*