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

fix: isolate venv's better in viv run

Browse source
This commit is contained in:
Daylin Morgan 2023-08-20 23:51:30 -05:00
parent 5db225afea
commit 3bf000f4d0
Signed by: daylin
GPG key ID: C1E52E7DD81DF79F
1 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/viv/viv.py
View file

@ -9,7 +9,6 @@
from __future__ import annotations from __future__ import annotations
import hashlib import hashlib
import inspect
import itertools import itertools
import json import json
import logging import logging
@ -56,7 +55,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.8b1-2-g182d99c-dev" __version__ = "23.8b1-3-g5db225a-dev"
class Spinner: class Spinner:
@ -951,11 +950,24 @@ class ViVenv:
def touch(self) -> None: def touch(self) -> None:
self.meta.accessed = str(datetime.today()) self.meta.accessed = str(datetime.today())
@property
def site_packages(self) -> str:
return str(*(self.path / "lib").glob("python*/site-packages"))
def activate(self) -> None: def activate(self) -> None:
# also add sys.path here so that it comes first # also add sys.path here so that it comes first
log.debug(f"activating {self.name}") log.debug(f"activating {self.name}")
path_to_add = str(*(self.path / "lib").glob("python*/site-packages")) path_to_add = self.site_packages
sys.path = [p for p in (path_to_add, *sys.path) if p != site.USER_SITE]
# approximate behavior of python -S
sys.path = [
path_to_add,
*(
p
for p in sys.path
if not any(map(p.endswith, ("dist-packages", "site-packages")))
),
]
site.addsitedir(path_to_add) site.addsitedir(path_to_add)
def files_exist(self) -> bool: def files_exist(self) -> bool:
@ -1048,6 +1060,8 @@ class ViVenv:
def get_caller_path() -> Path: def get_caller_path() -> Path:
"""get callers callers file path""" """get callers callers file path"""
# viv.py is fist in stack since function is used in `viv.use()` # viv.py is fist in stack since function is used in `viv.use()`
import inspect # noqa
frame_info = inspect.stack()[2] frame_info = inspect.stack()[2]
filepath = frame_info.filename # in python 3.5+, you can use frame_info.filename filepath = frame_info.filename # in python 3.5+, you can use frame_info.filename
del frame_info # drop the reference to the stack frame to avoid reference cycles del frame_info # drop the reference to the stack frame to avoid reference cycles
@ -1695,16 +1709,23 @@ class Viv:
if viv_used: if viv_used:
env.update({"VIV_SPEC": " ".join(f"'{req}'" for req in spec)}) env.update({"VIV_SPEC": " ".join(f"'{req}'" for req in spec)})
subprocess_run_quit([sys.executable, scriptpath, *rest], env=env) subprocess_run_quit([sys.executable, "-S", scriptpath, *rest], env=env)
elif not spec and not deps: elif not spec and not deps:
log.warning("using viv with empty spec, skipping vivenv creation") log.warning("using viv with empty spec, skipping vivenv creation")
subprocess_run_quit([sys.executable, scriptpath, *rest]) subprocess_run_quit([sys.executable, "-S", scriptpath, *rest])
else: else:
vivenv = ViVenv(spec + deps) vivenv = ViVenv(spec + deps)
vivenv.ensure() vivenv.ensure()
vivenv.touch() vivenv.touch()
vivenv.meta.write() vivenv.meta.write()
subprocess_run_quit([vivenv.python, scriptpath, *rest]) subprocess_run_quit(
[vivenv.python, "-S", scriptpath, *rest],
env={
"PYTHONPATH": ":".join(
filter(None, (vivenv.site_packages, Env().pythonpath))
)
},
)
def cmd_run( def cmd_run(
self, self,