proj-flow 0.20.2__py3-none-any.whl → 0.20.3__py3-none-any.whl

proj_flow/__init__.py

@@ -6,4 +6,4 @@ The **proj_flow** contains only ``__version__`` to be updated, nothing more.
 This is in an attempt to make this module easy to load initially.
 """
 
-__version__ = "0.20.2"
+__version__ = "0.20.3"

proj_flow/api/env.py

@@ -253,6 +253,10 @@ class FlowConfig:
     def postproc_exclude(self) -> List[dict]:
         return self.postproc.get("exclude", [])
 
+    @property
+    def postproc_include(self) -> List[dict]:
+        return self.postproc.get("include", [])
+
     @property
     def shortcuts(self) -> Dict[str, dict]:
         return self._cfg.get("shortcuts", {})

proj_flow/base/matrix.py

@@ -86,6 +86,29 @@ def matches(tested: dict, test: dict) -> bool:
     return True
 
 
+def partially_matches(tested: dict, test: dict) -> bool:
+    """
+    Checks, if the tested dictionary contains some of the values from test
+    dictionary, with non-zero intersection between both dictionaries.
+
+    :param tested: Dictionary to check
+    :param test: Dictionary to check against
+
+    :returns: `True`, if all keys from `test` are in `tested` and have the same
+        values, `False` otherwise.
+    """
+
+    intersection_size = 0
+    for key, value in test.items():
+        if key not in tested:
+            continue
+        val = tested.get(key)
+        if val != value:
+            return False
+        intersection_size += 1
+    return intersection_size > 0
+
+
 def matches_any(tested: dict, tests: List[dict]):
     """
     Checks, if the tested dictionary contains all the values from at least one

proj_flow/ext/github/cli.py

@@ -32,6 +32,9 @@ def github():
 
 @arg.command("github", "matrix")
 def matrix(
+    pretty: typing.Annotated[
+        bool, arg.FlagArgument(help="Indent JSON document")
+    ],
     official: typing.Annotated[
         bool, arg.FlagArgument(help="Cut matrix to release builds only")
     ],
@@ -60,6 +63,8 @@ def matrix(
                 print(f"matrix={var}", file=github_output)
         else:
             print(f"matrix={var}")
+    elif pretty:
+        json.dump(usable, sys.stdout, indent=2)
     else:
         json.dump(usable, sys.stdout)
 

proj_flow/flow/configs.py

@@ -9,6 +9,7 @@ using ``-D`` switches.
 
 
 import argparse
+import copy
 import datetime
 import os
 import sys
@@ -152,6 +153,19 @@ def _load_flow_data(rt: env.Runtime):
     return configs, keys
 
 
+def _apply_postproc_includes(config: dict, postproc_include: List[dict]):
+    clone = copy.deepcopy(config)
+    for ext in postproc_include:
+        if not matrix.partially_matches(config, ext):
+            continue
+
+        for key, value in ext.items():
+            if key in config:
+                continue
+            clone[key] = value
+    return clone
+
+
 class Configs:
     usable: List[env.Config] = []
 
@@ -186,8 +200,9 @@ class Configs:
         )
 
         postproc_exclude = rt.postproc_exclude
+        postproc_include = rt.postproc_include
         usable = [
-            config
+            _apply_postproc_includes(config, postproc_include)
             for config in turned
             if len(postproc_exclude) == 0
             or not matrix.matches_any(config, postproc_exclude)

{proj_flow-0.20.2.dist-info → proj_flow-0.20.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proj-flow
-Version: 0.20.2
+Version: 0.20.3
 Summary: C++ project maintenance, automated
 Project-URL: Changelog, https://github.com/mzdun/proj-flow/blob/main/CHANGELOG.rst
 Project-URL: Documentation, https://proj-flow.readthedocs.io/en/latest/

{proj_flow-0.20.2.dist-info → proj_flow-0.20.3.dist-info}/RECORD

@@ -1,11 +1,11 @@
-proj_flow/__init__.py,sha256=PkM-YJk5w2cnqbyXWisD3JS7cOhRZPxAmQnEVbPSL4Q,277
+proj_flow/__init__.py,sha256=ngosVXJXC6NPzy7Jrvy_GEmyLLNcMeHljXRL0gpxsKc,277
 proj_flow/__main__.py,sha256=HUar_qQ9Ndmchmryegtzu__5wukwCLrFN_SGRl5Ol_M,233
 proj_flow/dependency.py,sha256=CpcnR6El8AO9hlLc9lQtYQADYlkx3GMHlkLYbEAtdMI,4639
 proj_flow/api/__init__.py,sha256=gV2f6kll_5JXtvkGASvnx7CbOWr34PHOdck-4ce-qEk,378
 proj_flow/api/arg.py,sha256=3XqPAucon0k3yyYsqzSp7X9HGMZ_sNJNo8Z4hf-0erY,5275
 proj_flow/api/completers.py,sha256=NapNVu6QAQ_iF6dqcAzOV5kDHKD9MAMVX209Bklq-Mw,2464
 proj_flow/api/ctx.py,sha256=IJu0q0Chivo6b2M4MKkAlV09oi7Cn9VxtDFeAeL_tnc,6646
-proj_flow/api/env.py,sha256=rbNtMB6bBRhUb6bolNduWVWZ7a5CIsnv8EEZsamT9Ek,12678
+proj_flow/api/env.py,sha256=Ns0XBklOOEmMfo6Bt45XpfG3kqxA1W0rF28-Qu8SADE,12787
 proj_flow/api/init.py,sha256=p4ZDGfq6fw4bXbJu2iq0vEmVxbS7nALIhZfe-XnEs44,565
 proj_flow/api/makefile.py,sha256=q0fBSsWTWfR5YwunwiRjWJKtiLeHdSKUgUTEgo5I7dE,3863
 proj_flow/api/release.py,sha256=IM4axJ6dfyilCmpwL_Z8q43XGKsfHaPoMAdqSziwT7s,2810
@@ -14,7 +14,7 @@ proj_flow/base/__cmake_version__.py,sha256=imja0GnhpBvS8Crz-64eOUKhc4i6FeRrjBGRB
 proj_flow/base/__init__.py,sha256=V6IFRRtwxzvHuvtog6LIG9_6oivNpdcR5UmGobypvTo,930
 proj_flow/base/cmd.py,sha256=XJk_r4Nlq_2XGgD_w92Us4WKwItmQAB8QWdT1pKxUFA,1746
 proj_flow/base/inspect.py,sha256=lt5P19rvSZ-wMCTrCYAaQFCt2S9fUjEQXlrKK-Tmvwc,2786
-proj_flow/base/matrix.py,sha256=8XBFGYOwW6Myt_4h3WNk36V2bJ5xeqUv6DvzF4B3q_g,7767
+proj_flow/base/matrix.py,sha256=kH2BB6JRrLYdR71VJiJp58zfQSazwEOeiRXOPrayAcI,8446
 proj_flow/base/name_list.py,sha256=KiHSnbDgYplJc25O3EehYhFAhD7Z3mHVAK6UYOdg5PQ,416
 proj_flow/base/plugins.py,sha256=evn2Dym_NeoBaIZAu2YUtRd--15PCFpHD0h5zSsWkQE,978
 proj_flow/base/registry.py,sha256=zbkB9KNfHnyPtzOurdvjwt714jrFpGHyOqeZL5sMvzI,3745
@@ -35,7 +35,7 @@ proj_flow/ext/cplusplus/cmake/steps.py,sha256=MnxPTR9tD2O8_DaRSe-fkvkpoM-DZc2zqt
 proj_flow/ext/cplusplus/conan/__init__.py,sha256=Fv839SWsKPWMZs9ox9T-bofZ4xDJXOI5UfWKQkm0Vtg,1924
 proj_flow/ext/cplusplus/conan/_conan.py,sha256=9xnji-f8uN7huXLqavVBUDC33CgnjBIyZX6wVcGm2RA,3352
 proj_flow/ext/github/__init__.py,sha256=Mgx19YS6SYBXYB66_pOgIgwuB2WKRxqp5UGutq0B9Xk,282
-proj_flow/ext/github/cli.py,sha256=F7kkrngeTp76_FCfGA7olVzf38I6aj8S8-fXpiYYp04,6293
+proj_flow/ext/github/cli.py,sha256=zUkRb38_hHj165oxkFdxOX-NJfhg1UN_GFPQPo_lmWc,6455
 proj_flow/ext/github/hosting.py,sha256=3iW8QjeJk7MyqKNbv92nB-5a_Yn_B5_eEIlw_cdgUT0,519
 proj_flow/ext/github/publishing.py,sha256=5dUNFq47X_g9vo25R3lQRkSjV2IiAm2zkIhNe8gLDKs,1921
 proj_flow/ext/github/switches.py,sha256=Y3pqJdiHYLoveCQtqZqELR84Phb2YF4u5y78TU7n2CQ,752
@@ -73,7 +73,7 @@ proj_flow/ext/webidl/model/__init__.py,sha256=VJs_ODnF7-8DE0MbYKX-Bs-JDNqHgGdMkk
 proj_flow/ext/webidl/model/ast.py,sha256=_CzJPAarYruonVbK6mxfUc7MgFoxFDpXWjX4OEkOp3M,19238
 proj_flow/ext/webidl/model/builders.py,sha256=Ukjyhn4yJrSlU01P8VkLf0TE0kLqKlYw2KlyATceOpo,7665
 proj_flow/flow/__init__.py,sha256=5Zo97zJsR7HMbl64jeMB9PbUuxCxpOlNuLmo3apWSVU,277
-proj_flow/flow/configs.py,sha256=PQZ5pLPmWwHJtSWmuy04bsnO-VvfWcJyP_UyKjiaG1g,6535
+proj_flow/flow/configs.py,sha256=zg32AXal2qbVOG6ToTfD05CTwRwt5rwF8yd-9UuB1nc,6999
 proj_flow/flow/layer.py,sha256=IUANtCSOvlfzNSnq0VDdGdaXfB70Yr-rDGFxPDQTmpg,6187
 proj_flow/flow/steps.py,sha256=PN_C_B6vNvqOsjpDpa5ESvH30Sc6RM1fSSqWqXgqg-4,2804
 proj_flow/log/__init__.py,sha256=02EIgasE-K7mmbbNiIdX0IebWQMp2Co_D6H4ZBhJgcs,365
@@ -160,8 +160,8 @@ proj_flow/template/licenses/MIT.mustache,sha256=NncPoQaNsuy-WmRmboik3fyhJJ8m5pc2
 proj_flow/template/licenses/Unlicense.mustache,sha256=awOCsWJ58m_2kBQwBUGWejVqZm6wuRtCL2hi9rfa0X4,1211
 proj_flow/template/licenses/WTFPL.mustache,sha256=lvF4V_PrKKfZPa2TC8CZo8tlqaKvs3Bpv9G6XsWWQ4k,483
 proj_flow/template/licenses/Zlib.mustache,sha256=uIj-mhSjes2HJ3rRapyy2ALflKRz4xQgS4mVM9827C0,868
-proj_flow-0.20.2.dist-info/METADATA,sha256=n_KqwMfHH1mhITMqq81WLyb3emTL2UDsD_2u3Qv1plM,3035
-proj_flow-0.20.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-proj_flow-0.20.2.dist-info/entry_points.txt,sha256=d_OmGKZzpY7FCWz0sZ4wnBAPZC75oMEzTgJZWtpDELo,49
-proj_flow-0.20.2.dist-info/licenses/LICENSE,sha256=vpOQJ5QlrTedF3coEWvA4wJzVJH304f66ZitR7Od4iU,1068
-proj_flow-0.20.2.dist-info/RECORD,,
+proj_flow-0.20.3.dist-info/METADATA,sha256=j0vuyq16Bh2qoW4ECd-sPR3xQbrIK6aBZM9UHBHw3io,3035
+proj_flow-0.20.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+proj_flow-0.20.3.dist-info/entry_points.txt,sha256=d_OmGKZzpY7FCWz0sZ4wnBAPZC75oMEzTgJZWtpDELo,49
+proj_flow-0.20.3.dist-info/licenses/LICENSE,sha256=vpOQJ5QlrTedF3coEWvA4wJzVJH304f66ZitR7Od4iU,1068
+proj_flow-0.20.3.dist-info/RECORD,,