Skip to content

Commit

Permalink
Fix upgrade embeded crashes
Browse files Browse the repository at this point in the history
Signed-off-by: Bernát Gábor <bgabor8@bloomberg.net>
  • Loading branch information
gaborbernat committed Feb 1, 2021
1 parent d9725b7 commit 4ec25e4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions docs/changelog/2058.bugfix.rst
@@ -0,0 +1 @@
Running virtualenv ``--upgrade-embed-wheels`` crashes - by :user:`gaborbernat`.
2 changes: 2 additions & 0 deletions src/virtualenv/seed/wheels/periodic_update.py
Expand Up @@ -9,6 +9,7 @@
import ssl
import subprocess
import sys
import os
from datetime import datetime, timedelta
from itertools import groupby
from shutil import copy2
Expand Down Expand Up @@ -235,6 +236,7 @@ def _run_do_update(app_data, distribution, embed_filename, for_py_version, perio
search_dirs=search_dirs,
app_data=app_data,
to_folder=wheelhouse,
env=os.environ
)
if dest is None or (u_log.versions and u_log.versions[0].filename == dest.name):
break
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/seed/wheels/test_periodic_update.py
Expand Up @@ -300,7 +300,7 @@ def test_do_update_first(tmp_path, mocker, freezer):
]
download_wheels = (Wheel(Path(i[0])) for i in pip_version_remote)

def _download_wheel(distribution, version_spec, for_py_version, search_dirs, app_data, to_folder):
def _download_wheel(distribution, version_spec, for_py_version, search_dirs, app_data, to_folder, env):
assert distribution == "pip"
assert for_py_version == "3.9"
assert [str(i) for i in search_dirs] == [str(extra)]
Expand Down Expand Up @@ -361,7 +361,7 @@ def test_do_update_skip_already_done(tmp_path, mocker, freezer):
extra = tmp_path / "extra"
extra.mkdir()

def _download_wheel(distribution, version_spec, for_py_version, search_dirs, app_data, to_folder): # noqa
def _download_wheel(distribution, version_spec, for_py_version, search_dirs, app_data, to_folder, env): # noqa
return wheel.path

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

0 comments on commit 4ec25e4

Please sign in to comment.