Merge branch 'release/0.3.36' into main

clinicedc · Mar 13, 2024 · 3892c22 · 3892c22
2 parents e67bb99 + e4eb5c6
commit 3892c22
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.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:

diff --git a/.pre-commit-config.yaml b/.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:

diff --git a/edc_identifier/identifier.py b/edc_identifier/identifier.py
@@ -12,7 +12,7 @@
 class Identifier:
     name = "identifier"
     identifier_model_cls = IdentifierModel
-    identifier_pattern = "^\d+$"  # noqa
+    identifier_pattern = r"^\d+$"
     prefix_pattern: str | None = None
     prefix: str | None = None
     seed: str = "0"

diff --git a/edc_identifier/research_identifier.py b/edc_identifier/research_identifier.py
@@ -21,9 +21,9 @@ class IdentifierMissingTemplateValue(Exception):
 
 class ResearchIdentifier:
     label: str = None  # e.g. subject_identifier, plot_identifier, etc
-    identifier_type: Optional[
-        str
-    ] = None  # e.g. 'subject', 'infant', 'plot', a.k.a subject_type
+    identifier_type: Optional[str] = (
+        None  # e.g. 'subject', 'infant', 'plot', a.k.a subject_type
+    )
     template: Optional[str] = None
     padding: int = 5
     checkdigit = LuhnMixin()

diff --git a/edc_identifier/simple_identifier.py b/edc_identifier/simple_identifier.py
@@ -93,7 +93,6 @@ def __str__(self) -> str:
 
 
 class SimpleUniqueIdentifier:
-
     """Usage:
 
     class ManifestIdentifier(Identifier):