diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 64d10a1..c8c7403 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: python-version: ['3.12'] - django-version: ['4.2', '5.0', 'dev'] + django-version: ['4.2', '5.0', '5.1', 'dev'] services: mysql: diff --git a/edc_adverse_event/templatetags/edc_adverse_event_extras.py b/edc_adverse_event/templatetags/edc_adverse_event_extras.py index 5c212fe..d7f1160 100644 --- a/edc_adverse_event/templatetags/edc_adverse_event_extras.py +++ b/edc_adverse_event/templatetags/edc_adverse_event_extras.py @@ -15,7 +15,7 @@ from edc_constants.constants import CLOSED, OPEN, OTHER, YES from edc_dashboard.utils import get_bootstrap_version from edc_model_admin.utils import add_to_messages_once -from edc_utils import get_utcnow +from edc_utils import escape_braces, get_utcnow from ..constants import AE_WITHDRAWN, TMG_ROLE from ..utils import get_adverse_event_app_label, get_ae_model, has_valid_tmg_perms @@ -53,10 +53,6 @@ def wrapx(text: str, length: int) -> str: return text -def escape_braces(text: str) -> str: - return text.replace("{", "{{").replace("}", "}}") - - def select_ae_template(relative_path): """Returns a template object.""" local_path = f"{get_adverse_event_app_label()}/bootstrap{get_bootstrap_version()}/" diff --git a/pyproject.toml b/pyproject.toml index de1702a..513ee47 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ exclude_lines = [ legacy_tox_ini = """ [tox] envlist = - py{312}-dj{42,50,dev}, + py{312}-dj{42,50,51,dev}, lint isolated_build = true @@ -48,6 +48,7 @@ python = DJANGO = 4.2: dj42 5.0: dj50 + 5.1: dj51 dev: djdev, lint [testenv] @@ -57,7 +58,8 @@ deps = -r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/edc.txt -r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/third_party_dev.txt dj42: Django>=4.2,<5.0 - dj50: Django>=5.0 + dj50: Django>=5.0,<5.1 + dj51: Django>=5.1 djdev: https://github.com/django/django/tarball/main commands =