From fd8dd1318430a3e4154d0d36735ad718733d9c84 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Tue, 17 Jan 2023 14:00:02 -0800 Subject: [PATCH 1/2] warning if git is not installed Signed-off-by: Kevin Su --- flytekit/remote/remote.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/flytekit/remote/remote.py b/flytekit/remote/remote.py index 23c9803b07..eb97105669 100644 --- a/flytekit/remote/remote.py +++ b/flytekit/remote/remote.py @@ -19,8 +19,6 @@ from flyteidl.admin.signal_pb2 import Signal, SignalListRequest, SignalSetRequest from flyteidl.core import literals_pb2 as literals_pb2 -from git import Repo - from flytekit import Literal from flytekit.clients.friendly import SynchronousFlyteClient from flytekit.clients.helpers import iterate_node_executions, iterate_task_executions @@ -127,9 +125,13 @@ def _get_git_repo_url(source_path): Get git repo URL from remote.origin.url """ try: + from git import Repo return "github.com/" + Repo(source_path).remotes.origin.url.split(".git")[0].split(":")[-1] + except ImportError: + remote_logger.warning("Could not import git. is the git executable installed?") except Exception: # If the file isn't in the git repo, we can't get the url from git config + remote_logger.debug(f"{source_path} is not a git repo.") return "" From cd2425657668d0584879386e4e3eb285153903a3 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Tue, 17 Jan 2023 16:46:16 -0800 Subject: [PATCH 2/2] lint Signed-off-by: Kevin Su --- flytekit/remote/remote.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flytekit/remote/remote.py b/flytekit/remote/remote.py index eb97105669..d8263a8812 100644 --- a/flytekit/remote/remote.py +++ b/flytekit/remote/remote.py @@ -19,6 +19,7 @@ from flyteidl.admin.signal_pb2 import Signal, SignalListRequest, SignalSetRequest from flyteidl.core import literals_pb2 as literals_pb2 + from flytekit import Literal from flytekit.clients.friendly import SynchronousFlyteClient from flytekit.clients.helpers import iterate_node_executions, iterate_task_executions @@ -126,6 +127,7 @@ def _get_git_repo_url(source_path): """ try: from git import Repo + return "github.com/" + Repo(source_path).remotes.origin.url.split(".git")[0].split(":")[-1] except ImportError: remote_logger.warning("Could not import git. is the git executable installed?")