at master 2.8 kB view raw
1diff --git a/landfill/functional_tests/kfp/wandb_probe.py b/landfill/functional_tests/kfp/wandb_probe.py 2index 86b18a438..23e237e3b 100644 3--- a/landfill/functional_tests/kfp/wandb_probe.py 4+++ b/landfill/functional_tests/kfp/wandb_probe.py 5@@ -5,7 +5,7 @@ import subprocess 6 def wandb_probe_package(): 7 if not os.environ.get("WB_PROBE_PACKAGE"): 8 return 9- s, o = subprocess.getstatusoutput("git rev-parse HEAD") 10+ s, o = subprocess.getstatusoutput("@git@ rev-parse HEAD") 11 if s: 12 return 13 wandb_local = f"git+https://github.com/wandb/wandb.git@{o}#egg=wandb" 14diff --git a/wandb/cli/cli.py b/wandb/cli/cli.py 15index 1453100cc..9dc468201 100644 16--- a/wandb/cli/cli.py 17+++ b/wandb/cli/cli.py 18@@ -2531,7 +2531,7 @@ def restore(ctx, run, no_git, branch, project, entity): 19 commit, json_config, patch_content, metadata = api.run_config( 20 project, run=run, entity=entity 21 ) 22- repo = metadata.get("git", {}).get("repo") 23+ repo = metadata.get("@git@", {}).get("repo") 24 image = metadata.get("docker") 25 restore_message = """`wandb restore` needs to be run from the same git repository as the original run. 26 Run `git clone {}` and restore from there or pass the --no-git flag.""".format(repo) 27@@ -2547,7 +2547,7 @@ Run `git clone {}` and restore from there or pass the --no-git flag.""".format(r 28 29 if commit and api.git.enabled: 30 wandb.termlog(f"Fetching origin and finding commit: {commit}") 31- subprocess.check_call(["git", "fetch", "--all"]) 32+ subprocess.check_call(["@git@", "fetch", "--all"]) 33 try: 34 api.git.repo.commit(commit) 35 except ValueError: 36@@ -2604,7 +2604,7 @@ Run `git clone {}` and restore from there or pass the --no-git flag.""".format(r 37 # --reject is necessary or else this fails any time a binary file 38 # occurs in the diff 39 exit_code = subprocess.call( 40- ["git", "apply", "--reject", patch_rel_path], cwd=root 41+ ["@git@", "apply", "--reject", patch_rel_path], cwd=root 42 ) 43 if exit_code == 0: 44 wandb.termlog("Applied patch") 45diff --git a/wandb/vendor/promise-2.3.0/wandb_promise/pyutils/version.py b/wandb/vendor/promise-2.3.0/wandb_promise/pyutils/version.py 46index 47d439145..16118feb0 100644 47--- a/wandb/vendor/promise-2.3.0/wandb_promise/pyutils/version.py 48+++ b/wandb/vendor/promise-2.3.0/wandb_promise/pyutils/version.py 49@@ -69,7 +69,7 @@ def get_git_changeset(): 50 repo_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) 51 try: 52 git_log = subprocess.Popen( 53- "git log --pretty=format:%ct --quiet -1 HEAD", 54+ "@git@ log --pretty=format:%ct --quiet -1 HEAD", 55 stdout=subprocess.PIPE, 56 stderr=subprocess.PIPE, 57 shell=True,