Make CairoSVG a required dependency

This way pdfbaker works out-of-the-box.
Update README accordingly.

Author: dannyadair

.pylintrc

@@ -1,7 +1,7 @@
 [MASTER]
 score=n
 generated-members=PyPDF2.*
-ignored-modules=jinja2,pypdf,yaml
+ignored-modules=cairosvg,jinja2,pypdf,yaml
 
 [REPORTS]
 msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg}

README.md

@@ -2,29 +2,6 @@
 
 Creates PDF documents from YAML-configured SVG templates.
 
-## Requirements
-
-For the conversion from SVG to PDF you need to install either
-
-- [CairoSVG](https://cairosvg.org/)<br>
-  ```
-  sudo apt install python3-cairosvg
-  ```
-
-or
-
-- [Inkscape](https://inkscape.org/)<br>
-  ```
-  sudo apt install inkscape
-  ```
-
-If you want to compress your PDFs, you will also need to install
-
-- [Ghostscript](https://www.ghostscript.com/)
-  ```
-  sudo apt install ghostscript
-  ```
-
 ## Installation
 
 pdfbaker is on [PyPI](https://pypi.org/project/pdfbaker/) and we reommend installing it
@@ -35,13 +12,29 @@ pipx install pdfbaker
 ```
 
 If you don't yet have pipx,
-[install it first](https://pipx.pypa.io/latest/installation/):
+[install pipx first](https://pipx.pypa.io/latest/installation/):
 
 ```
 sudo apt install pipx
 pipx ensurepath
 ```
 
+## Optional Dependencies
+
+- SVG to PDF conversion uses [CairoSVG](https://cairosvg.org/) by default. For documents
+  requiring [Inkscape](https://inkscape.org/) instead, install it first:
+
+  ```
+  sudo apt install inkscape
+  ```
+
+- If you want to compress your PDFs, you will need to install
+  [Ghostscript](https://www.ghostscript.com/):
+
+  ```
+  sudo apt install ghostscript
+  ```
+
 ## Usage
 
 Generate your documents with:

pyproject.toml

@@ -6,17 +6,14 @@ authors = [
     { name = "Danny W. Adair", email = "danny.adair@unfold.nz" }
 ]
 dependencies = [
-    "pyyaml",
+    "cairosvg",
     "jinja2",
     "pypdf",
+    "pyyaml",
 ]
 readme = "README.md"
 requires-python = ">= 3.11"
 
-[project.optional-dependencies]
-cairosvg = ["cairosvg"]
-all = ["cairosvg"]
-
 [project.scripts]
 pdfbaker = "pdfbaker.__main__:main"
 

src/pdfbaker/common.py

@@ -4,13 +4,7 @@
 
 import pypdf
 import yaml
-
-try:
-    from cairosvg import svg2pdf
-
-    CAIROSVG_AVAILABLE = True
-except ImportError:
-    CAIROSVG_AVAILABLE = False
+from cairosvg import svg2pdf
 
 
 def deep_merge(base, update):
@@ -100,38 +94,22 @@ def convert_svg_to_pdf(svg_path, pdf_path, backend="cairosvg"):
         Path to the generated PDF file
     """
     if backend == "inkscape":
-        return _convert_with_inkscape(svg_path, pdf_path)
-    return _convert_with_cairosvg(svg_path, pdf_path)
-
-
-def _convert_with_cairosvg(svg_path, pdf_path):
-    """Convert SVG to PDF using CairoSVG."""
-    if not CAIROSVG_AVAILABLE:
-        raise ImportError(
-            "CairoSVG is not installed. Please install it with 'pip install cairosvg' "
-            "or set svg2pdf_backend to 'inkscape' in your config."
-        )
-
-    with open(svg_path, "rb") as svg_file:
-        svg2pdf(file_obj=svg_file, write_to=pdf_path)
+        try:
+            subprocess.run(
+                [
+                    "inkscape",
+                    f"--export-filename={pdf_path}",
+                    svg_path,
+                ],
+                check=True,
+            )
+        except (subprocess.SubprocessError, FileNotFoundError) as exc:
+            raise RuntimeError(
+                "Inkscape command failed. Please ensure Inkscape is installed "
+                'and in your PATH or set svg2pdf_backend to "cairosvg" in your config.'
+            ) from exc
+    else:
+        with open(svg_path, "rb") as svg_file:
+            svg2pdf(file_obj=svg_file, write_to=pdf_path)
 
     return pdf_path
-
-
-def _convert_with_inkscape(svg_path, pdf_path):
-    """Convert SVG to PDF using Inkscape."""
-    try:
-        subprocess.run(
-            [
-                "inkscape",
-                f"--export-filename={pdf_path}",
-                svg_path,
-            ],
-            check=True,
-        )
-        return pdf_path
-    except (subprocess.SubprocessError, FileNotFoundError) as exc:
-        raise RuntimeError(
-            "Inkscape command failed. Please ensure Inkscape is installed "
-            "and in your PATH or set svg2pdf_backend to 'cairosvg' in your config."
-        ) from exc