0.8.8 - merge variant data

Author: vkottler

.github/workflows/python-package.yml

@@ -78,7 +78,7 @@ jobs:
 
       - run: |
           mk python-release owner=libre-embedded \
-                            repo=svgen version=0.8.7
+                            repo=svgen version=0.8.8
         if: |
           matrix.python-version == '3.12'
           && matrix.system == 'ubuntu-latest'

README.md

@@ -2,11 +2,11 @@
     =====================================
     generator=datazen
     version=3.2.3
-    hash=f935f51e4d5399e713a10807671e4810
+    hash=4e19b7fd794cee4f663c3486ed81a7ae
     =====================================
 -->
 
-# svgen ([0.8.7](https://pypi.org/project/svgen/))
+# svgen ([0.8.8](https://pypi.org/project/svgen/))
 
 [![python](https://img.shields.io/pypi/pyversions/svgen.svg)](https://pypi.org/project/svgen/)
 ![Build Status](https://github.com/libre-embedded/svgen/workflows/Python%20Package/badge.svg)

local/configs/package.yaml

@@ -7,7 +7,7 @@ entry: {{entry}}
 time_command: true
 
 requirements:
-  - vcorelib
+  - vcorelib>=3.6.7
 
 dev_requirements:
   - setuptools-wrapper

local/variables/package.yaml

@@ -1,5 +1,5 @@
 ---
 major: 0
 minor: 8
-patch: 7
+patch: 8
 entry: svgen

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta:__legacy__"
 
 [project]
 name = "svgen"
-version = "0.8.7"
+version = "0.8.8"
 description = "A tool for working with scalable vector graphics."
 readme = "README.md"
 requires-python = ">=3.12"

svgen/__init__.py

@@ -1,7 +1,7 @@
 # =====================================
 # generator=datazen
 # version=3.2.3
-# hash=6dbd96511bfd47795bc38e1d4b666c69
+# hash=d7ef29596b2bc69d2f78eb6f58e41e51
 # =====================================
 
 """
@@ -10,4 +10,4 @@
 
 DESCRIPTION = "A tool for working with scalable vector graphics."
 PKG_NAME = "svgen"
-VERSION = "0.8.7"
+VERSION = "0.8.8"

svgen/app.py

@@ -4,12 +4,14 @@
 
 # built-in
 import argparse
+from copy import deepcopy
+from logging import getLogger
 from pathlib import Path
 from sys import path
 from typing import Iterable, cast
 
 # third-party
-from vcorelib.dict import GenericStrDict
+from vcorelib.dict import GenericStrDict, merge_dicts
 from vcorelib.dict.config import Config
 from vcorelib.io import DEFAULT_INCLUDES_KEY
 
@@ -20,6 +22,8 @@
 from svgen.generation.images import generate_images
 from svgen.script import invoke_script
 
+LOG = getLogger(__name__)
+
 
 def generate(
     config: Config,
@@ -48,8 +52,7 @@ def generate(
     # Write the composed document to the output file.
     with output.open("w", encoding="utf-8") as output_fd:
         doc.encode(output_fd)
-
-    print(f"Generated '{output}'.")
+    LOG.info("Wrote '%s'.", output)
 
     # Generate image outputs.
     if images:
@@ -82,7 +85,7 @@ def entry(args: argparse.Namespace) -> int:
     initialize_config(config, args.height, args.width)
 
     # Save the initial configuration data.
-    original = config.data.copy()
+    original = deepcopy(config.data)
 
     scripts = set(x.resolve() for x in args.scripts)
 
@@ -92,8 +95,12 @@ def entry(args: argparse.Namespace) -> int:
     # Generate any document variants.
     for idx, variant in enumerate(config.get("variants", [])):
         # Load the variant's data.
-        config = Config(original.copy())
-        config.update(variant.get("data", {}))
+        config = Config(
+            merge_dicts(
+                [deepcopy(original), variant.get("data", {})],
+                expect_overwrite=True,
+            )
+        )
         initialize_config(config, args.height, args.width)
 
         # Set the output name for this variant.

svgen/requirements.txt

@@ -1 +1 @@
-vcorelib
+vcorelib>=3.6.7