Revert "pip_compile: remove external/workspace_name prefix from gener… (

bazelbuild#794)
ianpegg-bc · May 12, 2023 · 9a0cf9c · 9a0cf9c
1 parent f3a8bc9
commit 9a0cf9c
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 276 deletions.
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -36,6 +36,5 @@ platforms:
       - "-//gazelle/..."
       # The dependencies needed for this test are not cross-platform: https://github.com/bazelbuild/rules_python/issues/260
       - "-//tests:pip_repository_entry_points_example"
-      - "-//tests:pip_deps_example"
     test_flags:
       - "--test_tag_filters=-fix-windows"
diff --git a/examples/pip_install/requirements.txt b/examples/pip_install/requirements.txt
@@ -7,7 +7,7 @@
 boto3==1.14.51 \
     --hash=sha256:a6bdb808e948bd264af135af50efb76253e85732c451fa605b7a287faf022432 \
     --hash=sha256:f9dbccbcec916051c6588adbccae86547308ac4cd154f1eb7cf6422f0e391a71
-    # via -r requirements.in
+    # via -r ./requirements.in
 botocore==1.17.63 \
     --hash=sha256:40f13f6c9c29c307a9dc5982739e537ddce55b29787b90c3447b507e3283bcd6 \
     --hash=sha256:aa88eafc6295132f4bc606f1df32b3248e0fa611724c0a216aceda767948ac75
@@ -77,7 +77,7 @@ pyyaml==6.0 \
 s3cmd==2.1.0 \
     --hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
     --hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
-    # via -r requirements.in
+    # via -r ./requirements.in
 s3transfer==0.3.7 \
     --hash=sha256:35627b86af8ff97e7ac27975fe0a98a312814b46c6333d8a6b889627bcd80994 \
     --hash=sha256:efa5bd92a897b6a8d5c1383828dca3d52d0790e0756d49740563a3fb6ed03246
@@ -89,14 +89,14 @@ six==1.16.0 \
 tree-sitter==0.20.0 ; sys_platform != "win32" \
     --hash=sha256:1940f64be1e8c9c3c0e34a2258f1e4c324207534d5b1eefc5ab2960a9d98f668 \
     --hash=sha256:51a609a7c1bd9d9e75d92ee128c12c7852ae70a482900fbbccf3d13a79e0378c
-    # via -r requirements.in
+    # via -r ./requirements.in
 urllib3==1.25.11 \
     --hash=sha256:8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2 \
     --hash=sha256:f5321fbe4bf3fefa0efd0bfe7fb14e90909eb62a48ccda331726b4319897dd5e
     # via botocore
 yamllint==1.26.3 \
     --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
-    # via -r requirements.in
+    # via -r ./requirements.in
 
 # The following packages are considered to be unsafe in a requirements file:
 setuptools==59.6.0 \

diff --git a/examples/pip_install/requirements_windows.txt b/examples/pip_install/requirements_windows.txt
@@ -7,7 +7,7 @@
 boto3==1.14.51 \
     --hash=sha256:a6bdb808e948bd264af135af50efb76253e85732c451fa605b7a287faf022432 \
     --hash=sha256:f9dbccbcec916051c6588adbccae86547308ac4cd154f1eb7cf6422f0e391a71
-    # via -r requirements.in
+    # via -r ./requirements.in
 botocore==1.17.63 \
     --hash=sha256:40f13f6c9c29c307a9dc5982739e537ddce55b29787b90c3447b507e3283bcd6 \
     --hash=sha256:aa88eafc6295132f4bc606f1df32b3248e0fa611724c0a216aceda767948ac75
@@ -77,7 +77,7 @@ pyyaml==6.0 \
 s3cmd==2.1.0 \
     --hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
     --hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
-    # via -r requirements.in
+    # via -r ./requirements.in
 s3transfer==0.3.7 \
     --hash=sha256:35627b86af8ff97e7ac27975fe0a98a312814b46c6333d8a6b889627bcd80994 \
     --hash=sha256:efa5bd92a897b6a8d5c1383828dca3d52d0790e0756d49740563a3fb6ed03246
@@ -92,7 +92,7 @@ urllib3==1.25.11 \
     # via botocore
 yamllint==1.26.3 \
     --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
-    # via -r requirements.in
+    # via -r ./requirements.in
 
 # The following packages are considered to be unsafe in a requirements file:
 setuptools==59.6.0 \

diff --git a/examples/pip_parse/requirements_lock.txt b/examples/pip_parse/requirements_lock.txt
@@ -66,11 +66,11 @@ pyyaml==6.0 \
 requests==2.25.1 \
     --hash=sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804 \
     --hash=sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e
-    # via -r requirements.in
+    # via -r ./requirements.in
 s3cmd==2.1.0 \
     --hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
     --hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
-    # via -r requirements.in
+    # via -r ./requirements.in
 six==1.16.0 \
     --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
     --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
@@ -81,7 +81,7 @@ urllib3==1.26.7 \
     # via requests
 yamllint==1.26.3 \
     --hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
-    # via -r requirements.in
+    # via -r ./requirements.in
 
 # The following packages are considered to be unsafe in a requirements file:
 setuptools==59.6.0 \

diff --git a/examples/pip_parse_vendored/requirements.txt b/examples/pip_parse_vendored/requirements.txt
@@ -19,7 +19,7 @@ idna==3.3 \
 requests==2.27.1 \
     --hash=sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 \
     --hash=sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d
-    # via -r requirements.in
+    # via -r ./requirements.in
 urllib3==1.26.9 \
     --hash=sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14 \
     --hash=sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e

diff --git a/examples/pip_repository_annotations/requirements.txt b/examples/pip_repository_annotations/requirements.txt
@@ -9,4 +9,4 @@
 wheel==0.37.1 \
     --hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a \
     --hash=sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4
-    # via -r requirements.in
+    # via -r ./requirements.in
diff --git a/python/pip_install/pip_compile.py b/python/pip_install/pip_compile.py
@@ -35,20 +35,11 @@ def _select_golden_requirements_file(
 
     parse_str_none = lambda s: None if s == "None" else s
 
-    requirements_in = os.path.relpath(sys.argv.pop(1))
-    requirements_txt = os.path.relpath(sys.argv.pop(1))
+    requirements_in = sys.argv.pop(1)
+    requirements_txt = sys.argv.pop(1)
     requirements_linux = parse_str_none(sys.argv.pop(1))
     requirements_darwin = parse_str_none(sys.argv.pop(1))
     requirements_windows = parse_str_none(sys.argv.pop(1))
-    parts = requirements_in.split(os.path.sep, 2)
-    if parts[0] == "external":
-        requirements_in = parts[2]
-        requirements_txt = (
-            requirements_txt
-            if "BUILD_WORKSPACE_DIRECTORY" in os.environ
-            else os.path.join("..", "..", requirements_txt)
-        )
-        os.chdir(os.path.join(parts[0], parts[1]))
     update_target_label = sys.argv.pop(1)
 
     # Before loading click, set the locale for its parser.
@@ -83,9 +74,7 @@ def _select_golden_requirements_file(
         #
         # Changing to the WORKSPACE root avoids 'file not found' errors when the `.update` target is run
         # from different directories within the WORKSPACE.
-        requirements_txt = os.path.join(
-            os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt
-        )
+        os.chdir(os.environ["BUILD_WORKSPACE_DIRECTORY"])
     else:
         err_msg = (
             "Expected to find BUILD_WORKSPACE_DIRECTORY (running under `bazel run`) or "

diff --git a/tests/BUILD b/tests/BUILD
@@ -8,8 +8,3 @@ bazel_integration_test(
     name = "pip_repository_entry_points_example",
     timeout = "long",
 )
-
-bazel_integration_test(
-    name = "pip_deps_example",
-    timeout = "long",
-)
diff --git a/tests/pip_deps/BUILD b/tests/pip_deps/BUILD
diff --git a/tests/pip_deps/README.md b/tests/pip_deps/README.md
diff --git a/tests/pip_deps/WORKSPACE b/tests/pip_deps/WORKSPACE
diff --git a/tests/pip_deps/pip_deps.bzl b/tests/pip_deps/pip_deps.bzl
diff --git a/tests/pip_deps/requirements.txt b/tests/pip_deps/requirements.txt
diff --git a/tests/pip_deps/test.sh b/tests/pip_deps/test.sh