8000 Revert "pip_compile: remove external/workspace_name prefix from gener… · bazel-contrib/rules_python@cf4ef3d · GitHub
[go: up one dir, main page]
Skip to content

Commit cf4ef3d

Browse files
alexeaglealexeagle
committed
Revert "pip_compile: remove external/workspace_name prefix from generated requirements.txt (#690)"
This reverts commit aef17ad.
1 parent e0a7829 commit cf4ef3d

File tree

10 files changed

+5
-263
lines changed

10 files changed

+5
-263
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"

‎.bazelrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# This lets us glob() up all the files inside the examples to make them inputs to tests
44
# (Note, we cannot use `common --deleted_packages` because the bazel version command doesn't support it)
55
# To update these lines, run tools/bazel_integration_test/update_deleted_packages.sh
6-
build --deleted_packages=examples/build_file_generation,examples/bzlmod,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_import,examples/relative_requirements,tests/pip_repository_entry_points,tests/pip_deps
7-
query --deleted_packages=examples/build_file_generation,examples/bzlmod,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/py_import,examples/relative_requirements,tests/pip_repository_entry_points,tests/pip_deps
6+
build --deleted_packages=examples/build_file_generation,examples/bzlmod,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/relative_requirements,examples/wheel,examples/wheel/lib,tests/load_from_macro,tests/pip_repository_entry_points
7+
query --deleted_packages=examples/build_file_generation,examples/bzlmod,examples/pip_install,examples/pip_parse,examples/pip_parse_vendored,examples/pip_repository_annotations,examples/relative_requirements,examples/wheel,examples/wheel/lib,tests/load_from_macro,tests/pip_repository_entry_points
88

99
test --test_output=errors
1010

‎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.

‎tests/pip_deps/WORKSPACE

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

‎tests/pip_deps/pip_deps.bzl

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

‎tests/pip_deps/requirements.txt

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

‎tests/pip_deps/test.sh

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

0 commit comments

Comments
 (0)
0