Use JSON to communicate extra_pip_args to extract_wheels (bazel-contrib#50)

gergelyfabian · web-flow · commit bd1f4be581ff · 2020-08-16T19:00:16.000+10:00
diff --git a/defs.bzl b/defs.bzl
@@ -37,7 +37,7 @@ def _pip_repository_impl(rctx):
     if rctx.attr.extra_pip_args:
         args += [
             "--extra_pip_args",
-            "\"" + " ".join(rctx.attr.extra_pip_args) + "\"",
+            struct(args = rctx.attr.extra_pip_args).to_json(),
         ]
 
     if rctx.attr.pip_data_exclude:
diff --git a/extract_wheels/__init__.py b/extract_wheels/__init__.py
@@ -75,7 +75,7 @@ def main() -> None:
 
     pip_args = [sys.executable, "-m", "pip", "wheel", "-r", args.requirements]
     if args.extra_pip_args:
-        pip_args += args.extra_pip_args.strip("\"").split()
+        pip_args += json.loads(args.extra_pip_args)["args"]
     # Assumes any errors are logged by pip so do nothing. This command will fail if pip fails
     subprocess.run(pip_args, check=True)
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ def _pip_repository_impl(rctx):`
`37`	`37`	`if rctx.attr.extra_pip_args:`
`38`	`38`	`args += [`
`39`	`39`	`"--extra_pip_args",`
`40`		`- "\"" + " ".join(rctx.attr.extra_pip_args) + "\"",`
	`40`	`+ struct(args = rctx.attr.extra_pip_args).to_json(),`
`41`	`41`	`]`
`42`	`42`
`43`	`43`	`if rctx.attr.pip_data_exclude:`