Merge branch 'develop' of github.com:clinicedc/edc-model into develop

.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.9.1
+    rev: 24.2.0
     hooks:
       - id: black
         language_version: python3.11
 
   - repo: https://github.com/pycqa/flake8
-    rev: 6.1.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.32.0
+    rev: v1.34.0
     hooks:
       - id: yamllint
         args:

README.rst

@@ -60,8 +60,8 @@ User created and modified fields behave as follows:
 .. |pypi| image:: https://img.shields.io/pypi/v/edc-model.svg
     :target: https://pypi.python.org/pypi/edc-model
 
-.. |actions| image:: https://github.com/clinicedc/edc-model/workflows/build/badge.svg?branch=develop
-  :target: https://github.com/clinicedc/edc-model/actions?query=workflow:build
+.. |actions| image:: https://github.com/clinicedc/edc-model/actions/workflows/build.yml/badge.svg
+  :target: https://github.com/clinicedc/edc-model/actions/workflows/build.yml
 
 .. |codecov| image:: https://codecov.io/gh/clinicedc/edc-model/branch/develop/graph/badge.svg
     :target: https://codecov.io/gh/clinicedc/edc-model

edc_model/models/base_model.py

@@ -5,7 +5,6 @@
 
 
 class BaseModel(UrlModelMixin, AuditModelMixin, models.Model):
-
     """Base model class for all EDC models. Adds created and modified'
     values for user, date and hostname (computer).
     """

edc_model/models/fields/date_estimated.py

@@ -5,7 +5,6 @@
 
 
 class IsDateEstimatedField(CharField):
-
     """field to question if date is estimated"""
 
     description = _("Custom field to question if date is estimated")
@@ -28,7 +27,6 @@ def get_internal_type(self):
 
 
 class IsDateEstimatedFieldNa(CharField):
-
     """field to question if date is estimated"""
 
     description = _("Custom field to question if date is estimated")

edc_model/models/fields/identity_type_field.py

@@ -4,7 +4,6 @@
 
 
 class IdentityTypeField(CharField):
-
     """
     have IdentityTypeField immediately follow an identity field:
 

edc_model/stubs.py

@@ -13,17 +13,15 @@ class ModelMetaStub(Protocol):
     app_label: str
     model_name: str
 
-    def get_fields(self) -> list:
-        ...
+    def get_fields(self) -> list: ...
 
 
 class BaseUuidModelStub(AuditModelStub, Protocol):
     id: UUID
     admin_url_name: str
     admin_site_name: str
 
-    def get_absolute_url(self) -> str:
-        ...
+    def get_absolute_url(self) -> str: ...
 
     objects: models.Manager
     _meta: ModelMetaStub
@@ -39,8 +37,7 @@ class BaseUuidHistoryModelStub(AuditModelStub, Protocol):
     admin_url_name: str
     admin_site_name: str
 
-    def get_absolute_url(self) -> str:
-        ...
+    def get_absolute_url(self) -> str: ...
 
     objects: models.Manager
     history: models.Manager

edc_model/widgets/slider_widget.py

@@ -2,7 +2,6 @@
 
 
 class SliderWidget(Input):
-
     """
     class HtnMedicationAdherenceForm(CrfModelFormMixin, forms.ModelForm):
         form_validator_cls = HtnMedicationAdherenceFormValidator

setup.cfg

@@ -35,7 +35,7 @@ exclude =
     edc_ltfu.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