diff --git a/src/git_flow/__init__.py b/src/git_flow/__init__.py index 64ed554..454bea0 100644 --- a/src/git_flow/__init__.py +++ b/src/git_flow/__init__.py @@ -18,7 +18,7 @@ COMMIT_TYPES = [ "docs", "style", "test", - "wip" + "wip", ] # Commits con estos valores incrementan el componente correspondiente @@ -46,3 +46,15 @@ SUPPORTED_REMOTE_APIS = [ ] REPOSITORY_TOKEN_FILENAME = ".repository-token" + +COLOR_BLACK = "\033[30m" +COLOR_RED = "\033[31m" +COLOR_GREEN = "\033[32m" +COLOR_YELLOW = "\033[33m" +COLOR_BLUE = "\033[34m" +COLOR_5 = "\033[35m" +COLOR_6 = "\033[36m" +COLOR_7 = "\033[37m" +COLOR_BLACK_BOLD = "\033[1;30m" +COLOR_WHITE_BOLD = "\033[1;37m" +COLOR_RESET = "\033[0m" diff --git a/src/git_flow/command/base.py b/src/git_flow/command/base.py index d8a7cfe..efc5c08 100644 --- a/src/git_flow/command/base.py +++ b/src/git_flow/command/base.py @@ -4,6 +4,11 @@ from os.path import isfile from git_flow import ( BRANCH_TYPES, + COLOR_BLUE, + COLOR_GREEN, + COLOR_RED, + COLOR_RESET, + COLOR_YELLOW, REPOSITORY_TOKEN_FILENAME, GitFlowError, ) @@ -12,18 +17,6 @@ from git_flow.remote.base import RemoteAPI from git_flow.remote.bitbucket import BitbucketRemoteAPI from git_flow.remote.github import GithubRemoteAPI -COLOR_BLACK = "\033[30m" -COLOR_RED = "\033[31m" -COLOR_GREEN = "\033[32m" -COLOR_YELLOW = "\033[33m" -COLOR_BLUE = "\033[34m" -COLOR_5 = "\033[35m" -COLOR_6 = "\033[36m" -COLOR_7 = "\033[37m" -COLOR_BLACK_BOLD = "\033[1;30m" -COLOR_WHITE_BOLD = "\033[1;37m" -COLOR_RESET = "\033[0m" - TYPE_SUCCESS = 0 TYPE_WARNING = 1 TYPE_ERROR = 2 diff --git a/src/git_flow/command/branch.py b/src/git_flow/command/branch.py index a41d732..c5f72c1 100644 --- a/src/git_flow/command/branch.py +++ b/src/git_flow/command/branch.py @@ -1,6 +1,6 @@ from argparse import ArgumentParser, Namespace -from git_flow import GitFlowError -from git_flow.command.base import COLOR_GREEN, COLOR_RED, COLOR_RESET, COLOR_WHITE_BOLD, Command +from git_flow import COLOR_WHITE_BOLD, COLOR_GREEN, COLOR_RED, COLOR_RESET, GitFlowError +from git_flow.command.base import Command from git_flow.git import Git diff --git a/src/git_flow/command/init.py b/src/git_flow/command/init.py index 2cbfab6..f292d6c 100644 --- a/src/git_flow/command/init.py +++ b/src/git_flow/command/init.py @@ -1,5 +1,4 @@ from argparse import Namespace -import os from git_flow import GitFlowError from git_flow.command.base import Command from git_flow.git import FLOWCONFIG_FILE, Git diff --git a/src/git_flow/command/tag.py b/src/git_flow/command/tag.py index eecfdde..4fcac5c 100644 --- a/src/git_flow/command/tag.py +++ b/src/git_flow/command/tag.py @@ -56,7 +56,7 @@ class TagCommand(Command): def get_token_and_ci(self, args: Namespace): try: return (self.ensure_repository_token(), False) - except GitFlowError as e: + except GitFlowError: return (args.token, True) def setup_parser(self, parser: ArgumentParser) -> ArgumentParser: diff --git a/src/git_flow/io.py b/src/git_flow/io.py index dd9951a..fe5db23 100644 --- a/src/git_flow/io.py +++ b/src/git_flow/io.py @@ -1,14 +1,6 @@ import sys - -COLOR_BLACK = '\033[30m' -COLOR_RED = '\033[31m' -COLOR_GREEN = '\033[32m' -COLOR_YELLOW = '\033[33m' -COLOR_BLUE = '\033[34m' -COLOR_BLACK_BOLD = '\033[1;30m' -COLOR_RESET = '\033[0m' - +from git_flow import COLOR_BLACK_BOLD, COLOR_BLUE, COLOR_GREEN, COLOR_RED, COLOR_RESET, COLOR_YELLOW def confirm(prompt, default: bool = True): user_input = input(prompt + (" [Y/n]: " if default else " [y/N]: "))