fix: adjustments for commitizen tool-chain

note: new parameter "incremental" in template is assumed to be provided in a future standard commitizen release
small change to changelog template

Author: dornech

.pre-commit-config.yaml

@@ -10,6 +10,7 @@ repos:
     rev: v4.6.0
     hooks:
       - id: trailing-whitespace
+        exclude: CHANGELOG.md
       - id: check-added-large-files
       - id: check-merge-conflict
       - id: check-shebang-scripts-are-executable
@@ -22,6 +23,7 @@ repos:
       - id: check-yaml
         args: [ '--unsafe' ]  # needed for !! tags in mkdocs.yml
       - id: end-of-file-fixer
+        exclude: CHANGELOG.md
       - id: mixed-line-ending
         args: [ '--fix=auto' ]  # replace 'auto' with 'lf' to enforce Linux/Mac line endings or 'crlf' for Windows
       - id: detect-private-key

changelog_commitizen-template.md.j2

@@ -1,12 +1,16 @@
-{# MACRO: Capitalize the first letter of a string only #}
-{% macro capitalize_first_letter_only(sentence) %}
-{{    (sentence[0] | upper) ~ sentence[1:] }}
-{% endmacro %}
+{% if not incremental %}
 # CHANGELOG
 
+
+{% endif %}
+{#  MACRO: Capitalize the first letter of a string only #}
+{%  macro capitalize_first_letter_only(sentence) %}
+{{    (sentence[0] | upper) ~ sentence[1:] }}
+{%  endmacro %}
+
 {% for entry in tree %}
 
-## [{{ entry.version }}](https://github.com/dornech/utils-COMobjects/releases/tag/{{ entry.version }}) {% if entry.date %} ({{ entry.date }}) {% endif %}
+## [{{ entry.version }}](https://github.com/dornech/pytestdornech/releases/tag/{{ entry.version }}) {% if entry.date %}({{ entry.date }}){% endif %}
 
 {% for change_type, changes in entry.changes.items() %}
 
@@ -15,9 +19,9 @@
 {% endif %}
 {% for change in changes %}
 {% if change.scope %}
-- **{{ change.scope }}**: {{ capitalize_first_letter_only(change.message) }} (['{{ change.sha1[:7] }}'](https://github.com/dornech/utils-COMobjects/commit/{{ change.sha1 }}))
+- **{{ change.scope }}**: {{ capitalize_first_letter_only(change.message) }} (['{{ change.sha1[:7] }}'](https://github.com/dornech/pytestdornech/commit/{{ change.sha1 }}))
 {% elif change.message %}
-- {{ capitalize_first_letter_only(change.message) }}(['{{ change.sha1[:7] }}'](https://github.com/dornech/utils-COMobjects/commit/{{ change.sha1 }}))
+- {{ capitalize_first_letter_only(change.message) }}(['{{ change.sha1[:7] }}'](https://github.com/dornech/pytestdornech/commit/{{ change.sha1 }}))
 {% endif %}
 
 {% endfor %}

pyproject.toml

@@ -87,15 +87,21 @@ version_scheme = "pep440"
 version = "0.0.1"
 version_files = ["pyproject.toml:version"]
 tag_format = "v$version"
+# retry_after_failure = false
 update_changelog_on_bump = true
 changelog_file = "CHANGELOG.md"
 template = "changelog_commitizen-template.md.j2"
+post_bump_hooks = [
+    "echo %CZ_POST_CURRENT_TAG_VERSION% pushed to remote GitHub repository",
+    "git push origin HEAD",
+    "git push origin %CZ_POST_CURRENT_TAG_VERSION%",
+]
 
 [tool.commitizen.customize]
-message_template = "{% if scope %} '{{ change_type }}({{ scope }}): { {message }}' {% else %} '{{ change_type }}: {{ message }}'"
+message_template = "{% if scope %} '{{ change_type }}({{ scope }}): {{ message }}' {% else %} '{{ change_type }}: {{ message }}'"
 example = "'feat: add new endpoint'or 'feat(api): add new endpoint'"
 schema = "'<type>: <subject>' or '<type>(<scope>): <subject>'"
-schema_pattern = "(feat|fix|docs|style|refactor|perf|test|chore|build|deps|ci|revert)(\\([^)]+\\))?:\\s.*"
+schema_pattern = "(bump|feat|fix|docs|style|refactor|perf|test|chore|build|deps|ci|revert)(\\([^)]+\\))?:\\s.*"
 bump_pattern = "^(feat|fix|BREAKING CHANGE)"
 bump_map = {"feat" = "MINOR", "fix" = "PATCH", "BREAKING CHANGE" = "MAJOR"}
 # user defined changelog format - standard semantic-release + commit-sha and commit-url