Skip to content

Commit 531e576

Browse files
Fix upgrade embeded crashes (#2062)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent d9725b7 commit 531e576

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

docs/changelog/2058.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Running virtualenv ``--upgrade-embed-wheels`` crashes - by :user:`gaborbernat`.

src/virtualenv/seed/wheels/periodic_update.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import json
88
import logging
9+
import os
910
import ssl
1011
import subprocess
1112
import sys
@@ -235,6 +236,7 @@ def _run_do_update(app_data, distribution, embed_filename, for_py_version, perio
235236
search_dirs=search_dirs,
236237
app_data=app_data,
237238
to_folder=wheelhouse,
239+
env=os.environ,
238240
)
239241
if dest is None or (u_log.versions and u_log.versions[0].filename == dest.name):
240242
break

tests/unit/seed/wheels/test_periodic_update.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ def test_do_update_first(tmp_path, mocker, freezer):
300300
]
301301
download_wheels = (Wheel(Path(i[0])) for i in pip_version_remote)
302302

303-
def _download_wheel(distribution, version_spec, for_py_version, search_dirs, app_data, to_folder):
303+
def _download_wheel(distribution, version_spec, for_py_version, search_dirs, app_data, to_folder, env):
304304
assert distribution == "pip"
305305
assert for_py_version == "3.9"
306306
assert [str(i) for i in search_dirs] == [str(extra)]
@@ -361,7 +361,7 @@ def test_do_update_skip_already_done(tmp_path, mocker, freezer):
361361
extra = tmp_path / "extra"
362362
extra.mkdir()
363363

364-
def _download_wheel(distribution, version_spec, for_py_version, search_dirs, app_data, to_folder): # noqa
364+
def _download_wheel(distribution, version_spec, for_py_version, search_dirs, app_data, to_folder, env): # noqa
365365
return wheel.path
366366

367367
download_wheel = mocker.patch("virtualenv.seed.wheels.acquire.download_wheel", side_effect=_download_wheel)

0 commit comments

Comments
 (0)