From 37505ef20b2f737ae178c8272a2dab133f7c298e Mon Sep 17 00:00:00 2001 From: gpongelli <842026+gpongelli@users.noreply.github.com> Date: Fri, 5 Aug 2022 16:39:24 +0200 Subject: [PATCH 1/2] refactor(tool): use charset_normalizer instead of chardet --- commitizen/cmd.py | 6 +++--- pyproject.toml | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/commitizen/cmd.py b/commitizen/cmd.py index f65f5c8e76..7f4efb6ad2 100644 --- a/commitizen/cmd.py +++ b/commitizen/cmd.py @@ -1,7 +1,7 @@ import subprocess from typing import NamedTuple -import chardet +from charset_normalizer import from_bytes class Command(NamedTuple): @@ -23,8 +23,8 @@ def run(cmd: str) -> Command: stdout, stderr = process.communicate() return_code = process.returncode return Command( - stdout.decode(chardet.detect(stdout)["encoding"] or "utf-8"), - stderr.decode(chardet.detect(stderr)["encoding"] or "utf-8"), + str(from_bytes(stdout).best()), + str(from_bytes(stderr).best()), stdout, stderr, return_code, diff --git a/pyproject.toml b/pyproject.toml index 886c3e6a74..ab0e853958 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,7 +56,7 @@ jinja2 = ">=2.10.3" pyyaml = ">=3.08" argcomplete = "^1.12.1" typing-extensions = "^4.0.1" -chardet = "^5.0.0" +charset-normalizer = "^2.1.0" [tool.poetry.dev-dependencies] ipython = "^7.2" @@ -82,7 +82,6 @@ mkdocs = "^1.0" mkdocs-material = "^4.1" pydocstyle = "^5.0.2" pytest-xdist = "^2.5.0" -types-chardet = "^5.0.2" [tool.poetry.scripts] cz = "commitizen.cli:main" From 05ab7ad0ff51c915145a843208ca7e15f6ee16a3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 5 Aug 2022 19:59:17 +0000 Subject: [PATCH 2/2] =?UTF-8?q?bump:=20version=202.29.3=20=E2=86=92=202.29?= =?UTF-8?q?.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .pre-commit-config.yaml | 2 +- CHANGELOG.md | 6 ++++++ commitizen/__version__.py | 2 +- pyproject.toml | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ff65aaeca1..8a98dcef9e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,7 +12,7 @@ repos: - id: no-commit-to-branch - repo: https://github.com/commitizen-tools/commitizen - rev: v2.29.3 # automatically updated by Commitizen + rev: v2.29.4 # automatically updated by Commitizen hooks: - id: commitizen stages: [commit-msg] diff --git a/CHANGELOG.md b/CHANGELOG.md index 4305887cf2..764601f996 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ +## v2.29.4 (2022-08-05) + +### Refactor + +- **tool**: use charset_normalizer instead of chardet + ## v2.29.3 (2022-08-02) ### Refactor diff --git a/commitizen/__version__.py b/commitizen/__version__.py index f99856f5d7..b13db77634 100644 --- a/commitizen/__version__.py +++ b/commitizen/__version__.py @@ -1 +1 @@ -__version__ = "2.29.3" +__version__ = "2.29.4" diff --git a/pyproject.toml b/pyproject.toml index ab0e853958..ba93878de3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [tool.commitizen] -version = "2.29.3" +version = "2.29.4" tag_format = "v$version" version_files = [ "pyproject.toml:version", @@ -30,7 +30,7 @@ exclude = ''' [tool.poetry] name = "commitizen" -version = "2.29.3" +version = "2.29.4" description = "Python commitizen client tool" authors = ["Santiago Fraire "] license = "MIT"