Merge branch 'release/0.3.46' into main

clinicedc · Feb 14, 2024 · 7d0e920 · 7d0e920
2 parents 5888161 + 77e27d1
commit 7d0e920
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 17 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_export/archive_exporter.py b/edc_export/archive_exporter.py
@@ -25,7 +25,6 @@ class ArchiveExporterEmailError(Exception):
 
 
 class ArchiveExporter:
-
     """Exports a list of models to individual CSV files and
     adds each to a single zip archive OR emails each.
 

diff --git a/edc_export/model_mixins/export_tracking_fields_model_mixin.py b/edc_export/model_mixins/export_tracking_fields_model_mixin.py
@@ -7,7 +7,6 @@
 
 
 class ExportTrackingFieldsModelMixin(models.Model):
-
     """Adds these fields to the Concrete model."""
 
     exported = models.BooleanField(

diff --git a/edc_export/model_options.py b/edc_export/model_options.py
@@ -3,7 +3,6 @@
 
 
 class ModelOptions(dict):
-
     """A serializable object of a selection of model attrs."""
 
     def __init__(self, model: str = None):

diff --git a/edc_export/system_checks.py b/edc_export/system_checks.py
@@ -5,21 +5,27 @@
 from edc_export.utils import get_export_folder, get_upload_folder
 
 
-def export_dir_checks(app_configs, **kwargs) -> list[CheckMessage]:
+def edc_export_checks(app_configs, **kwargs) -> list[CheckMessage]:
     errors = []
     if not os.path.exists(get_export_folder()):
         errors.append(
             Warning(
-                f"Folder does not exist. Tried {get_export_folder()}. See edc_export.",
-                id="settings.EDC_EXPORT_EXPORT_FOLDER",
+                (
+                    f"Folder does not exist. Tried {get_export_folder()}. "
+                    "See settings.EDC_EXPORT_EXPORT_FOLDER."
+                ),
+                id="edc_export.W001",
             )
         )
 
     if not os.path.exists(get_upload_folder()):
         errors.append(
             Warning(
-                f"Folder does not exist. Tried {get_upload_folder()}. See edc_export.",
-                id="settings.EDC_EXPORT_UPLOAD_FOLDER",
+                (
+                    f"Folder does not exist. Tried {get_upload_folder()}. "
+                    "See settings.EDC_EXPORT_UPLOAD_FOLDER."
+                ),
+                id="edc_export.W002",
             )
         )