0.7.1 - More theme color dev

.github/workflows/python-package.yml

@@ -77,7 +77,7 @@ jobs:
 
       - run: |
           mk python-release owner=vkottler \
-                            repo=svgen version=0.7.0
+                            repo=svgen version=0.7.1
         if: |
           matrix.python-version == '3.12'
           && matrix.system == 'ubuntu-latest'

.pylintrc

@@ -6,3 +6,4 @@ disable=too-few-public-methods
 
 [DESIGN]
 max-args=7
+max-positional-arguments=7

README.md

@@ -2,11 +2,11 @@
     =====================================
     generator=datazen
     version=3.1.4
-    hash=9520e8fc36ee88b167c27f532fc3c1e4
+    hash=e3a74ecb605bcef75afc16acb2c5ee83
     =====================================
 -->
 
-# svgen ([0.7.0](https://pypi.org/project/svgen/))
+# svgen ([0.7.1](https://pypi.org/project/svgen/))
 
 [![python](https://img.shields.io/pypi/pyversions/svgen.svg)](https://pypi.org/project/svgen/)
 ![Build Status](https://github.com/vkottler/svgen/workflows/Python%20Package/badge.svg)

local/variables/package.yaml

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

pyproject.toml

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

svgen/__init__.py

@@ -1,7 +1,7 @@
 # =====================================
 # generator=datazen
 # version=3.1.4
-# hash=9e67da4714539646e56663e5f514af0d
+# hash=629149aa3a06240af098abf13f051e1b
 # =====================================
 
 """
@@ -10,4 +10,4 @@
 
 DESCRIPTION = "A tool for working with scalable vector graphics."
 PKG_NAME = "svgen"
-VERSION = "0.7.0"
+VERSION = "0.7.1"

svgen/color/theme/__init__.py

@@ -9,7 +9,7 @@
 
 # third-party
 from vcorelib.dict import GenericStrDict
-from vcorelib.io import ARBITER
+from vcorelib.io import ARBITER, DEFAULT_INCLUDES_KEY
 from vcorelib.namespace import Namespace, NamespaceMixin
 from vcorelib.paths import Pathlike, normalize
 
@@ -156,7 +156,11 @@ def from_path(path: Pathlike) -> "ColorTheme":
         assert path.is_file(), f"No file '{path}'!"
 
         theme = ColorTheme(path.with_suffix("").name)
-        theme.add_mapping(ARBITER.decode(path, require_success=True).data)
+        theme.add_mapping(
+            ARBITER.decode(
+                path, includes_key=DEFAULT_INCLUDES_KEY, require_success=True
+            ).data
+        )
         return theme
 
     @property

svgen/data/themes/blue_gray.yaml

@@ -1,15 +1,14 @@
 ---
-primary:
-  50: "#eceff1"
-  100: "#cfd8dc"
-  200: "#b0bec5"
-  300: "#90a4ae"
-  400: "#78909c"
-  500: "#607d8b"
-  600: "#546e7a"
-  700: "#455a64"
-  800: "#37474f"
-  900: "#263238"
+
+# https://m2.material.io/design/color/the-color-system.html#tools-for-picking-colors
+
+includes_left:
+  - blue_gray_triadic2.yaml
+  - blue_gray_triadic1.yaml
+  - blue_gray_analogous2.yaml
+  - blue_gray_analogous1.yaml
+  - blue_gray_complementary.yaml
+  - blue_gray_primary.yaml
 
 # https://color.adobe.com/Winkni%20-%205%20Shades%20of%20Blue%20Grey-color-theme-8915268
 adobe:

svgen/data/themes/blue_gray_analogous1.yaml

@@ -0,0 +1,12 @@
+---
+analogous1:
+  50: "#e6f2f2"
+  100: "#c1e0dd"
+  200: "#9ccdc8"
+  300: "#7eb8b2"
+  400: "#6ea8a1"
+  500: "#679891"
+  600: "#608b84"  # main color?
+  700: "#597b74"
+  800: "#536a65"
+  900: "#484d4b"

svgen/data/themes/blue_gray_analogous2.yaml

@@ -0,0 +1,12 @@
+---
+analogous2:
+  50: "#e8e9ee"
+  100: "#c4c8d6"
+  200: "#9ea4ba"
+  300: "#7a819e"
+  400: "#60678b"  # main color?
+  500: "#474e7a"
+  600: "#414772"
+  700: "#383e66"
+  800: "#31355a"
+  900: "#232448"

svgen/data/themes/blue_gray_complementary.yaml

@@ -0,0 +1,12 @@
+---
+complementary:
+  50: "#efebe8"
+  100: "#d6ccc7"
+  200: "#bbaaa2"
+  300: "#9f887c"
+  400: "#8b6e60"  # main color?
+  500: "#775544"
+  600: "#6b4c3e"
+  700: "#5b4034"
+  800: "#4d342b"
+  900: "#3d2720"

svgen/data/themes/blue_gray_primary.yaml

@@ -0,0 +1,12 @@
+---
+primary:
+  50: "#eceff1"
+  100: "#cfd8dc"
+  200: "#b0bec5"
+  300: "#90a4ae"
+  400: "#78909c"
+  500: "#607d8b"  # main color?
+  600: "#546e7a"
+  700: "#455a64"
+  800: "#37474f"
+  900: "#263238"

svgen/data/themes/blue_gray_triadic1.yaml

@@ -0,0 +1,12 @@
+---
+triadic1:
+  50: "#eae8ee"
+  100: "#cac5d6"
+  200: "#a8a0ba"
+  300: "#867b9f"
+  400: "#6e608b"  # main color?
+  500: "#584879"
+  600: "#524273"
+  700: "#483a6a"
+  800: "#40355f"
+  900: "#322952"

svgen/data/themes/blue_gray_triadic2.yaml

@@ -0,0 +1,12 @@
+---
+triadic2:
+  50: "#eee7eb"
+  100: "#d6c2d0"
+  200: "#bc9bb1"
+  300: "#a07792"
+  400: "#8b607d"  # main color?
+  500: "#774e69"
+  600: "#6d4863"
+  700: "#604059"
+  800: "#513a4e"
+  900: "#3e2d3e"

tasks/svgen/default.yaml

@@ -1,5 +1,13 @@
 ---
 theme: null
 variants:
+  - {name: blue_gray_primary, data: {theme: blue_gray_primary}}
+  - {name: blue_gray_complementary, data: {theme: blue_gray_complementary}}
+  - {name: blue_gray_analogous1, data: {theme: blue_gray_analogous1}}
+  - {name: blue_gray_analogous2, data: {theme: blue_gray_analogous2}}
+  - {name: blue_gray_triadic1, data: {theme: blue_gray_triadic1}}
+  - {name: blue_gray_triadic2, data: {theme: blue_gray_triadic2}}
+
   - {name: blue_gray, data: {theme: blue_gray}}
+
   - {name: gray, data: {theme: gray}}