Merge pull request #747

v4.1.12

.github/workflows/get_changelog.py

@@ -5,15 +5,15 @@ def main(file: str, tag: str) -> str:
     header: str = f"## v{tag.lstrip('v')}"
     body: list[str] = []
     is_body: bool = False
-    with open(file, "r", encoding="utf-8") as f:
+    with open(file, encoding="utf-8") as f:
         while line := f.readline():
             line = line.rstrip()
             if is_body and line.startswith("## "):
                 break
-            elif line == header or line.startswith(f"{header} "):
+            if line == header or line.startswith(f"{header} "):
                 is_body = True
                 continue
-            elif is_body and line.startswith("#"):
+            if is_body and line.startswith("#"):
                 body.append(line[1:])
             elif is_body:
                 body.append(line)

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v4.1.12
+
+### Changes
+
+* Use acacore 3.3.3
+
 ## v4.1.11
 
 ### Changes

digiarch/__version__.py

@@ -1 +1 @@
-__version__ = "4.1.11"
+__version__ = "4.1.12"

digiarch/commands/identify.py

@@ -291,6 +291,8 @@ def command_identify(
     db_path.parent.mkdir(parents=True, exist_ok=True)
 
     with FileDB(db_path) as database:
+        if not database.is_initialised():
+            database.init()
         log_file, log_stdout, _ = start_program(ctx, database, __version__, None, True, True, False)
         database.init()
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "digiarch"
-version = "4.1.11"
+version = "4.1.12"
 description = "Tools for the Digital Archive Project at Aarhus Stadsarkiv"
 authors = ["Aarhus Stadsarkiv <[email protected]>"]
 license = "GPL-3.0"
@@ -12,7 +12,7 @@ include = ["pyproject.toml"]
 
 [tool.poetry.dependencies]
 python = "^3.11"
-acacore = {git = "https://github.com/aarhusstadsarkiv/acacore.git", tag = "v3.3.2"}
+acacore = {git = "https://github.com/aarhusstadsarkiv/acacore.git", tag = "v3.3.3"}
 patool = "^3.0.3"
 tnefparse = "^1.4.0"
 extract-msg = "^0.52.0"

tests/test_cli.py

@@ -361,7 +361,7 @@ def test_edit_action(tests_folder: Path, files_folder: Path, files_folder_copy:
             assert file2.action_data.model_dump().get(action) == action_data.model_dump()
 
             history: HistoryEntry = database.history.select(
-                where=f"UUID = ? and OPERATION = ?",
+                where="UUID = ? and OPERATION = ?",
                 order_by=[("TIME", "desc")],
                 limit=1,
                 parameters=[str(file.uuid), f"{app.name}.{group_edit.name}.{group_action.name}.{action}:edit"],