apply PR comments

Author: dillon-giacoppo

README.md

@@ -12,7 +12,7 @@ boto3==1.9.253
 
 In `WORKSPACE`
 
-```
+```python
 rules_python_external_version = "{COMMIT_SHA}"
 
 http_archive(
@@ -28,14 +28,14 @@ rules_python_external_dependencies()
 
 load("@rules_python_external//:defs.bzl", "pip_install")
 pip_install(
-    name = "py_deps"
+    name = "py_deps",
     requirements = "//:requirements.txt",
 )
 ```
 
 Example `BUILD` file.
 
-```
+```python
 load("@py_deps//:requirements.bzl", "requirement")
 
 py_binary(

defs.bzl

@@ -9,6 +9,15 @@ def _pip_repository_impl(rctx):
 
     rctx.file("BUILD", "")
 
+    # Get the root directory of these rules
+    rules_root = rctx.path(Label("//:BUILD")).dirname
+    thirdparty_roots = [
+        # Includes all the external dependencies from repositories.bzl
+        rctx.path(Label("@" + repo + "//:BUILD.bazel")).dirname
+        for repo in all_requirements
+    ]
+    pypath = ":".join([str(p) for p in [rules_root] + thirdparty_roots])
+
     result = rctx.execute(
         [
             rctx.which(rctx.attr.python_interpreter),
@@ -20,14 +29,7 @@ def _pip_repository_impl(rctx):
         ],
         environment={
             # Manually construct the PYTHONPATH since we cannot use the toolchain here
-            "PYTHONPATH": ":".join(
-                # Includes the root of this repo and all the external dependencies from repositories.bzl
-                [str(rctx.path(rctx.attr._script).dirname.dirname)]
-                + [
-                    str(rctx.path(Label("@" + repo + "//:BUILD.bazel")).dirname)
-                    for repo in all_requirements
-                ]
-            )
+            "PYTHONPATH": pypath
         },
     )
     if result.return_code: