Skip to content

Commit 7f72e6f

Browse files
committed
[NO TESTS] WIP
1 parent 605af2d commit 7f72e6f

File tree

4 files changed

+21
-18
lines changed

4 files changed

+21
-18
lines changed

py/tests/py_venv_image_layer/my_app_amd64_layers_listing.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2501,7 +2501,7 @@ files:
25012501
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/
25022502
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/
25032503
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/
2504-
- -rwxr-xr-x 0 0 0 1245 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin
2504+
- -rwxr-xr-x 0 0 0 1246 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin
25052505
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/
25062506
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/+uv+whl_install__pypi__default__colorama/
25072507
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/+uv+whl_install__pypi__default__colorama/install/
@@ -2521,14 +2521,14 @@ files:
25212521
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/
25222522
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/
25232523
- -rwxr-xr-x 0 0 0 2503 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/activate
2524-
- -rwxr-xr-x 0 0 0 799896 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/python
2525-
- -rwxr-xr-x 0 0 0 799896 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/python3
2526-
- -rwxr-xr-x 0 0 0 799896 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/python3.9
2524+
- -rwxr-xr-x 0 0 0 4463808 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/python
2525+
- -rwxr-xr-x 0 0 0 4463808 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/python3
2526+
- -rwxr-xr-x 0 0 0 4463808 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/python3.9
25272527
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/lib/
25282528
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/lib/python3.9/
25292529
- -rwxr-xr-x 0 0 0 348 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/pyvenv.cfg
25302530
- -rwxr-xr-x 0 0 0 390 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/__main__.py
2531-
- -rwxr-xr-x 0 0 0 1245 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/my_app_bin
2531+
- -rwxr-xr-x 0 0 0 1246 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/my_app_bin
25322532
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/bazel_tools/
25332533
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/bazel_tools/tools/
25342534
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/bazel_tools/tools/bash/

py/tests/py_venv_image_layer/my_app_arm64_layers_listing.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2482,7 +2482,7 @@ files:
24822482
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/
24832483
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/
24842484
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/
2485-
- -rwxr-xr-x 0 0 0 1245 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin
2485+
- -rwxr-xr-x 0 0 0 1246 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin
24862486
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/
24872487
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/+uv+whl_install__pypi__default__colorama/
24882488
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/+uv+whl_install__pypi__default__colorama/install/
@@ -2502,14 +2502,14 @@ files:
25022502
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/
25032503
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/
25042504
- -rwxr-xr-x 0 0 0 2503 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/activate
2505-
- -rwxr-xr-x 0 0 0 871208 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/python
2506-
- -rwxr-xr-x 0 0 0 871208 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/python3
2507-
- -rwxr-xr-x 0 0 0 871208 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/python3.9
2505+
- -rwxr-xr-x 0 0 0 4531120 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/python
2506+
- -rwxr-xr-x 0 0 0 4531120 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/python3
2507+
- -rwxr-xr-x 0 0 0 4531120 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/python3.9
25082508
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/lib/
25092509
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/lib/python3.9/
25102510
- -rwxr-xr-x 0 0 0 349 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/pyvenv.cfg
25112511
- -rwxr-xr-x 0 0 0 390 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/__main__.py
2512-
- -rwxr-xr-x 0 0 0 1245 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/my_app_bin
2512+
- -rwxr-xr-x 0 0 0 1246 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/my_app_bin
25132513
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/bazel_tools/
25142514
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/bazel_tools/tools/
25152515
- drwxr-xr-x 0 0 0 0 Jan 1 2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/bazel_tools/tools/bash/

py/tools/venv_shim/src/main.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,9 @@ fn main() -> Result<()> {
263263
#[cfg(feature = "debug")]
264264
eprintln!(" {:?}", executable);
265265
} else {
266-
return Err(miette!("Unable to identify the real interpreter path!"));
266+
executable = env::current_exe().unwrap();
267+
#[cfg(feature = "debug")]
268+
eprintln!("Falling back to the libc abspath {:?}", executable);
267269
}
268270
}
269271

uv/private/sdist_build/build_helper.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
from argparse import ArgumentParser
44
import shutil
55
import sys
6-
from os import getenv, listdir, path, execv
7-
from subprocess import check_call, CalledProcessError
6+
from os import getenv
7+
from build.__main__ import main as build
88

99
# Under Bazel, the source dir of a sdist to build is immutable. `build` and
1010
# other tools however are constitutionally incapable of not writing to the
@@ -15,6 +15,8 @@
1515
# - It punts to `build` targeting the tempdir
1616

1717
print(sys.executable, file=sys.stderr)
18+
for e in sys.path:
19+
print(" -", e, file=sys.stderr)
1820

1921
PARSER = ArgumentParser()
2022
PARSER.add_argument("srcdir")
@@ -27,12 +29,11 @@
2729
shutil.copystat = lambda x, y, **k: None
2830
shutil.copytree(opts.srcdir, t, dirs_exist_ok=True)
2931

30-
for e in sys.path:
31-
print(" -", e, file=sys.stderr)
32-
33-
execv(sys.executable, [
34-
"-m", "build",
32+
# 1
33+
34+
build([
3535
"--wheel",
3636
"--no-isolation",
3737
"--outdir", opts.outdir,
38+
t,
3839
])

0 commit comments

Comments
 (0)