proj-flow 0.12.0__py3-none-any.whl → 0.13.1__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.12.0"
+__version__ = "0.13.1"

proj_flow/ext/github/cli.py

@@ -73,7 +73,7 @@ def release_cmd(
         typing.Optional[str],
         arg.Argument(
             help="Ignore the version change from changelog and instead use this value. "
-            f"Allowed values are: {name_list(FORCED_LEVEL_CHOICES)}",
+            f"Allowed values are: {name_list(FORCED_LEVEL_CHOICES)}.",
             meta="level",
             choices=FORCED_LEVEL_CHOICES,
         ),
@@ -142,8 +142,8 @@ def publish(
     upload: typing.Annotated[
         typing.Optional[str],
         arg.Argument(
-            help="If present, will upload files from the directory to "
-            "the referenced release before publishing.",
+            help="If present, upload files from the directory to the referenced "
+            "release before publishing.",
             meta="directory",
         ),
     ],

proj_flow/flow/configs.py

@@ -9,7 +9,9 @@ using ``-D`` switches.
 
 
 import argparse
+import datetime
 import os
+import sys
 from typing import Any, Callable, Dict, List
 
 from proj_flow.api import env
@@ -90,9 +92,43 @@ def _expand_one(config: dict, github_os: str, os_in_name: str):
     return config
 
 
+__printed_lts_ubuntu_warning = False
+
+
+def _ubuntu_lts(today=datetime.date.today(), lts_years=5):
+    year = today.year
+    for y in range(year - lts_years, year + 1):
+        if y % 2 != 0:
+            continue
+        release = datetime.date(y, 4, 1)
+        end_of_life = datetime.date(y + lts_years, 1, 31)
+        if release > today or end_of_life < today:
+            continue
+        yield f"ubuntu-{y % 100}.04"
+
+
+def _lts_list(config: dict, lts_list: Dict[str, List[str]]):
+    os = config["os"]
+    raw = lts_list.get(os)
+    if os == "ubuntu":
+        if raw is not None:
+            global __printed_lts_ubuntu_warning
+            if not __printed_lts_ubuntu_warning:
+                __printed_lts_ubuntu_warning = True
+                print(
+                    "\033[1;33m-- lts.ubuntu in config.yaml is deprecated; "
+                    "please remove it, so it can be calculated base on "
+                    "current date\033[m",
+                    file=sys.stderr,
+                )
+        else:
+            raw = list(_ubuntu_lts())
+    return raw or []
+
+
 def _expand_config(config: dict, spread_lts: bool, lts_list: Dict[str, List[str]]):
     if spread_lts:
-        spread = lts_list.get(config["os"], [])
+        spread = _lts_list(config, lts_list)
         if len(spread):
             return [
                 _expand_one({key: config[key] for key in config}, lts, lts)
@@ -136,6 +172,11 @@ class Configs:
         # from commands/github
         spread_lts = hasattr(args, "matrix") and not not args.matrix
 
+        if not spread_lts:
+            # allow "run" to see the warning about "lts.ubuntu"
+            for config in configs:
+                _lts_list(config, rt.lts_list)
+
         turned = matrix.flatten(
             [
                 _expand_config(config, spread_lts, rt.lts_list)

proj_flow/template/layers/base/.flow/config.yml

@@ -18,17 +18,9 @@ compiler:
     gcc: [ gcc, g++ ]
   os-default: { ubuntu: gcc, windows: msvc }
 
-lts:
-  ubuntu:
-    - ubuntu-20.04
-    - ubuntu-22.04
-    - ubuntu-24.04
-
 postproc:
   exclude:
-    - { github_os: ubuntu-20.04, sanitizer: true }
     - { github_os: ubuntu-24.04, sanitizer: true }
-    - { github_os: ubuntu-20.04, compiler: clang }
 
 
 shortcuts:

proj_flow/template/layers/cmake/src/main.cc.mustache

@@ -13,8 +13,7 @@ int main(int argc, char* argv[]) {
 	long counter{};
 
 	args::null_translator tr{};
-	args::parser parser{"{{PROJECT.DESCRIPTION}}",
-	                    args::from_main(argc, argv), &tr};
+	args::parser parser{"{{PROJECT.DESCRIPTION}}", args::from_main(argc, argv), &tr};
 
 	parser.arg(path, "path").meta("<file>").help("sets the path of foobar");
 	parser.set<std::true_type>(verbose, "v")

proj_flow/template/layers/cmake/tests/test.cc.mustache

@@ -9,9 +9,7 @@
 namespace {{NAMESPACE}}::testing {
 
 {{#with_conan}}
-	TEST({{NAMESPACE}}, test) {
-		ASSERT_EQ(1, 1);
-	}
+	TEST({{NAMESPACE}}, test) { ASSERT_EQ(1, 1); }
 {{/with_conan}}
 
 }  // namespace {{NAMESPACE}}::testing

proj_flow/template/layers/github_actions/.github/workflows/build.yml

@@ -221,9 +221,9 @@ jobs:
     if: ${{ fromJson(needs.merge.outputs.RELEASE) }}
     needs: merge
     runs-on: ubuntu-latest
-
-    env:
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    permissions:
+      contents: write
+      packages: write
 
     steps:
     - name: Checkout
@@ -237,3 +237,5 @@ jobs:
 
     - name: Publish the release
       run: python ./.flow/flow.py github publish --upload "${{github.workspace}}/build/download/packages"
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

{proj_flow-0.12.0.dist-info → proj_flow-0.13.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proj-flow
-Version: 0.12.0
+Version: 0.13.1
 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.12.0.dist-info → proj_flow-0.13.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-proj_flow/__init__.py,sha256=Mf9UJykcCb4X0VYyQaxJUTbXNQ01iQ-O5RWYPP6Xi-E,277
+proj_flow/__init__.py,sha256=wjuJFVjqZoovl8bpB3f15GhniAx4Z-59lj-Z9hP3cAE,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
@@ -34,7 +34,7 @@ proj_flow/ext/cplusplus/cmake/steps.py,sha256=IBxATzcJfDI5XibaKgXDnKDKPIaJM1fAJK
 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=hTJ9UhZx4oZS-OWhG716emJjZpLqRIovpmHp5CcM4MU,6011
+proj_flow/ext/github/cli.py,sha256=ZPLTPEjxQEWnxc5pZnb9Rj-P-PUH2kpkxIvC5c0f9zo,6007
 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=g7O2hvrg4mHm3WSHYsRBhEDU0bIkEJgp4Qclhqxk0uI,421
@@ -46,7 +46,7 @@ proj_flow/ext/sign/__init__.py,sha256=b9AN1_BalPtVy7YLBjvGhLamTujHEKcZP7npgDDDuS
 proj_flow/ext/sign/api.py,sha256=l5SO5RHiHTwxg0aexkGOfApRdojWDcIBY_cfbKSKsC0,2286
 proj_flow/ext/sign/win32.py,sha256=yMAmO-DdIWZdOi_NxycRym8XM9WIsrWKtFANdIwthJ4,4968
 proj_flow/flow/__init__.py,sha256=5Zo97zJsR7HMbl64jeMB9PbUuxCxpOlNuLmo3apWSVU,277
-proj_flow/flow/configs.py,sha256=l-pIotrXFm4oMqqpuvKP-RdtlTmDDnK_izhTJfsWbhk,5260
+proj_flow/flow/configs.py,sha256=PQZ5pLPmWwHJtSWmuy04bsnO-VvfWcJyP_UyKjiaG1g,6535
 proj_flow/flow/layer.py,sha256=6mvbhiOy9KcMP69Q9zew_7jGhf5Wqr7v-veS3YPGnmc,5720
 proj_flow/flow/steps.py,sha256=PN_C_B6vNvqOsjpDpa5ESvH30Sc6RM1fSSqWqXgqg-4,2804
 proj_flow/log/__init__.py,sha256=02EIgasE-K7mmbbNiIdX0IebWQMp2Co_D6H4ZBhJgcs,365
@@ -87,7 +87,7 @@ proj_flow/template/layers/base/.gitignore,sha256=2Cu5mL_7pSbC6gDHV9sZIJpzvEBuhHQ
 proj_flow/template/layers/base/README.md.mustache,sha256=toKfa5VQ23k8VKnsyogRojZZLfPakH8RHBzp0qpC-eY,43
 proj_flow/template/layers/base/flow,sha256=aPBLCgYNAZFl3FcP3HPwPnUxuRGxeV1Dp_6qFxDoGvk,196
 proj_flow/template/layers/base/flow.cmd,sha256=LQplRzLw4n86xvMXxOd1SzH2xJAN71Ou1uWsST8D6Ik,239
-proj_flow/template/layers/base/.flow/config.yml,sha256=7dc7u0FVBWP0nwOCzWNHEGeOM_APR467vyMuT_Mjfto,773
+proj_flow/template/layers/base/.flow/config.yml,sha256=Q90Nm5qATsdKgYB7j2Y2aISc8uiuAYO6h5tx88AHQLE,598
 proj_flow/template/layers/base/.flow/flow.py.mustache,sha256=HxjPhBsVFZ5HYvozG2qjdjC6wmCXK3OgVgoLWqEFSJo,4972
 proj_flow/template/layers/base/.flow/matrix.yml,sha256=XgDC-F8YfeZEILBwHPkGNeRCxgaDK79f-JoWfHlVrgc,1257
 proj_flow/template/layers/base/.flow/official.yml,sha256=2nQgxoQJ5IAnPQVn50LrVD0B2p9KpLYSVz1b7IFu0Zc,71
@@ -111,16 +111,16 @@ proj_flow/template/layers/cmake/data/assets/wix_dialog.bmp,sha256=599idjsdWX8ghO
 proj_flow/template/layers/cmake/data/icons/.gitignore,sha256=NEwIFSarC4e2DwNDDqGKGGvScsfAtWFdM-CT_hhsuXM,35
 proj_flow/template/layers/cmake/data/icons/appicon-mask.svg,sha256=pkMzpiGSq8emOD0MGrcwhQvHXkMcPp0aNhsyzS1dAZE,258
 proj_flow/template/layers/cmake/data/icons/appicon.svg,sha256=suZ4xxKxNe5La8K2OcsffpMpuHZn_hKfi0cSKPTzbFo,1357
-proj_flow/template/layers/cmake/src/main.cc.mustache,sha256=XSqjowXjPhmm18GRZl05r9co50DEehHIyDiXLH0YY_c,1202
+proj_flow/template/layers/cmake/src/main.cc.mustache,sha256=NiV_NNddQREs0FMnQCGKfYmgX6SMAA0SyeHu6hukpZM,1181
 proj_flow/template/layers/cmake/src/version.hpp.in.mustache,sha256=q-OHyLQ-d52hkV45m3DWLoBs9EWiHbIlIOnMvDoSfdg,1757
-proj_flow/template/layers/cmake/tests/test.cc.mustache,sha256=ZoUYCEZOwOPB3A-0EU-59rebPCqPjW7FuHDMNvdG_t0,371
+proj_flow/template/layers/cmake/tests/test.cc.mustache,sha256=7PjahLNA9E9NkybjUqh1LkxRPnn-blEWrvXTePg7yqc,368
 proj_flow/template/layers/conan/conanfile.txt,sha256=XOuMBysuBL9wmWmoruZqi6yhZO-APPlZKOxU2HQhFx0,106
 proj_flow/template/layers/conan/.flow/cmake/libcxx_toolchain.cmake,sha256=WkECkH-UyBzC4-ChIBCyVIN42NQLTy-3OLCk4BZ9deM,244
 proj_flow/template/layers/conan/.flow/cmake/output_dirs_setup.cmake,sha256=-GSDiZm4kFzAarB6WZ20ew4wO9QNprTH3Q2uHHMlsVw,1272
 proj_flow/template/layers/github_actions/CPPLINT.cfg,sha256=JX88FBnJ3pECU0QS-8CjOfvWo_my6lSgX8kc1oi-mmY,385
 proj_flow/template/layers/github_actions/.github/linters/.isort.cfg,sha256=9gpUkeq6rXGxXeeokeGkTDjOBvDpdlcup8ipxCpJQ9s,79
 proj_flow/template/layers/github_actions/.github/linters/.mypy.ini,sha256=13DnGOzVFyXtkXH-48LlblCLfiXc2Xbzk78pllCKbSo,37
-proj_flow/template/layers/github_actions/.github/workflows/build.yml,sha256=bgzdp18fIWzIQOfFRE9Q9T_JlA04XW2d9mk9mz8UgSw,8119
+proj_flow/template/layers/github_actions/.github/workflows/build.yml,sha256=WdYWTTlCQuy2FC9nSVQJKg4avLJ2UQ3IIrrEnPFvP8U,8183
 proj_flow/template/layers/github_actions/.github/workflows/linter.yml,sha256=Ffg-ptQ9kjw4X0UyQax9-3AMIP2H62ikDkbgPi0ypeM,1545
 proj_flow/template/layers/github_social/CODE_OF_CONDUCT.md.mustache,sha256=XzXW9p1pX7AA5DcWW7cz-Onrxa0J32WclgCYWeYLT3Y,3347
 proj_flow/template/layers/github_social/CONTRIBUTING.md,sha256=nw1FZgDtKXubnRqvBaQgSmUqpsvDy_433VGmy5W-BH4,239
@@ -131,8 +131,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.12.0.dist-info/METADATA,sha256=zhb6Ved7RWYcbf7vLuNfj13PB8h58AdNb-0pbX-n3rU,2868
-proj_flow-0.12.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-proj_flow-0.12.0.dist-info/entry_points.txt,sha256=d_OmGKZzpY7FCWz0sZ4wnBAPZC75oMEzTgJZWtpDELo,49
-proj_flow-0.12.0.dist-info/licenses/LICENSE,sha256=vpOQJ5QlrTedF3coEWvA4wJzVJH304f66ZitR7Od4iU,1068
-proj_flow-0.12.0.dist-info/RECORD,,
+proj_flow-0.13.1.dist-info/METADATA,sha256=D1liIJ_ZvTdmFy0TcOx-7bRnl6qtYOycA0hhx81HTt8,2868
+proj_flow-0.13.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+proj_flow-0.13.1.dist-info/entry_points.txt,sha256=d_OmGKZzpY7FCWz0sZ4wnBAPZC75oMEzTgJZWtpDELo,49
+proj_flow-0.13.1.dist-info/licenses/LICENSE,sha256=vpOQJ5QlrTedF3coEWvA4wJzVJH304f66ZitR7Od4iU,1068
+proj_flow-0.13.1.dist-info/RECORD,,