style: new lint command running isort and black

Author: woile

commitizen/__init__.py

@@ -1,8 +1,9 @@
 import logging
 import logging.config
+
 from colorama import init
-from commitizen.cz.base import BaseCommitizen
 
+from commitizen.cz.base import BaseCommitizen
 
 init()
 

commitizen/__main__.py

@@ -1,5 +1,4 @@
 from commitizen.cli import main
 
-
 if __name__ == "__main__":
     main()

commitizen/bump.py

@@ -2,15 +2,17 @@
 from collections import defaultdict
 from itertools import zip_longest
 from string import Template
-from packaging.version import Version
 from typing import List, Optional, Union
+
+from packaging.version import Version
+
 from commitizen.defaults import (
     MAJOR,
     MINOR,
     PATCH,
-    bump_pattern,
     bump_map,
     bump_message,
+    bump_pattern,
 )
 
 

commitizen/cli.py

@@ -1,15 +1,12 @@
-import io
-import os
-import sys
-import logging
 import argparse
+import logging
+import sys
 import warnings
+
 from decli import cli
-from pathlib import Path
-from configparser import RawConfigParser, NoSectionError
-from commitizen import defaults, commands, out, config
-from commitizen.__version__ import __version__
 
+from commitizen import commands, config, out
+from commitizen.__version__ import __version__
 
 logger = logging.getLogger(__name__)
 data = {
@@ -46,8 +43,8 @@
                         "name": ["--retry"],
                         "action": "store_true",
                         "help": "retry last commit",
-                    },
-                ]
+                    }
+                ],
             },
             {
                 "name": "example",

commitizen/commands/bump.py

@@ -1,8 +1,9 @@
-from packaging.version import Version
 from typing import Optional
 
 import questionary
-from commitizen import bump, git, config, out, factory
+from packaging.version import Version
+
+from commitizen import bump, config, factory, git, out
 
 NO_COMMITS_FOUND = 3
 NO_VERSION_SPECIFIED = 4

commitizen/commands/commit.py

@@ -1,10 +1,10 @@
 import contextlib
 import os
-import questionary
 import tempfile
 
-from commitizen import factory, out, git
+import questionary
 
+from commitizen import factory, git, out
 
 NO_ANSWERS = 5
 COMMIT_ERROR = 6

commitizen/config.py

@@ -2,9 +2,10 @@
 import json
 import os
 import warnings
-from typing import Optional
 from pathlib import Path
-from tomlkit import parse, exceptions
+from typing import Optional
+
+from tomlkit import exceptions, parse
 
 from commitizen import defaults
 

commitizen/cz/__init__.py

@@ -1,5 +1,6 @@
 import importlib
 import pkgutil
+
 from commitizen.cz.conventional_commits import ConventionalCommitsCz
 from commitizen.cz.jira import JiraSmartCz
 

commitizen/cz/conventional_commits/conventional_commits.py

@@ -1,6 +1,8 @@
 import os
-from commitizen.cz.base import BaseCommitizen
+
 from commitizen import defaults
+from commitizen.cz.base import BaseCommitizen
+
 __all__ = ["ConventionalCommitsCz"]
 
 

commitizen/cz/jira/jira.py

@@ -1,6 +1,6 @@
 import os
-from commitizen.cz.base import BaseCommitizen
 
+from commitizen.cz.base import BaseCommitizen
 
 __all__ = ["JiraSmartCz"]
 
@@ -67,7 +67,7 @@ def example(self):
         )
 
     def schema(self):
-        return "<ignored text> <ISSUE_KEY> <ignored text> #<COMMAND> <optional COMMAND_ARGUMENTS>"
+        return "<ignored text> <ISSUE_KEY> <ignored text> #<COMMAND> <optional COMMAND_ARGUMENTS>"  # noqa
 
     def info(self):
         dir_path = os.path.dirname(os.path.realpath(__file__))

commitizen/defaults.py

@@ -7,7 +7,7 @@
     "version": None,
     "files": [],
     "tag_format": None,  # example v$version
-    "bump_message": None  # bumped v$current_version to $new_version
+    "bump_message": None,  # bumped v$current_version to $new_version
 }
 
 MAJOR = "MAJOR"

commitizen/factory.py

@@ -1,7 +1,6 @@
 from commitizen import BaseCommitizen, out
 from commitizen.cz import registry
 
-
 NO_COMMITIZEN_FOUND = 2
 
 

commitizen/git.py

@@ -1,5 +1,6 @@
 import os
 from tempfile import NamedTemporaryFile
+
 from commitizen import cmd
 
 

commitizen/out.py

@@ -1,4 +1,5 @@
 import sys
+
 from termcolor import colored
 
 

pyproject.toml

@@ -63,6 +63,7 @@ codecov = "^2.0"
 mypy = "^0.740"
 mkdocs = "^1.0"
 mkdocs-material = "^4.1"
+isort = "^4.3.21"
 
 [tool.poetry.scripts]
 cz = "commitizen.cli:main"

scripts/lint

@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+export PREFIX=""
+if [ -d 'venv' ] ; then
+    export PREFIX="venv/bin/"
+fi
+
+set -x
+
+${PREFIX}isort --multi-line=3 --trailing-comma --force-grid-wrap=0 --combine-as --line-width 88 --recursive --apply commitizen tests
+${PREFIX}black commitizen tests

tests/test_bump_command.py

@@ -1,11 +1,13 @@
 import os
 import shutil
-import pytest
 import sys
-from typing import Optional
-from pathlib import Path
-from commitizen import git, cmd, cli
 import uuid
+from pathlib import Path
+from typing import Optional
+
+import pytest
+
+from commitizen import cli, cmd, git
 
 
 @pytest.fixture

tests/test_bump_create_commit_message.py

@@ -1,20 +1,15 @@
 import pytest
 from packaging.version import Version
+
 from commitizen import bump
 
 conversion = [
     (
         ("1.2.3", "1.3.0", "bump: $current_version -> $new_version [skip ci]"),
         "bump: 1.2.3 -> 1.3.0 [skip ci]",
     ),
-    (
-        ("1.2.3", "1.3.0", None),
-        "bump: version 1.2.3 → 1.3.0",
-    ),
-    (
-        ("1.2.3", "1.3.0", "release $new_version"),
-        "release 1.3.0",
-    ),
+    (("1.2.3", "1.3.0", None), "bump: version 1.2.3 → 1.3.0"),
+    (("1.2.3", "1.3.0", "release $new_version"), "release 1.3.0"),
 ]
 
 

tests/test_bump_create_tag.py

@@ -1,5 +1,6 @@
 import pytest
 from packaging.version import Version
+
 from commitizen import bump
 
 conversion = [

tests/test_bump_find_increment.py

@@ -21,7 +21,7 @@
     "feat(cli): added version",
     "docs(README): motivation",
     "fix(setup.py): future is now required for every python version",
-    "BREAKING CHANGE: `extends` key in config file is now used for extending other config files",
+    "BREAKING CHANGE: `extends` key in config file is now used for extending other config files",  # noqa
 ]
 
 PATCH_INCREMENTS_SVE = ["readme motivation PATCH", "fix setup.py PATCH"]

tests/test_bump_find_version.py

@@ -1,8 +1,10 @@
-import pytest
 import itertools
-from commitizen.bump import generate_version
+
+import pytest
 from packaging.version import Version
 
+from commitizen.bump import generate_version
+
 simple_flow = [
     (("0.1.0", "PATCH", None), "0.1.1"),
     (("0.1.1", "MINOR", None), "0.2.0"),

tests/test_bump_update_version_in_files.py

@@ -1,5 +1,7 @@
 import os
+
 import pytest
+
 from commitizen import bump
 
 PYPROJECT = """

tests/test_cli.py

@@ -1,5 +1,7 @@
 import sys
+
 import pytest
+
 from commitizen import cli
 
 

tests/test_commands.py

@@ -1,8 +1,9 @@
 import os
-import pytest
 from unittest import mock
 
-from commitizen import defaults, commands, cmd
+import pytest
+
+from commitizen import cmd, commands, defaults
 
 config = {"name": defaults.name}
 

tests/test_conf.py

@@ -1,7 +1,8 @@
 import os
+
 import pytest
-from commitizen import config, defaults
 
+from commitizen import config, defaults
 
 PYPROJECT = """
 [tool.commitizen]

tests/test_cz_base.py

@@ -1,4 +1,5 @@
 import pytest
+
 from commitizen import defaults
 from commitizen.cz.base import BaseCommitizen
 

tests/test_cz_conventional_commits.py

@@ -1,10 +1,11 @@
 import pytest
+
 from commitizen import defaults
 from commitizen.cz.conventional_commits.conventional_commits import (
+    ConventionalCommitsCz,
+    NoSubjectException,
     parse_scope,
     parse_subject,
-    NoSubjectException,
-    ConventionalCommitsCz,
 )
 
 config = {"name": defaults.name}
@@ -82,7 +83,7 @@ def test_long_answer():
     message = conventional_commits.message(answers)
     assert (
         message
-        == "fix(users): email pattern corrected\n\nBREAKING CHANGE: complete content\n\ncloses #24"
+        == "fix(users): email pattern corrected\n\nBREAKING CHANGE: complete content\n\ncloses #24"  # noqa
     )
 
 

tests/test_cz_jira.py

@@ -1,6 +1,5 @@
-from commitizen.cz.jira import JiraSmartCz
 from commitizen import defaults
-
+from commitizen.cz.jira import JiraSmartCz
 
 config = {"name": defaults.name}
 

tests/test_factory.py

@@ -1,5 +1,6 @@
 import pytest
-from commitizen import factory, defaults, BaseCommitizen
+
+from commitizen import BaseCommitizen, defaults, factory
 
 
 def test_factory():