From 402a2ee3f9f04e4f5789f238d1958107c1d103c4 Mon Sep 17 00:00:00 2001 From: Julian Kuners Date: Wed, 21 May 2025 18:29:05 +0200 Subject: [PATCH 1/3] fix branch for installed packages --- src/kup/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/kup/package.py b/src/kup/package.py index 7222a77..1783886 100644 --- a/src/kup/package.py +++ b/src/kup/package.py @@ -246,12 +246,13 @@ def __init__( access_token: Optional[str] = None, substituters: Optional[list[str]] = None, public_keys: Optional[list[str]] = None, + update_branch: Optional[str] = None, ): self.commit = commit self.status = status self.index = index self.tag = tag - super().__init__(org, repo, package, None, ssh_git, access_token, substituters, public_keys) + super().__init__(org, repo, package, update_branch, ssh_git, access_token, substituters, public_keys) @property def concrete_repo_path_with_access(self) -> Tuple[str, List[str]]: @@ -321,6 +322,7 @@ def parse(url: str, package: GithubPackage, idx: Union[int, str], load_versions: tag, idx, package.ssh_git, + update_branch=package.branch, ) From 5e13b47494e44a8412a3e040fe60a13b52d60a04 Mon Sep 17 00:00:00 2001 From: Julian Kuners Date: Wed, 21 May 2025 18:29:31 +0200 Subject: [PATCH 2/3] print proper branch during install --- src/kup/__main__.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/kup/__main__.py b/src/kup/__main__.py index ddbfb26..d17f937 100644 --- a/src/kup/__main__.py +++ b/src/kup/__main__.py @@ -516,7 +516,13 @@ def install_package( ) verb = 'updated' if package_name.base in installed_packages else 'installed' - display_version = f' ({package_version})' if package_version else ' (master)' + if package_version is not None: + display_version = package_version + elif package.branch is not None: + display_version = package.branch + else: + display_version = 'master' + display_version = f' ({display_version})' rich.print( f" ✅ Successfully {verb} '[green]{package_name.base}[/]' version [blue]{package.uri}{display_version}[/]." ) From 2d656a3a01348e71a7a205c6ccdac6bfc51bbe10 Mon Sep 17 00:00:00 2001 From: Julian Kuners Date: Wed, 21 May 2025 19:14:56 +0200 Subject: [PATCH 3/3] rather print no branch in edge case than assuming "master" --- src/kup/__main__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/kup/__main__.py b/src/kup/__main__.py index d17f937..2866994 100644 --- a/src/kup/__main__.py +++ b/src/kup/__main__.py @@ -516,13 +516,15 @@ def install_package( ) verb = 'updated' if package_name.base in installed_packages else 'installed' + if package_version is not None: display_version = package_version elif package.branch is not None: display_version = package.branch else: - display_version = 'master' - display_version = f' ({display_version})' + display_version = None + display_version = f' ({display_version})' if display_version is not None else '' + rich.print( f" ✅ Successfully {verb} '[green]{package_name.base}[/]' version [blue]{package.uri}{display_version}[/]." )