Merge branch 'develop' of github.com:clinicedc/edc-pharmacy-dashboard…

… into develop

.github/workflows/build.yml

@@ -12,8 +12,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.12']
-        django-version: ['4.2', '5.1', 'dev']
+        python-version: ['3.12', '3.13']
+        django-version: ['5.1', 'dev']
         database-engine: ["mysql", "postgres"]
 
     services:

.pre-commit-config.yaml

@@ -3,14 +3,14 @@ exclude: tests/etc/user-*
 
 repos:
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.9
+    rev: 1.8.2
     hooks:
       - id: bandit
         args:
           - "-x *test*.py"
 
   - repo: https://github.com/psf/black
-    rev: 24.8.0
+    rev: 24.10.0
     hooks:
       - id: black
         language_version: python3.12
@@ -28,15 +28,17 @@ repos:
       - id: isort
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: check-added-large-files
       - id: check-docstring-first
       - id: check-executables-have-shebangs
       - id: check-merge-conflict
       - id: check-toml
+      - id: check-yaml
       - id: debug-statements
       - id: detect-private-key
+      - id: end-of-file-fixer
       - id: fix-byte-order-marker
       - id: requirements-txt-fixer
         files: requirements/.*\.txt$

README.rst

@@ -14,4 +14,3 @@ EDC Pharmacy Dashboard
 
 .. |coverage| image:: https://coveralls.io/repos/github/clinicedc/edc-pharmacy-dashboard/badge.svg?branch=develop
     :target: https://coveralls.io/github/clinicedc/edc-pharmacy-dashboard?branch=develop
-

edc_pharmacy_dashboard/templates/edc_pharmacy_dashboard/base_listboard.html

@@ -46,4 +46,4 @@
    </div>
 </div>
 
-{% endblock main %}
+{% endblock main %}

edc_pharmacy_dashboard/templates/edc_pharmacy_dashboard/listboard/appointment/dispensensing_modal.html

@@ -77,4 +77,4 @@ <h5 class="panel-title">
     </form>
     </div>
   </div>
-</div>
+</div>

pyproject.toml

@@ -1,8 +1,9 @@
 [build-system]
 requires = ["setuptools>=60", "setuptools-scm>=8.0"]
+build-backend = "setuptools.build_meta"
 
 [tool.setuptools_scm]
-version_file="_version.py"
+version_file = "_version.py"
 
 [tool.black]
 line-length = 95
@@ -35,33 +36,33 @@ exclude_lines = [
 legacy_tox_ini = """
 [tox]
 envlist =
-    py{312}-dj{42,51,dev},
+    py{312,313}-dj{51,dev},
     lint
+    pre-commit
 
 isolated_build = true
 
 [gh-actions]
 python =
-    3.12: py312, lint
+    3.12: py312, lint, pre-commit
+    3.13: py313
 
 [gh-actions:env]
 DJANGO =
-    4.2: dj42
     5.1: dj51
-    dev: djdev, lint
+    dev: djdev, lint, pre-commit
 
 [testenv]
 deps =
     -r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/tox.txt
     -r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/test_utils.txt
     -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
     dj51: Django>=5.1,<5.2
     djdev: https://github.com/django/django/tarball/main
 
 commands =
     pip install -U pip
+    python --version
     pip --version
     pip freeze
     coverage run -a runtests.py
@@ -70,7 +71,19 @@ commands =
 [testenv:lint]
 deps = -r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/lint.txt
 commands =
+    python --version
+    pip --version
+    pip freeze
     isort --profile=black --check --diff .
     black --check --diff .
     flake8 .
+
+[testenv:pre-commit]
+deps = pre-commit
+commands =
+    python --version
+    pip --version
+    pip freeze
+    pre-commit autoupdate
+    pre-commit run --all-files
 """

setup.cfg

@@ -12,7 +12,6 @@ keywords = django Edc pharmacy, dashboard, clinicedc, clinical trials
 classifiers=
     Environment :: Web Environment
     Framework :: Django
-    Framework :: Django :: 4.2
     Framework :: Django :: 5.1
     Intended Audience :: Developers
     Intended Audience :: Science/Research

static/edc_label/label_templates/edc_pharma.lbl

@@ -6,4 +6,4 @@
 ^FO50,170^FDAddress Test Street^FS
 ^CFA,15
 ^FO50,220^GB700,1,3^FS
-^XZ
+^XZ