feat: bump version to 0.6.5, refine style handling in xlsxwriter engine and enhance template creation

Update the version to 0.6.5, improve style handling in the xlsxwriter engine by ensuring fill patterns are set for background colors. Enhance template creation in tests to include solid fill styles for better visual consistency. Adjust assertions in tests to verify style properties accurately.

Author: dakixr

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xpyxl"
-version = "0.6.4"
+version = "0.6.5"
 description = "Create styled excel reports with declarative python."
 readme = "README.md"
 authors = [{ name = "dakixr", email = "[email protected]" }]

src/xpyxl/engines/openpyxl_engine.py

@@ -358,10 +358,6 @@ def _clone_sheet_contents(self, source_ws: Worksheet, target_ws: Worksheet) -> N
                     target_cell.alignment = copy.copy(cell.alignment)  # pyright: ignore[reportAttributeAccessIssue]
                     target_cell.number_format = cell.number_format
                     target_cell.protection = copy.copy(cell.protection)  # pyright: ignore[reportAttributeAccessIssue]
-                    try:
-                        target_cell.style = cell.style
-                    except Exception:
-                        pass
                 if getattr(cell, "hyperlink", None):
                     target_cell._hyperlink = copy.copy(cell._hyperlink)  # type: ignore[attr-defined]
                 if cell.comment:

src/xpyxl/engines/xlsxwriter_engine.py

@@ -101,6 +101,10 @@ def _get_format(
         # Fill color
         if style.fill_color:
             fill_color = normalize_hex(style.fill_color)
+            # XlsxWriter requires a fill pattern for background colors to render.
+            # Use a solid pattern and set both foreground/background for compatibility.
+            fmt.set_pattern(1)
+            fmt.set_fg_color(fill_color)
             fmt.set_bg_color(fill_color)
 
         # Alignment

tests/import_sheet_demo.py

@@ -3,6 +3,7 @@
 from pathlib import Path
 
 import openpyxl
+from openpyxl.styles import PatternFill
 
 import xpyxl as x
 
@@ -19,8 +20,16 @@ def _build_template(path: Path) -> None:
 
     ws["A1"] = "Template Cover"
     ws["A1"].style = "Title"
+    ws["A1"].fill = PatternFill(
+        start_color="FFFFCC", end_color="FFFFCC", fill_type="solid"
+    )
     ws.merge_cells("A1:C1")
 
+    ws["F1"].fill = PatternFill(
+        start_color="FFFFCC", end_color="FFFFCC", fill_type="solid"
+    )
+    ws.merge_cells("F1:F12")
+
     ws["A3"] = "Notes"
     ws["A4"] = "Static content from Excel"
 

tests/test_xlsxwriter_import_sheet.py

@@ -35,7 +35,9 @@ def _create_template(path: Path) -> None:
     # Add content with a merge
     ws["A1"] = "Template Title"
     ws["A1"].font = Font(bold=True, color="FF123456")
-    ws["A1"].fill = PatternFill(fill_type="solid", start_color="FFFFE699", end_color="FFFFE699")
+    ws["A1"].fill = PatternFill(
+        fill_type="solid", start_color="FFFFE699", end_color="FFFFE699"
+    )
     ws["A1"].alignment = Alignment(horizontal="center", vertical="center")
     ws.merge_cells("A1:C1")
 
@@ -110,7 +112,7 @@ def test_xlsxwriter_with_import_sheet() -> None:
         # Build workbook with imported sheet + generated sheets
         workbook = x.workbook()[
             x.sheet("Before")[
-                x.row(style=[x.bold])["Generated Before"],
+                x.row(style=[x.bold, x.bg_warning, x.text_white])[None],
                 x.row()["A", 1],
             ],
             x.import_sheet(template_path, "Template", name="Imported"),
@@ -146,7 +148,11 @@ def test_xlsxwriter_with_import_sheet() -> None:
 
         # Check generated sheets have content
         before_ws = result_wb["Before"]
-        assert before_ws["A1"].value == "Generated Before"
+        assert before_ws["A1"].value is None
+        assert (
+            before_ws["A1"].fill is not None
+            and before_ws["A1"].fill.fgColor.rgb == "FFB45309"
+        )
         assert before_ws["A2"].value == "A"
         assert before_ws["B2"].value == 1
 
@@ -162,9 +168,18 @@ def test_xlsxwriter_with_import_sheet() -> None:
         assert imported_ws["A4"].value == "Static content from template"
         # Verify styles were preserved
         assert imported_ws["A1"].font.bold is True
-        assert imported_ws["A1"].font.color is not None and imported_ws["A1"].font.color.rgb == "FF123456"
-        assert imported_ws["A1"].fill is not None and imported_ws["A1"].fill.start_color.rgb == "FFFFE699"
-        assert imported_ws["A1"].alignment is not None and imported_ws["A1"].alignment.horizontal == "center"
+        assert (
+            imported_ws["A1"].font.color is not None
+            and imported_ws["A1"].font.color.rgb == "FF123456"
+        )
+        assert (
+            imported_ws["A1"].fill is not None
+            and imported_ws["A1"].fill.start_color.rgb == "FFFFE699"
+        )
+        assert (
+            imported_ws["A1"].alignment is not None
+            and imported_ws["A1"].alignment.horizontal == "center"
+        )
 
         # Check merge was preserved
         merged_ranges = list(imported_ws.merged_cells.ranges)