-
-
Notifications
You must be signed in to change notification settings - Fork 636
fix: correctly obtain relative path required for the venv created by --bootstrap_impl=script
#2439
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
rickeylev
merged 12 commits into
bazel-contrib:main
from
chowder:fix-bootstrap-venv-symlink
Nov 25, 2024
Merged
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
04faacd
fix: correctly count the escapes required for the venv created by scr…
chowder ca1d310
buildifier
chowder f0b36ae
compute relative path from venv bin dir to actual interpreter path
chowder 60d4b91
add tests for relative_path
chowder 74c0b41
add test to demonstrate error
rickeylev 638b521
make relative path computation between two runfiles-root relative pat…
rickeylev d09ad2c
linter cleanup
rickeylev 39e7e5a
update tests to use rules_tests; implement commented out case; update…
rickeylev 6aa8a42
fixup! update tests to use rules_tests; implement commented out case;…
rickeylev 67ec856
loop over len of to
rickeylev 2b362aa
remove parent-dir input tests for relative paths
rickeylev 4720a07
switch back to len(min of parts); avoids OOB array access
rickeylev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,121 @@ | ||
# Copyright 2023 The Bazel Authors. All rights reserved. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
"Unit tests for yaml.bzl" | ||
|
||
load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts", "unittest") | ||
load("//python/private:py_executable_bazel.bzl", "relative_path") # buildifier: disable=bzl-visibility | ||
|
||
def _relative_path_test_impl(ctx): | ||
env = unittest.begin(ctx) | ||
|
||
# Basic test cases | ||
|
||
asserts.equals( | ||
env, | ||
"../../c/d", | ||
relative_path( | ||
from_ = "a/b", | ||
to = "c/d", | ||
), | ||
) | ||
|
||
asserts.equals( | ||
env, | ||
"../../c/d", | ||
relative_path( | ||
from_ = "../a/b", | ||
to = "../c/d", | ||
), | ||
) | ||
|
||
asserts.equals( | ||
env, | ||
"../../../c/d", | ||
relative_path( | ||
from_ = "../a/b", | ||
to = "../../c/d", | ||
), | ||
) | ||
|
||
asserts.equals( | ||
env, | ||
"../../d", | ||
relative_path( | ||
from_ = "a/b/c", | ||
to = "a/d", | ||
), | ||
) | ||
|
||
asserts.equals( | ||
env, | ||
"d/e", | ||
relative_path( | ||
from_ = "a/b/c", | ||
to = "a/b/c/d/e", | ||
), | ||
) | ||
|
||
# Real examples | ||
|
||
# external py_binary uses external python runtime | ||
asserts.equals( | ||
env, | ||
"../../../../../rules_python~~python~python_3_9_x86_64-unknown-linux-gnu/bin/python3", | ||
relative_path( | ||
from_ = "../rules_python~/python/private/_py_console_script_gen_py.venv/bin", | ||
to = "../rules_python~~python~python_3_9_x86_64-unknown-linux-gnu/bin/python3", | ||
), | ||
) | ||
|
||
# internal py_binary uses external python runtime | ||
asserts.equals( | ||
env, | ||
"../../../../rules_python~~python~python_3_9_x86_64-unknown-linux-gnu/bin/python3", | ||
relative_path( | ||
from_ = "test/version_default.venv/bin", | ||
to = "../rules_python~~python~python_3_9_x86_64-unknown-linux-gnu/bin/python3", | ||
), | ||
) | ||
|
||
# external py_binary uses internal python runtime | ||
# asserts.equals( | ||
# env, | ||
# "???", | ||
# relative_path( | ||
# from_ = "../rules_python~/python/private/_py_console_script_gen_py.venv/bin", | ||
# to = "python/python_3_9_x86_64-unknown-linux-gnu/bin/python3", | ||
# ), | ||
#) | ||
# ^ TODO: Technically we can infer ".." to be the workspace name? | ||
|
||
# internal py_binary uses internal python runtime | ||
asserts.equals( | ||
env, | ||
"../../../python/python_3_9_x86_64-unknown-linux-gnu/bin/python3", | ||
relative_path( | ||
from_ = "scratch/main.venv/bin", | ||
to = "python/python_3_9_x86_64-unknown-linux-gnu/bin/python3", | ||
), | ||
) | ||
|
||
return unittest.end(env) | ||
|
||
relative_path_test = unittest.make( | ||
_relative_path_test_impl, | ||
attrs = {}, | ||
) | ||
|
||
def relative_path_test_suite(name): | ||
unittest.suite(name, relative_path_test) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.