diff --git a/src/git_flow/command/commit.py b/src/git_flow/command/commit.py index fb49482..a7834d6 100644 --- a/src/git_flow/command/commit.py +++ b/src/git_flow/command/commit.py @@ -1,8 +1,10 @@ -import typer from datetime import datetime -from git_flow import COMMIT_TYPES, TRASH_BRANCH_PREFIX, WIP_BRANCH_PREFIX, GitFlowError -from git_flow.git import Git + +import typer + import git_flow.command.base as base +from git_flow import TRASH_BRANCH_PREFIX, WIP_BRANCH_PREFIX, GitFlowError +from git_flow.git import Git app = typer.Typer() @@ -21,7 +23,7 @@ def commit(): raise GitFlowError("Debe agregar algún cambio al indice para continuar.") message = base.get_commit_message() - commit_type = message[:message.index(':')] + commit_type = message[: message.index(":")] if branch.startswith(WIP_BRANCH_PREFIX): original_branch = branch.removeprefix(WIP_BRANCH_PREFIX) diff --git a/src/git_flow/command/init.py b/src/git_flow/command/init.py index 3b0b7f3..24db201 100644 --- a/src/git_flow/command/init.py +++ b/src/git_flow/command/init.py @@ -1,8 +1,8 @@ import typer +import git_flow.command.base as base from git_flow import FLOWCONFIG_FILENAME, FLOWCONFIG_VERSION, GitFlowError from git_flow.git import Git -import git_flow.command.base as base app = typer.Typer() diff --git a/src/git_flow/command/merge.py b/src/git_flow/command/merge.py index 89488df..54e19e6 100644 --- a/src/git_flow/command/merge.py +++ b/src/git_flow/command/merge.py @@ -1,7 +1,8 @@ import typer + +import git_flow.command.base as base from git_flow import GitFlowError from git_flow.changelog import Changelog -import git_flow.command.base as base from git_flow.git import Git app = typer.Typer() @@ -91,7 +92,7 @@ def check_merge_conflicts(target: str): f"La rama actual tiene conflictos con {target}.\n" f"Se recomienda mergear {target} a la rama actual, resolver los conflictos localmente,\n" "y ejecutar nuevamente este comando", - title = "Conflictos de merge", + title="Conflictos de merge", ) raise GitFlowError("Ejecución abortada.") else: diff --git a/src/git_flow/command/new.py b/src/git_flow/command/new.py index bab96e5..0dee72b 100644 --- a/src/git_flow/command/new.py +++ b/src/git_flow/command/new.py @@ -1,9 +1,11 @@ -import typer -from git_flow import BRANCH_TYPES -import git_flow.command.base as base -from git_flow.git import Git from typing import Optional +import typer + +import git_flow.command.base as base +from git_flow import BRANCH_TYPES +from git_flow.git import Git + app = typer.Typer() diff --git a/src/git_flow/command/release.py b/src/git_flow/command/release.py index 41b6ff4..367d18b 100644 --- a/src/git_flow/command/release.py +++ b/src/git_flow/command/release.py @@ -1,8 +1,10 @@ +from typing import Optional + +import typer + +import git_flow.command.base as base from git_flow import COMMIT_TYPES, GitFlowError from git_flow.git import Git -from typing import Optional -import typer -import git_flow.command.base as base app = typer.Typer() diff --git a/src/git_flow/command/tag.py b/src/git_flow/command/tag.py index 1c652ea..0100c42 100644 --- a/src/git_flow/command/tag.py +++ b/src/git_flow/command/tag.py @@ -1,3 +1,8 @@ +from typing import Optional + +import typer + +import git_flow.command.base as base from git_flow import ( COMMIT_TYPE_INCREMENT, SEMVER_MAJOR, @@ -7,10 +12,7 @@ from git_flow import ( GitFlowError, ) from git_flow.changelog import Changelog -import git_flow.command.base as base from git_flow.git import Git -from typing import Optional -import typer app = typer.Typer()