proj-flow 0.15.2__py3-none-any.whl → 0.15.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.15.2"
+__version__ = "0.15.3"

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/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/minimal/base.py

@@ -12,6 +12,7 @@ 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] = []
 
@@ -27,7 +28,7 @@ class GitInit(api.init.InitStep):
 
         git("init")
         git("add", ".")
-        
+
         executables: List[str] = []
 
         for fs_layer in GitInit.layers:

proj_flow/minimal/ext/bug_report.py

@@ -8,22 +8,64 @@ 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(self, new_version: str):
+    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
-            lines[option_index:option_index] = f"      - v{new_version}\n"
+            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)
 

{proj_flow-0.15.2.dist-info → proj_flow-0.15.3.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-proj_flow/__init__.py,sha256=Iu3RgtFfoUNiC9ODO4gMyTUFoRfTFtjp9jZCz_zwgDw,277
+proj_flow/__init__.py,sha256=f_SVbGfjPfgZoZhfdeY4ub4ggE2iNZamhLs02yo7kBc,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
@@ -50,12 +50,12 @@ proj_flow/flow/configs.py,sha256=PQZ5pLPmWwHJtSWmuy04bsnO-VvfWcJyP_UyKjiaG1g,653
 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
-proj_flow/log/commit.py,sha256=PojQX1hpVlViKQWa7mUmVOM2_VuprxuEWZev5DiGvcY,14097
+proj_flow/log/commit.py,sha256=5Ve3s43NqVcvAKs6URghEpCODrpQ5t7O8hZTA7Rf9Yc,14223
 proj_flow/log/error.py,sha256=65Nvhfs_d1xSY4EB-ISdWgjotvg-on3iKjhAWHpsBYM,841
 proj_flow/log/fmt.py,sha256=o14aO3iEt5_KKp9SqcfkscqbMKuTI83NBoSXHcrb7Kg,330
 proj_flow/log/format.py,sha256=gp1kUoW0nYj5e7Ysu1c29Fh2ssfE1KBSDIYeUbhzN9g,333
 proj_flow/log/msg.py,sha256=zARmRZHFV3yG-fBnx00wal4Y0O5aGnL-6XcGwNBNKA4,6758
-proj_flow/log/release.py,sha256=y4u2oUbRuUtrOwuNP-_QGDsV8JArh1iTJGPjMr68wTo,4248
+proj_flow/log/release.py,sha256=tm25MACkcn7DpneR5z7vvnU24cGGvuH9tj-R7NXuRrE,4463
 proj_flow/log/hosting/__init__.py,sha256=9Teyw8jJcxeWH2MegqYEgW0n5OmSAWC7FFJj2u_UcrM,278
 proj_flow/log/hosting/github.py,sha256=O2BdB50vzVSKKIu3qNEYBiBdEUIPqj6C2xVvGAKjTZ4,9123
 proj_flow/log/rich_text/__init__.py,sha256=D3Y2jy9xlGgnQZdNC_ekoLzQtwkF_NTgLqDTWPvSRUk,279
@@ -63,13 +63,13 @@ proj_flow/log/rich_text/api.py,sha256=PCSAGwkmDUMoVlpN7BDsgIA1AiMZEC0H6TUZXpr_Mg
 proj_flow/log/rich_text/markdown.py,sha256=jBnNxxhBHzyIZ3Y4HXDfqpl7zlRbbKbKdwdnZwkmNAI,1623
 proj_flow/log/rich_text/re_structured_text.py,sha256=DEl9KjBUF6cxfNWpQ7GVnHi7wKeuFnPGJwxQxjbCsnM,1823
 proj_flow/minimal/__init__.py,sha256=Yv32uwmS5a9SXSjaMVK0xKla9sWtcA8QkJHt15ffhiU,354
-proj_flow/minimal/base.py,sha256=mE1Qf90fCYo2UjezESknVhUhxyxPNvS4wL_jbY2tF2M,1234
+proj_flow/minimal/base.py,sha256=jFAiJICAD6izCBqsNgt7syZ_lynpC5goNuEsaQv1a44,1227
 proj_flow/minimal/bootstrap.py,sha256=PcZfBsUmj8uDPGBC55iUgD5O7W4VSkpCQb6r9GEyAaQ,556
 proj_flow/minimal/init.py,sha256=Rx3wu2xDZQpaiU0vmNmsj1eS48DopvL023lB7eTf85A,4318
 proj_flow/minimal/list.py,sha256=RlOqammE8olNKXsnbv1enF5uriu0MZ2wFbht37Z2ETw,4810
 proj_flow/minimal/run.py,sha256=4qvGLqz2ayCZDvVBrq4tG094fjfcmDPon-xcGPQkM_U,4665
 proj_flow/minimal/system.py,sha256=9FliH5TD103JYSAe2O5EU7hkOHDgVzTqu0Exxk-WrXE,1579
-proj_flow/minimal/ext/bug_report.py,sha256=rC9LR2obJ54zOoPd6fU3BClB9-sYyhuxG_p4_wSCpZs,949
+proj_flow/minimal/ext/bug_report.py,sha256=aKTxjHBF5lZIU9Hmsq1Mc3Ou19GkSh_Q137I81fLsZY,2309
 proj_flow/project/__init__.py,sha256=AROrwhbuMR5rJE-HC769eL4IXrMLQYpQb3HgpkOAYqg,293
 proj_flow/project/api.py,sha256=fu7gW0JuC7brwdsR4TadXYRqeMdt-lBUCEV4Sf0kMfY,1999
 proj_flow/project/data.py,sha256=TluhBDoJEYL4dnyTpInmhQ49Uvf8mkWmpU-YMLQPNhE,317
@@ -133,8 +133,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.15.2.dist-info/METADATA,sha256=LzOSrMiyHcSSFH62BPjQvFytdqLTb8g0m6vmvG5ahtw,2980
-proj_flow-0.15.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-proj_flow-0.15.2.dist-info/entry_points.txt,sha256=d_OmGKZzpY7FCWz0sZ4wnBAPZC75oMEzTgJZWtpDELo,49
-proj_flow-0.15.2.dist-info/licenses/LICENSE,sha256=vpOQJ5QlrTedF3coEWvA4wJzVJH304f66ZitR7Od4iU,1068
-proj_flow-0.15.2.dist-info/RECORD,,
+proj_flow-0.15.3.dist-info/METADATA,sha256=-pnFJ2XT33k9yPUGP8f_-x6UeE3CJbamscIjTv5KTNM,2980
+proj_flow-0.15.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+proj_flow-0.15.3.dist-info/entry_points.txt,sha256=d_OmGKZzpY7FCWz0sZ4wnBAPZC75oMEzTgJZWtpDELo,49
+proj_flow-0.15.3.dist-info/licenses/LICENSE,sha256=vpOQJ5QlrTedF3coEWvA4wJzVJH304f66ZitR7Od4iU,1068
+proj_flow-0.15.3.dist-info/RECORD,,