Merge pull request 'feature: remove file parameter on status report' (#48) from feature/prevent-changelog-update into main
Publish to PyPI / Bump-Build-Publish (push) Failing after 16s
Publish to PyPI / Bump-Build-Publish (push) Failing after 16s
Reviewed-on: #48
This commit was merged in pull request #48.
This commit is contained in:
@@ -1,26 +1,24 @@
|
|||||||
import sys
|
from os.path import isfile
|
||||||
|
|
||||||
|
import questionary
|
||||||
|
import rich
|
||||||
|
import rich.panel
|
||||||
|
|
||||||
from git_flow import (
|
from git_flow import (
|
||||||
BRANCH_TYPES,
|
BRANCH_TYPES,
|
||||||
REPOSITORY_TOKEN_FILENAME,
|
COMMIT_TYPES,
|
||||||
FLOWCONFIG_FILENAME,
|
FLOWCONFIG_FILENAME,
|
||||||
FLOWCONFIG_VERSION,
|
FLOWCONFIG_VERSION,
|
||||||
COMMIT_TYPES,
|
REPOSITORY_TOKEN_FILENAME,
|
||||||
GitFlowError,
|
GitFlowError,
|
||||||
)
|
)
|
||||||
from git_flow.git import Git
|
from git_flow.git import Git
|
||||||
|
from git_flow.io import *
|
||||||
from git_flow.remote.base import RemoteAPI
|
from git_flow.remote.base import RemoteAPI
|
||||||
from git_flow.remote.bitbucket import BitbucketRemoteAPI
|
from git_flow.remote.bitbucket import BitbucketRemoteAPI
|
||||||
from git_flow.remote.github import GithubRemoteAPI
|
|
||||||
from git_flow.remote.gitea import GiteaRemoteAPI
|
from git_flow.remote.gitea import GiteaRemoteAPI
|
||||||
|
from git_flow.remote.github import GithubRemoteAPI
|
||||||
from git_flow.remote.gitlab import GitlabRemoteAPI
|
from git_flow.remote.gitlab import GitlabRemoteAPI
|
||||||
from git_flow.io import *
|
|
||||||
from os.path import isfile
|
|
||||||
|
|
||||||
from typing import Optional
|
|
||||||
import rich
|
|
||||||
import rich.panel
|
|
||||||
import questionary
|
|
||||||
|
|
||||||
flowconfig = Git.get_config(FLOWCONFIG_FILENAME) if isfile(FLOWCONFIG_FILENAME) else {}
|
flowconfig = Git.get_config(FLOWCONFIG_FILENAME) if isfile(FLOWCONFIG_FILENAME) else {}
|
||||||
environments = (
|
environments = (
|
||||||
@@ -104,7 +102,7 @@ def ensure_clean_worktree(has_remote: bool):
|
|||||||
if not status:
|
if not status:
|
||||||
return
|
return
|
||||||
|
|
||||||
not_empty = any(map(lambda s: s.index != " " or s.worktree != " ", status))
|
not_empty = any(s.index != " " or s.worktree != " " for s in status)
|
||||||
|
|
||||||
if not_empty:
|
if not_empty:
|
||||||
if not has_remote:
|
if not has_remote:
|
||||||
@@ -164,23 +162,23 @@ def get_commit_message(commit_types: list[str] = COMMIT_TYPES) -> str:
|
|||||||
return commit_type + ": " + commit_message
|
return commit_type + ": " + commit_message
|
||||||
|
|
||||||
|
|
||||||
def io_error(message: str, title: Optional[str] = None):
|
def io_error(message: str, title: str | None = None):
|
||||||
_io_status(message, "✖ Error: ", "red", title, file=sys.stderr)
|
_io_status(message, "✖ Error: ", "red", title)
|
||||||
|
|
||||||
|
|
||||||
def io_warning(message: str, title: Optional[str] = None):
|
def io_warning(message: str, title: str | None = None):
|
||||||
_io_status(message, "⚠ Warning: ", "yellow", title)
|
_io_status(message, "⚠ Warning: ", "yellow", title)
|
||||||
|
|
||||||
|
|
||||||
def io_info(message: str, title: Optional[str] = None):
|
def io_info(message: str, title: str | None = None):
|
||||||
_io_status(message, "ℹ Info: ", "blue", title)
|
_io_status(message, "ℹ Info: ", "blue", title)
|
||||||
|
|
||||||
|
|
||||||
def io_success(message: str, title: Optional[str] = None):
|
def io_success(message: str, title: str | None = None):
|
||||||
_io_status(message, "✔ Success: ", "green", title)
|
_io_status(message, "✔ Success: ", "green", title)
|
||||||
|
|
||||||
|
|
||||||
def _io_status(message: str, prefix: str, style: str, title: Optional[str] = None, file=None):
|
def _io_status(message: str, prefix: str, style: str, title: str | None = None):
|
||||||
if title:
|
if title:
|
||||||
rich.print(
|
rich.print(
|
||||||
rich.panel.Panel(
|
rich.panel.Panel(
|
||||||
@@ -189,8 +187,7 @@ def _io_status(message: str, prefix: str, style: str, title: Optional[str] = Non
|
|||||||
style=style,
|
style=style,
|
||||||
expand=False,
|
expand=False,
|
||||||
title_align="left",
|
title_align="left",
|
||||||
),
|
)
|
||||||
file=file
|
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
rich.print(f"[{style}]{prefix}{message}[/{style}]")
|
rich.print(f"[{style}]{prefix}{message}[/{style}]")
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
from typing import Optional
|
|
||||||
|
|
||||||
import typer
|
import typer
|
||||||
|
|
||||||
from git_flow import (
|
from git_flow import (
|
||||||
|
|||||||
Reference in New Issue
Block a user