pyrox.dev
1diff --git a/tests/functional_tests/t0_main/kfp/wandb_probe.py b/tests/functional_tests/t0_main/kfp/wandb_probe.py
2index 82fadfe1..25c1454c 100644
3--- a/tests/functional_tests/t0_main/kfp/wandb_probe.py
4+++ b/tests/functional_tests/t0_main/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 5767e61c..56009fec 100644
16--- a/wandb/cli/cli.py
17+++ b/wandb/cli/cli.py
18@@ -1919,7 +1919,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 = (
26 """`wandb restore` needs to be run from the same git repository as the original run.
27@@ -1938,7 +1938,7 @@ Run `git clone %s` and restore from there or pass the --no-git flag."""
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@@ -1992,7 +1992,7 @@ Run `git clone %s` and restore from there or pass the --no-git flag."""
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/graphql-core-1.1/wandb_graphql/pyutils/version.py b/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py
46index 614df9f5..38db460b 100644
47--- a/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py
48+++ b/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py
49@@ -67,7 +67,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, stderr=subprocess.PIPE,
56 shell=True, cwd=repo_dir, universal_newlines=True,
57 )