chore: Respect environment variables when calling check_call (#2741)

achals · web-flow · commit 92c1f342a4f0 · 2022-05-27T16:33:43.000-07:00
Signed-off-by: Achal Shah &lt;achals@gmail.com&gt;
diff --git a/setup.py b/setup.py
@@ -249,6 +249,7 @@ def _generate_python_protos(self, path: str):
                 self.python_folder,
             ]
             + proto_files,
+            env=os.environ
         )
 
     def run(self):
@@ -334,6 +335,8 @@ def _generate_go_protos(self, path: str):
         proto_files = glob.glob(os.path.join(self.proto_folder, path))
 
         try:
+            e = os.environ.copy()
+            e["PATH"] = self.path_val
             subprocess.check_call(
                 self.go_protoc
                 + [
@@ -347,7 +350,7 @@ def _generate_go_protos(self, path: str):
                     "--go-grpc_opt=module=github.com/feast-dev/feast/go/protos",
                 ]
                 + proto_files,
-                env={"PATH": self.path_val},
+                env=e,
             )
         except CalledProcessError as e:
             print(f"Stderr: {e.stderr}")

Original file line number	Diff line number	Diff line change
`@@ -249,6 +249,7 @@ def _generate_python_protos(self, path: str):`
`249`	`249`	`self.python_folder,`
`250`	`250`	`]`
`251`	`251`	`+ proto_files,`
	`252`	`+ env=os.environ`
`252`	`253`	`)`
`253`	`254`
`254`	`255`	`def run(self):`
`@@ -334,6 +335,8 @@ def _generate_go_protos(self, path: str):`
`334`	`335`	`proto_files = glob.glob(os.path.join(self.proto_folder, path))`
`335`	`336`
`336`	`337`	`try:`
	`338`	`+ e = os.environ.copy()`
	`339`	`+ e["PATH"] = self.path_val`
`337`	`340`	`subprocess.check_call(`
`338`	`341`	`self.go_protoc`
`339`	`342`	`+ [`
`@@ -347,7 +350,7 @@ def _generate_go_protos(self, path: str):`
`347`	`350`	`"--go-grpc_opt=module=github.com/feast-dev/feast/go/protos",`
`348`	`351`	`]`
`349`	`352`	`+ proto_files,`
`350`		`- env={"PATH": self.path_val},`
	`353`	`+ env=e,`
`351`	`354`	`)`
`352`	`355`	`except CalledProcessError as e:`
`353`	`356`	`print(f"Stderr: {e.stderr}")`