Merge branch 'release/0.3.76' into main

.github/workflows/build.yml

@@ -36,9 +36,9 @@ jobs:
           sudo apt-get -y update
           sudo apt-get install libcups2-dev wamerican
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -48,7 +48,7 @@ jobs:
           echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT
 
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
           key:

.pre-commit-config.yaml

@@ -3,32 +3,32 @@ exclude: tests/etc/user-*
 
 repos:
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.5
+    rev: 1.7.7
     hooks:
       - id: bandit
         args:
           - "-x *test*.py"
 
   - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 24.1.1
     hooks:
       - id: black
-        language_version: python3.10
+        language_version: python3.11
 
   - repo: https://github.com/pycqa/flake8
-    rev: 6.0.0
+    rev: 7.0.0
     hooks:
       - id: flake8
         args:
           - "--config=setup.cfg"
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: requirements-txt-fixer
         files: requirements/.*\.txt$
@@ -42,7 +42,7 @@ repos:
       - id: detect-private-key
 
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.31.0
+    rev: v1.33.0
     hooks:
       - id: yamllint
         args:

edc_action_item/action.py

@@ -110,9 +110,9 @@ def __init__(
         if not self.related_action_item and self.related_reference_fk_attr:
             raise ActionError(
                 "Action class expects a related_action_item. "
-                f"related_reference_fk_attr={self.related_reference_fk_attr}. "
-                f"Got None for action based on action_item {self.action_item}. "
-                f"See {repr(self)}"
+                f"related_reference_fk_attr=`{self.related_reference_fk_attr}`. "
+                f"Got None for action based on action_item `{self.action_item}`. "
+                f"See `{repr(self)}`"
             )
 
         if self.reference_obj and not self.readonly:

edc_action_item/action_with_notification.py

@@ -7,7 +7,6 @@
 
 
 class ActionWithNotification(Action):
-
     """A class mixin for the Action class that adds
     support for notifications.
     """

edc_action_item/forms/action_item_crf_form_mixin.py

@@ -2,7 +2,6 @@
 
 
 class ActionItemCrfFormMixin:
-
     """Declare with forms.ModelForm."""
 
     class Meta:

edc_action_item/forms/action_item_form_mixin.py

@@ -2,7 +2,6 @@
 
 
 class ActionItemFormMixin:
-
     """Declare with forms.ModelForm."""
 
     class Meta:
@@ -14,7 +13,6 @@ class Meta:
 
 
 class ActionItemCrfFormMixin:
-
     """Declare with forms.ModelForm."""
 
     class Meta:

edc_action_item/models/action_item.py

@@ -30,8 +30,7 @@ class PrnModel(BaseUuidModel):
         subject_identifier: str
         ...
 
-    class CrfModel(CrfModelMixin):
-        ...
+    class CrfModel(CrfModelMixin): ...
 
 
 class CurrentSiteManager(BaseCurrentSiteManager):

edc_action_item/models/reference.py

@@ -14,7 +14,6 @@ def get_by_natural_key(self, action_identifier):
 
 
 class Reference(NonUniqueSubjectIdentifierFieldMixin, ActionModelMixin, BaseUuidModel):
-
     """Model used as a default reference model for simple actions
     not created by another model.
 

edc_action_item/stubs.py

@@ -15,8 +15,7 @@ def __init__(
         related_action_item: Optional["ActionItemStub"] = None,
         using: Optional[str] = None,
         readonly: Optional[bool] = None,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     name: str
     action_item: "ActionItemStub"
@@ -52,11 +51,9 @@ class ActionItemStub(Protocol):
 
     action_cls: ActionStub
 
-    def get_status_display(self) -> str:
-        ...
+    def get_status_display(self) -> str: ...
 
-    def get_action_cls(self) -> Type[ActionStub]:
-        ...
+    def get_action_cls(self) -> Type[ActionStub]: ...
 
 
 class ActionItemWithNotificationStub(ActionItemStub, Protocol):

edc_action_item/view_utils/action_item_button.py

@@ -26,12 +26,9 @@ class ActionItemButton(ModelButton):
 
     @property
     def label(self) -> str | None:
-        label = (
-            self.fixed_label
-            if self.fixed_label
-            else self.action_cls.reference_model_cls()._meta.verbose_name
-        )
-        return f"Add {label}"
+        if self.fixed_label:
+            return self.fixed_label
+        return self.action_cls.reference_model_cls()._meta.verbose_name
 
     @property
     def site(self) -> Site | None:

edc_action_item/view_utils/action_item_popover_list_item.py

@@ -19,8 +19,7 @@ class PrnModel(BaseUuidModel):
         subject_identifier: str
         ...
 
-    class CrfModel(CrfModelMixin):
-        ...
+    class CrfModel(CrfModelMixin): ...
 
 
 @dataclass

edc_action_item/visit_schedule_mixin.py

@@ -3,7 +3,6 @@
 
 
 class VisitScheduleActionMixin:
-
     """A mixin for the Action class to add properties and
     methods related to the visit schedule from
     edc_visit_schedule.

setup.cfg

@@ -35,7 +35,7 @@ exclude =
     edc_action_item.tests*
 
 [flake8]
-ignore = E226,W503,E203
+ignore = E226,W503,E203,E701,E704
 max-line-length = 95
 max-complexity = 10
 exclude = */migrations/*,.tox,.git,__pycache__,build,dist,.eggs