proj-flow 0.12.0__tar.gz → 0.13.1__tar.gz

{proj_flow-0.12.0 → proj_flow-0.13.1}/CHANGELOG.rst

@@ -4,6 +4,22 @@ Changelog
 
 All notable changes to this project will be documented in this file.
 
+`0.13.1 <https://github.com/mzdun/proj-flow/compare/v0.13.0...v0.13.1>`_ (2025-02-22)
+=====================================================================================
+
+Bug Fixes
+---------
+
+- allow GitHub Actions' GH to access drafts (`da81eff <https://github.com/mzdun/proj-flow/commit/da81eff2a9bb6e83f13a4cca276508715e1c0f97>`_)
+
+`0.13.0 <https://github.com/mzdun/proj-flow/compare/v0.12.0...v0.13.0>`_ (2025-02-22)
+=====================================================================================
+
+New Features
+------------
+
+- calculate lts.ubuntu from current date (`2bfa12e <https://github.com/mzdun/proj-flow/commit/2bfa12e87cf7b5b163ef88473d2f4779afeed938>`_)
+
 `0.12.0 <https://github.com/mzdun/proj-flow/compare/v0.11.3...v0.12.0>`_ (2025-02-22)
 =====================================================================================
 

{proj_flow-0.12.0 → proj_flow-0.13.1}/PKG-INFO

@@ -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 → proj_flow-0.13.1}/src/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-0.12.0 → proj_flow-0.13.1}/src/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-0.12.0 → proj_flow-0.13.1}/src/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-0.12.0 → proj_flow-0.13.1}/src/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-0.12.0 → proj_flow-0.13.1}/src/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-0.12.0 → proj_flow-0.13.1}/src/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-0.12.0 → proj_flow-0.13.1}/src/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 }}