Update Dunamai dependency and integrate new features

Author: mtkennerly

CHANGELOG.md

@@ -3,6 +3,8 @@
 * Added:
   * The `bump` config may now be set to a table,
     which supports an `index` field.
+  * `commit-length` option to set a fixed length for commit hashes.
+  * `{major}`, `{minor}`, and `{patch}` format placeholders.
 * Fixed:
   * Compatibility with other plugins (such as `poetry-monoranger-plugin`)
     that replace the `ConsoleCommandEvent.command.poetry` instance.

README.md

@@ -147,6 +147,9 @@ In your pyproject.toml file, you may configure the following options:
     * `{branch}`
     * `{branch_escaped}` which omits any non-letter/number characters
     * `{timestamp}` of the current commit, which expands to YYYYmmddHHMMSS as UTC
+    * `{major}` (first part of `base` split on `.`, or 0)
+    * `{minor}` (second part of `base` split on `.`, or 0)
+    * `{patch}` (third part of `base` split on `.`, or 0)
 
     Example: `v{base}+{distance}.{commit}`
   * `format-jinja` (string, default: unset):
@@ -168,6 +171,9 @@ In your pyproject.toml file, you may configure the following options:
     * `branch` (string or None)
     * `branch_escaped` (string or None)
     * `timestamp` (string or None)
+    * `major` (integer)
+    * `minor` (integer)
+    * `patch` (integer)
 
     Available functions:
 
@@ -261,6 +267,8 @@ In your pyproject.toml file, you may configure the following options:
     Currently, this only supports Git and will run `git fetch --unshallow`.
   * `ignore-untracked` (boolean, default: false):
     If true, ignore untracked files when determining whether the repository is dirty.
+  * `commit-length` (integer, default: unset):
+    Use this many characters from the start of the full commit hash.
 * `[tool.poetry-dynamic-versioning.substitution]`:
   Insert the dynamic version into additional files other than just pyproject.toml.
   These changes will be reverted when the plugin deactivates.

poetry.lock

@@ -119,6 +119,7 @@
             "strict": bool,
             "fix-shallow-repository": bool,
             "ignore-untracked": bool,
+            "commit-length": Optional[int],
             "from-file": _FromFile,
         },
     )
@@ -251,6 +252,7 @@ def _default_config() -> Mapping:
                 "strict": False,
                 "fix-shallow-repository": False,
                 "ignore-untracked": False,
+                "commit-length": None,
                 "from-file": {
                     "source": None,
                     "pattern": None,
@@ -394,6 +396,14 @@ def _render_jinja(version: Version, template: str, config: _Config, extra: Optio
 
     if bump_config.enable and version.distance > 0:
         version = version.bump(index=bump_config.index)
+
+    def base_part(index: int) -> int:
+        parts = version.base.split(".")
+        try:
+            return int(parts[index])
+        except Exception:
+            return 0
+
     default_context = {
         "base": version.base,
         "version": version,
@@ -405,6 +415,9 @@ def _render_jinja(version: Version, template: str, config: _Config, extra: Optio
         "branch": version.branch,
         "branch_escaped": _escape_branch(version.branch),
         "timestamp": _format_timestamp(version.timestamp),
+        "major": base_part(0),
+        "minor": base_part(1),
+        "patch": base_part(2),
         "env": os.environ,
         "bump_version": bump_version,
         "tagged_metadata": version.tagged_metadata,
@@ -493,6 +506,7 @@ def _get_version_from_dunamai(
         strict=config["strict"] if strict is None else strict,
         pattern_prefix=config["pattern-prefix"],
         ignore_untracked=config["ignore-untracked"],
+        commit_length=config["commit-length"],
     )
 
 

poetry_dynamic_versioning/__init__.py

@@ -27,7 +27,7 @@ include = [
 
 [tool.poetry.dependencies]
 python = "^3.7"
-dunamai = "^1.21.0"
+dunamai = "^1.23.0"
 tomlkit = ">= 0.4"
 jinja2 = ">=2.11.1, <4"
 poetry = { version = ">=1.2.0", optional = true }