Skip to content

Commit 67a1039

Browse files
committed
windows: install venvlauncher and venvwlauncher executables
So the distribution is more feature complete. This allows test_venv to pass.
1 parent 6b90437 commit 67a1039

File tree

2 files changed

+4
-31
lines changed

2 files changed

+4
-31
lines changed

cpython-windows/build.py

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,7 @@ def hack_project_files(
830830

831831
copy_link_to_lib(pythoncore_proj)
832832

833-
# We don't need to produce pythonw.exe, python_uwp.exe, venvlauncher.exe,
833+
# We don't need to produce pythonw.exe and python_uwp.exe
834834
# and their *w variants. Or the python3.dll, pyshellext, or pylauncher.
835835
# Cut them from the build to save time and so their presence doesn't
836836
# interfere with packaging up the build artifacts.
@@ -847,16 +847,6 @@ def hack_project_files(
847847
b'<Projects2 Include="python_uwp.vcxproj;pythonw_uwp.vcxproj" Condition="$(IncludeUwp)" />',
848848
b"",
849849
)
850-
static_replace_in_file(
851-
pcbuild_proj,
852-
b'<Projects Include="venvlauncher.vcxproj;venvwlauncher.vcxproj" />',
853-
b"",
854-
)
855-
static_replace_in_file(
856-
pcbuild_proj,
857-
b'<Projects2 Include="venvlauncher.vcxproj;venvwlauncher.vcxproj" />',
858-
b"",
859-
)
860850
if static:
861851
static_replace_in_file(
862852
pcbuild_proj, b'<Projects Include="python3dll.vcxproj" />', b""
@@ -1054,18 +1044,6 @@ def hack_source_files(source_path: pathlib.Path, static: bool):
10541044
b"",
10551045
)
10561046

1057-
# We don't produce venvlauncher executables.
1058-
static_replace_in_file(
1059-
layout_main,
1060-
b'yield from in_build("venvlauncher.exe", "Lib/venv/scripts/nt/", "python")',
1061-
b"pass",
1062-
)
1063-
static_replace_in_file(
1064-
layout_main,
1065-
b'yield from in_build("venvwlauncher.exe", "Lib/venv/scripts/nt/", "pythonw")',
1066-
b"pass",
1067-
)
1068-
10691047

10701048
def run_msbuild(
10711049
msbuild: pathlib.Path,
@@ -1257,6 +1235,9 @@ def collect_python_build_artifacts(
12571235
ignore_projects = {
12581236
# We don't care about build artifacts for the python executable.
12591237
"python",
1238+
# Don't care about venvlauncher executable.
1239+
"venvlauncher",
1240+
"venvwlauncher",
12601241
# Test extensions.
12611242
"_ctypes_test",
12621243
"_testbuffer",

docs/status.rst

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,6 @@ This fails in the following manner::
144144

145145
This seems like a minor issue and might be a bug in the test itself.
146146

147-
``test_venv``
148-
-------------
149-
150-
Known failing on: Windows
151-
152-
This appears to be failing due to missing ``venvlauncher.exe``, which we don't
153-
currently build. (But we could.)
154-
155147
``test_winconsoleio``
156148
---------------------
157149

0 commit comments

Comments
 (0)