Skip to content

Commit

Permalink
feat: Add django 5.1 tests
Browse files Browse the repository at this point in the history
  • Loading branch information
fsbraun committed Nov 26, 2024
1 parent 2e9e6fd commit 9ece90b
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 13 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,3 @@ jobs:
run: webpack --mode=production
- name: Run jest
run: npx jest --coverage
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v5
3 changes: 2 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ jobs:
requirements-file: [
dj42_cms311.txt,
dj42_cms41.txt,
dj50_cms41.txt
dj50_cms41.txt,
dj51_cms41.txt
]
os: [
ubuntu-latest,
Expand Down
7 changes: 5 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
djangocms-text
==============

|pypi| |coverage| |python| |django| |djangocms| |djangocms4|
|pypi| |coverage| |precommit| |python| |django| |djangocms| |djangocms4|

``djangocms-text`` is a flexible and extensible rich text editing solution for Django
CMS. This package is designed as a replacement for ``djangocms-text-ckeditor``,
Expand Down Expand Up @@ -327,9 +327,12 @@ Acknowledgments
:target: https://codecov.io/gh/django-cms/djangocms-text
.. |python| image:: https://img.shields.io/badge/python-3.10+-blue.svg
:target: https://pypi.org/project/djangocms-text/
.. |django| image:: https://img.shields.io/badge/django-3.2+-blue.svg
.. |django| image:: https://img.shields.io/badge/django-4.2+-blue.svg
:target: https://www.djangoproject.com/
.. |djangocms| image:: https://img.shields.io/badge/django%20CMS-3.11%2B-blue.svg
:target: https://www.django-cms.org/
.. |djangocms4| image:: https://img.shields.io/badge/django%20CMS-4-blue.svg
:target: https://www.django-cms.org/
.. |precommit| image:: https://results.pre-commit.ci/badge/github/django-cms/djangocms-text/main.svg
:target: https://results.pre-commit.ci/latest/github/django-cms/djangocms-text/main
:alt: pre-commit.ci status
2 changes: 1 addition & 1 deletion djangocms_text/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def discover_inline_editable_models():
return inline_models


def check_ckeditor_settings(app_configs, **kwargs):
def check_ckeditor_settings(app_configs, **kwargs): # pragma: no cover
from django.conf import settings

change_msg = (
Expand Down
2 changes: 1 addition & 1 deletion tests/requirements/dj50_cms41.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-r base.txt

Django~=5.0rc1,<5.1
Django~=5.0,<5.1
django-cms>=4.1,<4.2
4 changes: 4 additions & 0 deletions tests/requirements/dj51_cms41.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-r base.txt

Django>=5.1,<5.2
django-cms>=4.1,<4.2
15 changes: 9 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
envlist =
frontend
py{310,311,312}-dj{42}-cms{311,41}
py{310,311,312}-dj{50}-cms{311,41}
py{310,311,312}-dj{50,51}-cms{41}

skip_missing_interpreters=True

Expand All @@ -15,17 +15,20 @@ deps =
dj52: Django>=5.2,<6.0
cms311: django-cms>=3.11,<4
cms40: git+https://github.com/django-cms/django-cms@release/4.0.1.x
cms41: git+https://github.com/django-cms/django-cms@develop-4
cms41: django-cms>=4.1,<4.2

commands =
{envpython} --version
{env:COMMAND:coverage} erase
{env:COMMAND:coverage} run runtests.py
{env:COMMAND:coverage} run -m pytest
{env:COMMAND:coverage} report

[testenv:frontend]
whitelist_externals =
allowlist_externals =
nvm
npm install
npm
webpack
commands = webpack
npx
commands =
webpack
npx jest --coverage

0 comments on commit 9ece90b

Please sign in to comment.