Merge branch 'release/0.1.17' into main

.github/workflows/build.yml

@@ -13,8 +13,9 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['3.12']
-        django-version: ['4.2', '5.0', '5.1', 'dev']
+        django-version: ['4.2', '5.1', 'dev']
         database-engine: ["mysql", "postgres"]
+
     services:
       mysql:
         image: mysql:latest
@@ -68,7 +69,6 @@ jobs:
           python -m pip install --upgrade pip
           python -m pip install -r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/tox.txt
 
-
       - name: Tox tests
         run: |
           tox -v

.pre-commit-config.yaml

@@ -10,13 +10,13 @@ repos:
           - "-x *test*.py"
 
   - repo: https://github.com/psf/black
-    rev: 24.4.2
+    rev: 24.8.0
     hooks:
       - id: black
         language_version: python3.12
 
   - repo: https://github.com/pycqa/flake8
-    rev: 7.1.0
+    rev: 7.1.1
     hooks:
       - id: flake8
         args:
@@ -30,16 +30,17 @@ repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.6.0
     hooks:
-      - id: requirements-txt-fixer
-        files: requirements/.*\.txt$
-      - id: trailing-whitespace
       - id: check-added-large-files
-      - id: fix-byte-order-marker
       - id: check-docstring-first
       - id: check-executables-have-shebangs
       - id: check-merge-conflict
+      - id: check-toml
       - id: debug-statements
       - id: detect-private-key
+      - id: fix-byte-order-marker
+      - id: requirements-txt-fixer
+        files: requirements/.*\.txt$
+      - id: trailing-whitespace
 
   - repo: https://github.com/adrienverge/yamllint
     rev: v1.35.1

edc_qareports/sql_generator/requisition_subquery.py

@@ -26,8 +26,9 @@ class RequisitionSubquery(CrfSubquery):
     template: str = field(
         init=False,
         default=Template(
-            "select req.subject_identifier, req.id as original_id, req.subject_visit_id, "
-            "req.report_datetime, req.site_id, v.visit_code, v.visit_code_sequence, "
+            "select req.subject_identifier, req.id as original_id, "  # nosec B608
+            "req.subject_visit_id, req.report_datetime, req.site_id, v.visit_code, "
+            "v.visit_code_sequence, "
             "v.schedule_name, req.modified, '${label_lower}' as label_lower, "
             "'${label}' as label, count(*) as records "
             "from ${subjectrequisition_dbtable} as req "

edc_qareports/templates/edc_qareports/columns/change_button.html

@@ -1 +1 @@
-<a title="{{ label|default:"Change CRF"}}" role="button"  class="button" href="{{ url }}">Change&nbsp;CRF</a>
+<a title="{{ title|default:"Change CRF"}}" role="button"  class="button" href="{{ url }}">{{ label|default:"Change&nbsp;CRF" }}</a>

edc_qareports/tests/test_settings.py

@@ -17,6 +17,8 @@
         "edc_navbar.E002",
         "edc_navbar.E003",
         "edc_consent.E001",
+        "edc_sites.E001",
+        "edc_sites.E002",
     ],
     EDC_AUTH_SKIP_AUTH_UPDATER=True,
     EDC_SITES_REGISTER_DEFAULT=False,
@@ -33,6 +35,8 @@
         "django_db_views",
         "edc_auth.apps.AppConfig",
         "edc_action_item.apps.AppConfig",
+        "edc_adverse_event.apps.AppConfig",
+        "adverse_event_app.apps.AppConfig",
         "edc_appointment.apps.AppConfig",
         "edc_device.apps.AppConfig",
         "edc_timepoint.apps.AppConfig",
@@ -46,6 +50,9 @@
         "edc_sites.apps.AppConfig",
         "edc_visit_schedule.apps.AppConfig",
         "edc_visit_tracking.apps.AppConfig",
+        "edc_dashboard.apps.AppConfig",
+        "edc_subject_dashboard.apps.AppConfig",
+        "edc_review_dashboard.apps.AppConfig",
         "edc_qareports.apps.AppConfig",
         "edc_appointment_app.apps.AppConfig",
         "edc_appconfig.apps.AppConfig",

pyproject.toml

@@ -35,7 +35,7 @@ exclude_lines = [
 legacy_tox_ini = """
 [tox]
 envlist =
-    py{312}-dj{42,50,dev},
+    py{312}-dj{42,51,dev},
     lint
 
 isolated_build = true
@@ -47,7 +47,7 @@ python =
 [gh-actions:env]
 DJANGO =
     4.2: dj42
-    5.0: dj50
+    5.1: dj51
     dev: djdev, lint
 
 [testenv]
@@ -57,11 +57,11 @@ 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
+    dj51: Django>=5.1,<5.2
     djdev: https://github.com/django/django/tarball/main
 
 commands =
-    pip install -U pip coverage[toml]
+    pip install -U pip
     pip --version
     pip freeze
     coverage run -a runtests.py

setup.cfg

@@ -20,7 +20,6 @@ classifiers=
     Programming Language :: Python :: 3.12
     License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 
-
 [options]
 python_requires = >=3.12
 zip_safe = False