Skip to content

Commit edfd9f4

Browse files
alexeaglealexeagle
authored
Revert "pip_compile: remove external/workspace_name prefix from gener… (bazel-contrib#794)
1 parent 5ff0dc8 commit edfd9f4

File tree

15 files changed

+18
-276
lines changed

15 files changed

+18
-276
lines changed

‎.bazelci/presubmit.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,5 @@ platforms:
3636
- "-//gazelle/..."
3737
# The dependencies needed for this test are not cross-platform: https://github.com/bazelbuild/rules_python/issues/260
3838
- "-//tests:pip_repository_entry_points_example"
39-
- "-//tests:pip_deps_example"
4039
test_flags:
4140
- "--test_tag_filters=-fix-windows"

‎examples/pip_install/requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
boto3==1.14.51 \
88
--hash=sha256:a6bdb808e948bd264af135af50efb76253e85732c451fa605b7a287faf022432 \
99
--hash=sha256:f9dbccbcec916051c6588adbccae86547308ac4cd154f1eb7cf6422f0e391a71
10-
# via -r requirements.in
10+
# via -r ./requirements.in
1111
botocore==1.17.63 \
1212
--hash=sha256:40f13f6c9c29c307a9dc5982739e537ddce55b29787b90c3447b507e3283bcd6 \
1313
--hash=sha256:aa88eafc6295132f4bc606f1df32b3248e0fa611724c0a216aceda767948ac75
@@ -77,7 +77,7 @@ pyyaml==6.0 \
7777
s3cmd==2.1.0 \
7878
--hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
7979
--hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
80-
# via -r requirements.in
80+
# via -r ./requirements.in
8181
s3transfer==0.3.7 \
8282
--hash=sha256:35627b86af8ff97e7ac27975fe0a98a312814b46c6333d8a6b889627bcd80994 \
8383
--hash=sha256:efa5bd92a897b6a8d5c1383828dca3d52d0790e0756d49740563a3fb6ed03246
@@ -89,14 +89,14 @@ six==1.16.0 \
8989
tree-sitter==0.20.0 ; sys_platform != "win32" \
9090
--hash=sha256:1940f64be1e8c9c3c0e34a2258f1e4c324207534d5b1eefc5ab2960a9d98f668 \
9191
--hash=sha256:51a609a7c1bd9d9e75d92ee128c12c7852ae70a482900fbbccf3d13a79e0378c
92-
# via -r requirements.in
92+
# via -r ./requirements.in
9393
urllib3==1.25.11 \
9494
--hash=sha256:8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2 \
9595
--hash=sha256:f5321fbe4bf3fefa0efd0bfe7fb14e90909eb62a48ccda331726b4319897dd5e
9696
# via botocore
9797
yamllint==1.26.3 \
9898
--hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
99-
# via -r requirements.in
99+
# via -r ./requirements.in
100100

101101
# The following packages are considered to be unsafe in a requirements file:
102102
setuptools==59.6.0 \

‎examples/pip_install/requirements_windows.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
boto3==1.14.51 \
88
--hash=sha256:a6bdb808e948bd264af135af50efb76253e85732c451fa605b7a287faf022432 \
99
--hash=sha256:f9dbccbcec916051c6588adbccae86547308ac4cd154f1eb7cf6422f0e391a71
10-
# via -r requirements.in
10+
# via -r ./requirements.in
1111
botocore==1.17.63 \
1212
--hash=sha256:40f13f6c9c29c307a9dc5982739e537ddce55b29787b90c3447b507e3283bcd6 \
1313
--hash=sha256:aa88eafc6295132f4bc606f1df32b3248e0fa611724c0a216aceda767948ac75
@@ -77,7 +77,7 @@ pyyaml==6.0 \
7777
s3cmd==2.1.0 \
7878
--hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
7979
--hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
80-
# via -r requirements.in
80+
# via -r ./requirements.in
8181
s3transfer==0.3.7 \
8282
--hash=sha256:35627b86af8ff97e7ac27975fe0a98a312814b46c6333d8a6b889627bcd80994 \
8383
--hash=sha256:efa5bd92a897b6a8d5c1383828dca3d52d0790e0756d49740563a3fb6ed03246
@@ -92,7 +92,7 @@ urllib3==1.25.11 \
9292
# via botocore
9393
yamllint==1.26.3 \
9494
--hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
95-
# via -r requirements.in
95+
# via -r ./requirements.in
9696

9797
# The following packages are considered to be unsafe in a requirements file:
9898
setuptools==59.6.0 \

‎examples/pip_parse/requirements_lock.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ pyyaml==6.0 \
6666
requests==2.25.1 \
6767
--hash=sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804 \
6868
--hash=sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e
69-
# via -r requirements.in
69+
# via -r ./requirements.in
7070
s3cmd==2.1.0 \
7171
--hash=sha256:49cd23d516b17974b22b611a95ce4d93fe326feaa07320bd1d234fed68cbccfa \
7272
--hash=sha256:966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03
73-
# via -r requirements.in
73+
# via -r ./requirements.in
7474
six==1.16.0 \
7575
--hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
7676
--hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
@@ -81,7 +81,7 @@ urllib3==1.26.7 \
8181
# via requests
8282
yamllint==1.26.3 \
8383
--hash=sha256:3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e
84-
# via -r requirements.in
84+
# via -r ./requirements.in
8585

8686
# The following packages are considered to be unsafe in a requirements file:
8787
setuptools==59.6.0 \

‎examples/pip_parse_vendored/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ idna==3.3 \
1919
requests==2.27.1 \
2020
--hash=sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 \
2121
--hash=sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d
22-
# via -r requirements.in
22+
# via -r ./requirements.in
2323
urllib3==1.26.9 \
2424
--hash=sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14 \
2525
--hash=sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e

‎examples/pip_repository_annotations/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
wheel==0.37.1 \
1010
--hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a \
1111
--hash=sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4
12-
# via -r requirements.in
12+
# via -r ./requirements.in

‎python/pip_install/pip_compile.py

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,11 @@ def _select_golden_requirements_file(
3535

3636
parse_str_none = lambda s: None if s == "None" else s
3737

38-
requirements_in = os.path.relpath(sys.argv.pop(1))
39-
requirements_txt = os.path.relpath(sys.argv.pop(1))
38+
requirements_in = sys.argv.pop(1)
39+
requirements_txt = sys.argv.pop(1)
4040
requirements_linux = parse_str_none(sys.argv.pop(1))
4141
requirements_darwin = parse_str_none(sys.argv.pop(1))
4242
requirements_windows = parse_str_none(sys.argv.pop(1))
43-
parts = requirements_in.split(os.path.sep, 2)
44-
if parts[0] == "external":
45-
requirements_in = parts[2]
46-
requirements_txt = (
47-
requirements_txt
48-
if "BUILD_WORKSPACE_DIRECTORY" in os.environ
49-
else os.path.join("..", "..", requirements_txt)
50-
)
51-
os.chdir(os.path.join(parts[0], parts[1]))
5243
update_target_label = sys.argv.pop(1)
5344

5445
# Before loading click, set the locale for its parser.
@@ -83,9 +74,7 @@ def _select_golden_requirements_file(
8374
#
8475
# Changing to the WORKSPACE root avoids 'file not found' errors when the `.update` target is run
8576
# from different directories within the WORKSPACE.
86-
requirements_txt = os.path.join(
87-
os.environ["BUILD_WORKSPACE_DIRECTORY"], requirements_txt
88-
)
77+
os.chdir(os.environ["BUILD_WORKSPACE_DIRECTORY"])
8978
else:
9079
err_msg = (
9180
"Expected to find BUILD_WORKSPACE_DIRECTORY (running under `bazel run`) or "

‎tests/BUILD

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,3 @@ bazel_integration_test(
88
name = "pip_repository_entry_points_example",
99
timeout = "long",
1010
)
11-
12-
bazel_integration_test(
13-
name = "pip_deps_example",
14-
timeout = "long",
15-
)

‎tests/pip_deps/BUILD

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎tests/pip_deps/README.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy