Fix merge conflicts

Author: waketzheng

.github/workflows/codestyle.yml

@@ -9,32 +9,20 @@ jobs:
       matrix:
         python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
     steps:
-<<<<<<< HEAD
-    - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
-        allow-prereleases: true
-    - uses: astral-sh/setup-uv@v6
-=======
     - uses: actions/checkout@v5
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
         allow-prereleases: true
->>>>>>> type-hints
     - name: Install dependencies
-      run: uv sync --all-extras --all-groups
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
     - name: Lint with flake8
       run: |
+        pip install flake8
         # stop the build if there are code styling problems. The GitHub editor is 127 chars wide.
-<<<<<<< HEAD
-        uv run flake8 . --count --max-line-length=127 --show-source --statistics --exclude .venv,__pycache__
-    - name: Check type hints
-      run: uv run mypy .
-=======
         flake8 . --count --max-line-length=127 --show-source --statistics
     - name: Check type hints
       run: |
@@ -44,4 +32,3 @@ jobs:
       run: |
         pip uninstall -y docxcompose
         python -c "from docxtpl import *"
->>>>>>> type-hints

.github/workflows/test.yml

@@ -19,15 +19,15 @@ jobs:
         env:
           GITHUB_CONTEXT: ${{ toJson(github) }}
         run: echo "$GITHUB_CONTEXT"
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
       - uses: astral-sh/setup-uv@v6
       - name: Install dependencies
-        run: uv sync --all-extras
+        run: uv sync --all-extras --all-groups
       - name: Test
         run: uv run python tests/runtests.py
       - name: Build
@@ -37,11 +37,11 @@ jobs:
     runs-on: ubuntu-latest
     container: python:3.7-slim
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
       - uses: astral-sh/setup-uv@v6
       - name: Install dependencies
-        run: uv sync --all-extras --python=python3.7
+        run: uv sync --all-extras --all-groups --python=python3.7
       - name: Test
         run: |
           uv run python tests/runtests.py

docxtpl/inline_image.py

@@ -7,17 +7,10 @@
 
 from __future__ import annotations
 
-<<<<<<< HEAD
-from typing import IO
-=======
 from typing import IO, TYPE_CHECKING
->>>>>>> type-hints
 
 from docx.oxml import OxmlElement, parse_xml
 from docx.oxml.ns import qn
-from docx.shared import Length
-
-from .template import DocxTemplate
 
 if TYPE_CHECKING:
     from docx.shared import Length

docxtpl/listing.py

@@ -5,15 +5,7 @@
 @author: Eric Lapouyade
 """
 
-<<<<<<< HEAD
-try:
-    from html import escape
-except ImportError:
-    # cgi.escape is deprecated in python 3.7
-    from cgi import escape  # type:ignore[attr-defined,no-redef]
-=======
 from ._compat import escape
->>>>>>> type-hints
 
 
 class Listing(object):

docxtpl/richtext.py

@@ -5,15 +5,7 @@
 @author: Eric Lapouyade
 """
 
-<<<<<<< HEAD
-try:
-    from html import escape
-except ImportError:
-    # cgi.escape is deprecated in python 3.7
-    from cgi import escape  # type:ignore[attr-defined,no-redef]
-=======
 from ._compat import escape
->>>>>>> type-hints
 
 
 class RichText(object):
@@ -46,6 +38,7 @@ def add(
         rtl=False,
         lang=None,
     ):
+
         # If a RichText is added
         if isinstance(text, RichText):
             self.xml += text.xml
@@ -154,6 +147,7 @@ def add(
         text,
         parastyle=None,
     ):
+
         # If a RichText is added
         if not isinstance(text, RichText):
             text = RichText(text)

docxtpl/subdoc.py

@@ -5,15 +5,15 @@
 @author: Eric Lapouyade
 """
 
-import re
-
 from docx import Document
-from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.oxml import CT_SectPr
-from docxcompose.composer import Composer
+from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docxcompose.properties import CustomProperties
-from docxcompose.utils import NS, xpath
+from docxcompose.utils import xpath
+from docxcompose.composer import Composer
+from docxcompose.utils import NS
 from lxml import etree
+import re
 
 
 class SubdocComposer(Composer):