Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 29a1607

Browse filesBrowse files
alexeaglealexeagle
committed
Revert "pip_compile: remove external/workspace_name prefix from generated requirements.txt (#690)"
This reverts commit aef17ad.
1 parent e0a7829 commit 29a1607
Copy full SHA for 29a1607

File tree

Expand file treeCollapse file tree

10 files changed

+4
-260
lines changed
Filter options
Expand file treeCollapse file tree

10 files changed

+4
-260
lines changed

‎.bazelci/presubmit.yml

Copy file name to clipboardExpand all lines: .bazelci/presubmit.yml
-1Lines 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

Copy file name to clipboardExpand all lines: .bazelrc
+2-2Lines 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

Copy file name to clipboardExpand all lines: python/pip_install/pip_compile.py
+2-11Lines changed: 2 additions & 11 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.

‎tests/BUILD

Copy file name to clipboardExpand all lines: tests/BUILD
-5Lines 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

Copy file name to clipboardExpand all lines: tests/pip_deps/BUILD
-19Lines changed: 0 additions & 19 deletions
This file was deleted.

‎tests/pip_deps/README.md

Copy file name to clipboardExpand all lines: tests/pip_deps/README.md
-1Lines changed: 0 additions & 1 deletion
This file was deleted.

‎tests/pip_deps/WORKSPACE

Copy file name to clipboardExpand all lines: tests/pip_deps/WORKSPACE
-26Lines changed: 0 additions & 26 deletions
This file was deleted.

‎tests/pip_deps/pip_deps.bzl

Copy file name to clipboardExpand all lines: tests/pip_deps/pip_deps.bzl
-55Lines changed: 0 additions & 55 deletions
This file was deleted.

‎tests/pip_deps/requirements.txt

Copy file name to clipboardExpand all lines: tests/pip_deps/requirements.txt
-136Lines changed: 0 additions & 136 deletions
This file was deleted.

‎tests/pip_deps/test.sh

Copy file name to clipboardExpand all lines: tests/pip_deps/test.sh
-4Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.