chore: replace unmaintained docx-mailmerge with docx-mailmerge2

Relates to #570
adfinis · Jul 1, 2024 · 57fcd23 · 57fcd23
1 parent 21e7145
commit 57fcd23
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/document_merge_service/api/engines.py b/document_merge_service/api/engines.py
@@ -184,7 +184,7 @@ def _get_placeholders(self, document):
         return [
             field.attrib.get("name")
             for part in document.parts.values()
-            for field in part.findall("//MergeField")
+            for field in part["part"].findall(".//MergeField")
         ]
 
     def validate_template_syntax(self, available_placeholders=None, sample_data=None):

diff --git a/document_merge_service/api/tests/__snapshots__/test_template.ambr b/document_merge_service/api/tests/__snapshots__/test_template.ambr
@@ -166,7 +166,7 @@
         </w:rPr>
         <w:t xml:space="preserve">Test: </w:t>
       </w:r>
-      <w:r>
+      <w:r w:rsidR="00211734">
         <w:rPr>
           <w:lang w:val="en-US"/>
         </w:rPr>

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -36,7 +36,7 @@ django-filter = "^24.2"
 django-generic-api-permissions = "^0.4.6"
 django-storages = "^1.14.3"
 djangorestframework = "^3.15.1"
-docx-mailmerge = "^0.5.0"
+docx-mailmerge2 = "^0.8.0"
 docxtpl = "^0.17.0"
 Jinja2 = "^3.1.4"
 mysqlclient = { version = "^2.2.4", optional = true }