commitizen 3.19.0__tar.gz → 3.21.0__tar.gz

{commitizen-3.19.0 → commitizen-3.21.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: commitizen
-Version: 3.19.0
+Version: 3.21.0
 Summary: Python commitizen client tool
 Home-page: https://github.com/commitizen-tools/commitizen
 License: MIT

commitizen-3.21.0/commitizen/__version__.py

@@ -0,0 +1 @@
+__version__ = "3.21.0"

{commitizen-3.19.0 → commitizen-3.21.0}/commitizen/changelog.py

@@ -200,7 +200,12 @@ def process_commit_message(
     changes: dict[str | None, list],
     change_type_map: dict[str, str] | None = None,
 ):
-    message: dict = parsed.groupdict()
+    message: dict = {
+        "sha1": commit.rev,
+        "author": commit.author,
+        "author_email": commit.author_email,
+        **parsed.groupdict(),
+    }
 
     if processed := hook(message, commit) if hook else message:
         messages = [processed] if isinstance(processed, dict) else processed

{commitizen-3.19.0 → commitizen-3.21.0}/commitizen/cli.py

@@ -123,6 +123,12 @@ data = {
                         "action": "store_true",
                         "help": "retry last commit",
                     },
+                    {
+                        "name": ["--no-retry"],
+                        "action": "store_true",
+                        "default": False,
+                        "help": "skip retry if retry_after_failure is set to true",
+                    },
                     {
                         "name": "--dry-run",
                         "action": "store_true",

{commitizen-3.19.0 → commitizen-3.21.0}/commitizen/commands/commit.py

@@ -1,12 +1,15 @@
+from __future__ import annotations
+
 import contextlib
 import os
-import tempfile
+
 
 import questionary
 
 from commitizen import factory, git, out
 from commitizen.config import BaseConfig
 from commitizen.cz.exceptions import CzException
+from commitizen.cz.utils import get_backup_file_path
 from commitizen.exceptions import (
     CommitError,
     CustomError,
@@ -31,15 +34,12 @@ class Commit:
         self.encoding = config.settings["encoding"]
         self.cz = factory.commiter_factory(self.config)
         self.arguments = arguments
-        self.temp_file: str = os.path.join(
-            tempfile.gettempdir(),
-            "cz.commit{user}.backup".format(user=os.environ.get("USER", "")),
-        )
+        self.temp_file: str = get_backup_file_path()
 
-    def read_backup_message(self) -> str:
+    def read_backup_message(self) -> str | None:
         # Check the commit backup file exists
         if not os.path.isfile(self.temp_file):
-            raise NoCommitBackupError()
+            return None
 
         # Read commit message from backup
         with open(self.temp_file, encoding=self.encoding) as f:
@@ -65,7 +65,7 @@ class Commit:
 
     def __call__(self):
         dry_run: bool = self.arguments.get("dry_run")
-        write_message_to_file = self.arguments.get("write_message_to_file")
+        write_message_to_file: bool = self.arguments.get("write_message_to_file")
 
         is_all: bool = self.arguments.get("all")
         if is_all:
@@ -78,9 +78,17 @@ class Commit:
             raise NotAllowed(f"{write_message_to_file} is a directory")
 
         retry: bool = self.arguments.get("retry")
+        no_retry: bool = self.arguments.get("no_retry")
+        retry_after_failure: bool = self.config.settings.get("retry_after_failure")
 
         if retry:
             m = self.read_backup_message()
+            if m is None:
+                raise NoCommitBackupError()
+        elif retry_after_failure and not no_retry:
+            m = self.read_backup_message()
+            if m is None:
+                m = self.prompt_commit_questions()
         else:
             m = self.prompt_commit_questions()
 

{commitizen-3.19.0 → commitizen-3.21.0}/commitizen/cz/utils.py

@@ -1,6 +1,9 @@
 import re
+import os
+import tempfile
 
 from commitizen.cz import exceptions
+from commitizen import git
 
 
 def required_validator(answer, msg=None):
@@ -15,3 +18,15 @@ def multiple_line_breaker(answer, sep="|"):
 
 def strip_local_version(version: str) -> str:
     return re.sub(r"\+.+", "", version)
+
+
+def get_backup_file_path() -> str:
+    project_root = git.find_git_project_root()
+
+    if project_root is None:
+        project = ""
+    else:
+        project = project_root.as_posix().replace("/", "%")
+
+    user = os.environ.get("USER", "")
+    return os.path.join(tempfile.gettempdir(), f"cz.commit%{user}%{project}.backup")

{commitizen-3.19.0 → commitizen-3.21.0}/commitizen/defaults.py

@@ -37,6 +37,7 @@ class Settings(TypedDict, total=False):
     version_type: str | None
     tag_format: str
     bump_message: str | None
+    retry_after_failure: bool
     allow_abort: bool
     allowed_prefixes: list[str]
     changelog_file: str
@@ -77,6 +78,7 @@ DEFAULT_SETTINGS: Settings = {
     "version_scheme": None,
     "tag_format": "$version",  # example v$version
     "bump_message": None,  # bumped v$current_version to $new_version
+    "retry_after_failure": False,
     "allow_abort": False,
     "allowed_prefixes": [
         "Merge",

{commitizen-3.19.0 → commitizen-3.21.0}/pyproject.toml

@@ -1,5 +1,5 @@
 [tool.commitizen]
-version = "3.19.0"
+version = "3.21.0"
 tag_format = "v$version"
 version_files = [
   "pyproject.toml:version",
@@ -9,7 +9,7 @@ version_files = [
 
 [tool.poetry]
 name = "commitizen"
-version = "3.19.0"
+version = "3.21.0"
 description = "Python commitizen client tool"
 authors = ["Santiago Fraire <santiwilly@gmail.com>"]
 license = "MIT"
@@ -54,7 +54,7 @@ importlib_metadata = { version = ">=4.13,<8"}
 ipython = "^8.0"
 # test
 pytest = ">=7.2,<9.0"
-pytest-cov = "^4.0"
+pytest-cov = ">=4,<6"
 pytest-mock = "^3.10"
 pytest-regressions = "^2.4.0"
 pytest-freezer = "^0.4.6"

{commitizen-3.19.0 → commitizen-3.21.0}/setup.py

@@ -59,7 +59,7 @@ entry_points = \
 
 setup_kwargs = {
     'name': 'commitizen',
-    'version': '3.19.0',
+    'version': '3.21.0',
     'description': 'Python commitizen client tool',
     'long_description': '[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/commitizen-tools/commitizen/pythonpackage.yml?label=python%20package&logo=github&logoColor=white&style=flat-square)](https://github.com/commitizen-tools/commitizen/actions)\n[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg?style=flat-square)](https://conventionalcommits.org)\n[![PyPI Package latest release](https://img.shields.io/pypi/v/commitizen.svg?style=flat-square)](https://pypi.org/project/commitizen/)\n[![PyPI Package download count (per month)](https://img.shields.io/pypi/dm/commitizen?style=flat-square)](https://pypi.org/project/commitizen/)\n[![Supported versions](https://img.shields.io/pypi/pyversions/commitizen.svg?style=flat-square)](https://pypi.org/project/commitizen/)\n[![homebrew](https://img.shields.io/homebrew/v/commitizen?color=teal&style=flat-square)](https://formulae.brew.sh/formula/commitizen)\n[![Codecov](https://img.shields.io/codecov/c/github/commitizen-tools/commitizen.svg?style=flat-square)](https://codecov.io/gh/commitizen-tools/commitizen)\n[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?style=flat-square&logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)\n\n![Using commitizen cli](images/demo.gif)\n\n---\n\n**Documentation:** [https://commitizen-tools.github.io/commitizen/](https://commitizen-tools.github.io/commitizen/)\n\n---\n\n## About\n\nCommitizen is release management tool designed for teams.\n\nCommitizen assumes your team uses a standard way of committing rules\nand from that foundation, it can bump your project\'s version, create\nthe changelog, and update files.\n\nBy default, commitizen uses [conventional commits][conventional_commits], but you\ncan build your own set of rules, and publish them.\n\nUsing a standardized set of rules to write commits, makes commits easier to read, and enforces writing\ndescriptive commits.\n\n### Features\n\n- Command-line utility to create commits with your rules. Defaults: [Conventional commits][conventional_commits]\n- Bump version automatically using [semantic versioning][semver] based on the commits. [Read More](./bump.md)\n- Generate a changelog using [Keep a changelog][keepchangelog]\n- Update your project\'s version files automatically\n- Display information about your commit rules (commands: schema, example, info)\n- Create your own set of rules and publish them to pip. Read more on [Customization](./customization.md)\n\n## Requirements\n\n[Python](https://www.python.org/downloads/) `3.8+`\n\n[Git][gitscm] `1.8.5.2+`\n\n## Installation\n\nTo make commitizen available in your system\n\n```bash\npip install --user -U Commitizen\n```\n\n### Python project\n\nYou can add it to your local project using one of these:\n\n```bash\npip install -U commitizen\n```\n\nfor Poetry >= 1.2.0:\n\n```bash\npoetry add commitizen --group dev\n```\n\nfor Poetry < 1.2.0:\n\n```bash\npoetry add commitizen --dev\n```\n\n### macOS\n\nvia [homebrew](https://formulae.brew.sh/formula/commitizen):\n\n```bash\nbrew install commitizen\n```\n\n## Usage\n\nMost of the time this is the only command you\'ll run:\n\n```sh\ncz bump\n```\n\nOn top of that, you can use commitizen to assist you with the creation of commits:\n\n```sh\ncz commit\n```\n\nRead more in the section [Getting Started](./getting_started.md).\n\n### Help\n\n```sh\n$ cz --help\nusage: cz [-h] [--debug] [-n NAME] [-nr NO_RAISE] {init,commit,c,ls,example,info,schema,bump,changelog,ch,check,version} ...\n\nCommitizen is a cli tool to generate conventional commits.\nFor more information about the topic go to https://conventionalcommits.org/\n\noptional arguments:\n  -h, --help            show this help message and exit\n  --debug               use debug mode\n  -n NAME, --name NAME  use the given commitizen (default: cz_conventional_commits)\n  -nr NO_RAISE, --no-raise NO_RAISE\n                        comma separated error codes that won\'t rise error, e.g: cz -nr 1,2,3 bump. See codes at https://commitizen-\n                        tools.github.io/commitizen/exit_codes/\n\ncommands:\n  {init,commit,c,ls,example,info,schema,bump,changelog,ch,check,version}\n    init                init commitizen configuration\n    commit (c)          create new commit\n    ls                  show available commitizens\n    example             show commit example\n    info                show information about the cz\n    schema              show commit schema\n    bump                bump semantic version based on the git log\n    changelog (ch)      generate changelog (note that it will overwrite existing file)\n    check               validates that a commit message matches the commitizen schema\n    version             get the version of the installed commitizen or the current project (default: installed commitizen)\n```\n\n## Setting up bash completion\n\nWhen using bash as your shell (limited support for zsh, fish, and tcsh is available), Commitizen can use [argcomplete](https://kislyuk.github.io/argcomplete/) for auto-completion. For this argcomplete needs to be enabled.\n\nargcomplete is installed when you install Commitizen since it\'s a dependency.\n\nIf Commitizen is installed globally, global activation can be executed:\n\n```bash\nsudo activate-global-python-argcomplete\n```\n\nFor permanent (but not global) Commitizen activation, use:\n\n```bash\nregister-python-argcomplete cz >> ~/.bashrc\n```\n\nFor one-time activation of argcomplete for Commitizen only, use:\n\n```bash\neval "$(register-python-argcomplete cz)"\n```\n\nFor further information on activation, please visit the [argcomplete website](https://kislyuk.github.io/argcomplete/).\n\n## Sponsors\n\nThese are our cool sponsors!\n\n<!-- sponsors --><!-- sponsors -->\n\n[conventional_commits]: https://www.conventionalcommits.org\n[semver]: https://semver.org/\n[keepchangelog]: https://keepachangelog.com/\n[gitscm]: https://git-scm.com/downloads\n',
     'author': 'Santiago Fraire',

commitizen-3.19.0/commitizen/__version__.py

@@ -1 +0,0 @@
-__version__ = "3.19.0"