proj-flow 0.15.1__tar.gz → 0.15.3__tar.gz

{proj_flow-0.15.1 → proj_flow-0.15.3}/CHANGELOG.rst

@@ -4,6 +4,22 @@ Changelog
 
 All notable changes to this project will be documented in this file.
 
+`0.15.3 <https://github.com/mzdun/proj-flow/compare/v0.15.2...v0.15.3>`_ (2025-02-24)
+=====================================================================================
+
+Bug Fixes
+---------
+
+- only use two most-recent minor versions in YAML (`24e4b05 <https://github.com/mzdun/proj-flow/commit/24e4b05c6bb6c3dc2a7db534e49f7ba542d396da>`_)
+
+`0.15.2 <https://github.com/mzdun/proj-flow/compare/v0.15.1...v0.15.2>`_ (2025-02-24)
+=====================================================================================
+
+Bug Fixes
+---------
+
+- carry +x on Windows (`846f6a1 <https://github.com/mzdun/proj-flow/commit/846f6a1b8d71d682e04dbd12b31ba9a6311b3d0b>`_)
+
 `0.15.1 <https://github.com/mzdun/proj-flow/compare/v0.15.0...v0.15.1>`_ (2025-02-23)
 =====================================================================================
 

{proj_flow-0.15.1 → proj_flow-0.15.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proj-flow
-Version: 0.15.1
+Version: 0.15.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.15.1 → proj_flow-0.15.3}/ROADMAP.md

@@ -3,7 +3,7 @@
 - [x] GitHub setup
 - [x] Auto-release
 - [x] Breaking change works
-- [ ] `chmod +x`, but on Windows
+- [x] `chmod +x`, but on Windows
 - [ ] bug_report's `version.options`: change to
   1. Current (vX.Y.Z)
   2. Previous (vX.Y-1.Z)

{proj_flow-0.15.1 → proj_flow-0.15.3}/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.15.1"
+__version__ = "0.15.3"

{proj_flow-0.15.1 → proj_flow-0.15.3}/src/proj_flow/flow/layer.py

@@ -22,6 +22,7 @@ class FileInfo:
     src: str
     dst: str
     is_mustache: bool
+    is_executable: bool
     when: Optional[str] = None
 
     @classmethod
@@ -32,12 +33,19 @@ class FileInfo:
         json_file = cast(dict, filelist.get(key, {}))
         path = cast(Optional[str], json_file.get("path"))
         when = cast(Optional[str], json_file.get("when"))
+        is_executable = cast(bool, json_file.get("executable"))
         dst = (
             chevron.render(path, context).replace("/", os.sep)
             if path is not None
             else basename if is_mustache else src
         )
-        return cls(src=src, dst=dst, is_mustache=is_mustache, when=when)
+        return cls(
+            src=src,
+            dst=dst,
+            is_mustache=is_mustache,
+            is_executable=is_executable,
+            when=when,
+        )
 
     def template(self):
         open_mstch = "{{"
@@ -71,6 +79,10 @@ class FileInfo:
         else:
             shutil.copy2(src, dst, follow_symlinks=False)
 
+    def get_git_checks(self):
+        if self.is_executable:
+            yield self
+
 
 @dataclass
 class LayerInfo:
@@ -149,6 +161,11 @@ class LayerInfo:
         if not rt.silent:
             print()
 
+    def get_git_checks(self):
+        for file in self.files:
+            for special in file.get_git_checks():
+                yield special
+
 
 def copy_license(rt: env.Runtime, context: ctx.SettingsType):
     license = path_get(context, "COPY.LICENSE")
@@ -159,7 +176,7 @@ def copy_license(rt: env.Runtime, context: ctx.SettingsType):
         os.path.join(ctx.package_root, ctx.template_dir, "licenses")
     )
     license_file = f"{license}.mustache"
-    info = FileInfo(license_file, "LICENSE", is_mustache=True)
+    info = FileInfo(license_file, "LICENSE", is_mustache=True, is_executable=False)
     info.run(licenses_dir, rt, context)
 
 

{proj_flow-0.15.1 → proj_flow-0.15.3}/src/proj_flow/log/commit.py

@@ -139,7 +139,11 @@ def _get_commit(hash: str, short_hash: str, message: str) -> Optional[Commit]:
 
     breaking_change = None
     body = "\n".join(lines).strip().split("BREAKING CHANGE", 1)
-    if len(body) > 1:
+    if (
+        len(body) > 1
+        and (len(body[0]) == 0 or body[0][-1:] == "\n")
+        and (len(body[1]) == 1 or body[1][:1] == ":")
+    ):
         body = body[1].lstrip(":").strip()
         breaking_change = [
             re.sub(r"\s+", " ", para.strip()) for para in body.split("\n\n")

{proj_flow-0.15.1 → proj_flow-0.15.3}/src/proj_flow/log/release.py

@@ -6,8 +6,7 @@ The **proj_flow.log.release** performs a relase on the hosting service.
 """
 
 import typing
-from abc import ABC, abstractmethod
-from typing import Iterable, Union
+from typing import Iterable, Optional, Union
 
 from proj_flow import api
 from proj_flow.api import env
@@ -18,9 +17,14 @@ from proj_flow.log.error import NoProjectError, VersionNotAdvancing
 OneOrMoreStrings = Union[str, Iterable[str]]
 
 
-class VersionUpdater(ABC):
-    @abstractmethod
-    def on_version_change(self, new_version: str) -> OneOrMoreStrings: ...
+class VersionUpdater:
+    def on_version_change(self, new_version: str) -> Optional[OneOrMoreStrings]:
+        return None
+
+    def on_version_change_tags(
+        self, new_version: str, tags: list[str]
+    ) -> Optional[OneOrMoreStrings]:
+        return self.on_version_change(new_version)
 
 
 version_updaters = registry.Registry[VersionUpdater]("VersionUpdater")
@@ -114,8 +118,10 @@ def add_release(
             files_to_commit.append(version_path)
 
         for updater in version_updaters.get():
-            modified = updater.on_version_change(next_version)
-            if isinstance(modified, str):
+            modified = updater.on_version_change_tags(next_version, tags)
+            if modified is None:
+                continue
+            elif isinstance(modified, str):
                 files_to_commit.append(modified)
             else:
                 files_to_commit.extend(modified)

{proj_flow-0.15.1 → proj_flow-0.15.3}/src/proj_flow/minimal/base.py

@@ -7,11 +7,15 @@ new projects.
 """
 
 import sys
+from typing import List
 
 from proj_flow import __version__, api
+from proj_flow.flow import layer
 
 
 class GitInit(api.init.InitStep):
+    layers: List[layer.LayerInfo] = []
+
     def priority(self):
         return sys.maxsize
 
@@ -24,6 +28,17 @@ class GitInit(api.init.InitStep):
 
         git("init")
         git("add", ".")
+
+        executables: List[str] = []
+
+        for fs_layer in GitInit.layers:
+            for info in fs_layer.get_git_checks():
+                if info.is_executable:
+                    executables.append(info.dst)
+
+        if len(executables):
+            git("update-index", "--chmod=+x", *executables)
+
         git("commit", "-m", "Initial commit")
 
 

proj_flow-0.15.3/src/proj_flow/minimal/ext/bug_report.py

@@ -0,0 +1,75 @@
+# Copyright (c) 2025 Marcin Zdun
+# This code is licensed under MIT license (see LICENSE for details)
+
+"""
+The **proj_flow.minimal.ext.bug_report** adds next version to bug_report.yaml
+next to CHANGELOG.rst.
+"""
+
+import re
+import sys
+from typing import List, Tuple
+
+from proj_flow.log import release
+
+YAML_PATH = ".github/ISSUE_TEMPLATE/bug_report.yaml"
+
+
+def _version(ver: str) -> Tuple[int, int, int, str]:
+    if ver[:1] == "v":
+        ver = ver[1:]
+
+    m = re.match(r"([0-9]+)\.([0-9]+)\.([0-9]+)(.*)", ver)
+    if m is None:
+        print(f"fatal error: cannot parse {ver}", file=sys.stderr)
+        raise SystemExit(1)
+    return (int(m.group(1)), int(m.group(2)), int(m.group(3)), ver)
+
+def _prev_version(new_version: str, tags: List[str]):
+    current = _version(new_version)
+    versions = [_version(tag) for tag in reversed(tags)]
+    index = 0
+    while index < len(versions):
+        comp = versions[index]
+        if comp[0] != current[0] or comp[1] != current[1]:
+            break
+
+        index += 1
+    if index >= len(versions):
+        index = 0
+
+    return None if index > len(versions) else versions[index][-1]
+
+@release.version_updaters.add
+class VersionUpdater(release.VersionUpdater):
+    def on_version_change_tags(self, new_version: str, tags: List[str]):
+        old_version = _prev_version(new_version, tags)
+
+        range = [f"      - Current (v{new_version})\n"]
+        if old_version:
+            range.extend(
+                [
+                    f"      - Previous (v{old_version})\n",
+                    f"      - Older, than v{old_version}\n",
+                ]
+            )
+
+        with open(YAML_PATH, encoding="UTF-8") as inf:
+            lines = inf.readlines()
+
+        try:
+            id_index = lines.index("  id: version\n")
+            option_index = lines.index("    options:\n", id_index) + 1
+            option_index_end = option_index
+            while option_index_end < len(lines) and lines[option_index_end].startswith(
+                "      - "
+            ):
+                option_index_end += 1
+            lines[option_index:option_index_end] = range
+        except ValueError as e:
+            print(e, file=sys.stderr)
+
+        with open(YAML_PATH, "w", encoding="UTF-8") as outf:
+            outf.writelines(lines)
+
+        return YAML_PATH

{proj_flow-0.15.1 → proj_flow-0.15.3}/src/proj_flow/minimal/init.py

@@ -15,6 +15,7 @@ import yaml
 from proj_flow import dependency, flow
 from proj_flow.api import arg, ctx, env, init
 from proj_flow.base.name_list import name_list
+from proj_flow.minimal import base
 from proj_flow.project import api, interact
 
 
@@ -148,6 +149,8 @@ def main(
 
     current_project.append_extensions(context)
 
+    base.GitInit.layers = layers
+
     steps = sorted((step.priority(), i, step) for i, step in enumerate(init.__steps))
     for _, _, step in steps:
         step.postprocess(rt, context)

proj_flow-0.15.3/src/proj_flow/template/layers/base.json

@@ -0,0 +1,3 @@
+{
+    "filelist": { "flow": { "executable": true } }
+}

proj_flow-0.15.1/src/proj_flow/minimal/ext/bug_report.py

@@ -1,33 +0,0 @@
-# Copyright (c) 2025 Marcin Zdun
-# This code is licensed under MIT license (see LICENSE for details)
-
-"""
-The **proj_flow.minimal.ext.bug_report** adds next version to bug_report.yaml
-next to CHANGELOG.rst.
-"""
-
-import re
-import sys
-
-from proj_flow.log import release
-
-YAML_PATH = ".github/ISSUE_TEMPLATE/bug_report.yaml"
-
-
-@release.version_updaters.add
-class VersionUpdater(release.VersionUpdater):
-    def on_version_change(self, new_version: str):
-        with open(YAML_PATH, encoding="UTF-8") as inf:
-            lines = inf.readlines()
-
-        try:
-            id_index = lines.index("  id: version\n")
-            option_index = lines.index("    options:\n", id_index) + 1
-            lines[option_index:option_index] = f"      - v{new_version}\n"
-        except ValueError as e:
-            print(e, file=sys.stderr)
-
-        with open(YAML_PATH, "w", encoding="UTF-8") as outf:
-            outf.writelines(lines)
-
-        return YAML_PATH

proj_flow-0.15.1/src/proj_flow/template/layers/base.json

@@ -1,2 +0,0 @@
-{
-}