From e0792e6865cefae0f468f1de1391f3291fe06faa Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Mon, 5 Jun 2023 15:18:18 -0500 Subject: [PATCH] fix: make vivenv first in sys path --- src/viv/viv.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/viv/viv.py b/src/viv/viv.py index ef210e5..578a61e 100755 --- a/src/viv/viv.py +++ b/src/viv/viv.py @@ -50,7 +50,7 @@ from typing import ( from urllib.error import HTTPError from urllib.request import urlopen -__version__ = "23.5a5-15-ga7ff658-dev" +__version__ = "23.5a5-18-g4641bbb-dev" class Spinner: @@ -279,7 +279,7 @@ class Template: meta.update(dict(accessed=t, files=sorted({*meta["files"], runner}))) (env / "vivmeta.json").write_text(json.dumps(meta)) - sys.path = [p for p in sys.path if p != site.USER_SITE] + sys.path = [p for p in (str(env.path),*sys.path) if p != site.USER_SITE] site.addsitedir(str(*(env / "lib").glob("py*/si*"))) return env """ @@ -856,8 +856,10 @@ def use(*packages: str, track_exe: bool = False, name: str = "") -> Path: def modify_sys_path(new_path: Path) -> None: - sys.path = [p for p in sys.path if p != site.USER_SITE] - site.addsitedir(str(*(new_path / "lib").glob("python*/site-packages"))) + # also add sys.path here so that it comes first + path_to_add = str(*(new_path / "lib").glob("python*/site-packages")) + sys.path = [p for p in (path_to_add, *sys.path) if p != site.USER_SITE] + site.addsitedir(path_to_add) def get_venvs() -> Dict[str, ViVenv]: