daylin/viv
1
0
Fork 0
mirror of https://github.com/daylinmorgan/viv.git synced 2024-12-22 10:40:44 -06:00
Code Issues Projects Releases Packages Wiki Activity

fix: make vivenv first in sys path

Browse source
This commit is contained in:
Daylin Morgan 2023-06-05 15:18:18 -05:00
parent f984022b3f
commit e0792e6865
Signed by: daylin
GPG key ID: C1E52E7DD81DF79F
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/viv/viv.py
View file

@ -50,7 +50,7 @@ from typing import (
from urllib.error import HTTPError from urllib.error import HTTPError
from urllib.request import urlopen from urllib.request import urlopen
__version__ = "23.5a5-15-ga7ff658-dev" __version__ = "23.5a5-18-g4641bbb-dev"
class Spinner: class Spinner:
@ -279,7 +279,7 @@ class Template:
meta.update(dict(accessed=t, files=sorted({*meta["files"], runner}))) meta.update(dict(accessed=t, files=sorted({*meta["files"], runner})))
(env / "vivmeta.json").write_text(json.dumps(meta)) (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*"))) site.addsitedir(str(*(env / "lib").glob("py*/si*")))
return env 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: def modify_sys_path(new_path: Path) -> None:
sys.path = [p for p in sys.path if p != site.USER_SITE] # also add sys.path here so that it comes first
site.addsitedir(str(*(new_path / "lib").glob("python*/site-packages"))) 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]: def get_venvs() -> Dict[str, ViVenv]: