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: don't move local scripts just add viv.py to the path

Browse source
This commit is contained in:
Daylin Morgan 2023-09-26 15:13:00 -05:00
parent 3fe4110e06
commit 62c3270826
Signed by: daylin
GPG key ID: C1E52E7DD81DF79F
1 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/viv/viv.py
View file

@ -1324,19 +1324,20 @@ class Viv:
self.local_source: Optional[Path] = None self.local_source: Optional[Path] = None
self.running_source = Path(__file__).resolve() self.running_source = Path(__file__).resolve()
self.local = not str(self.running_source).startswith("/proc/") self.local = not str(self.running_source).startswith("/proc/")
if self.local: try:
self.local_source = self.running_source # prevent running `viv` from being imported
self.local_version = __version__ curr = sys.path[0]
else: sys.path = sys.path[1:]
try: _local_viv = __import__("viv")
_local_viv = __import__("viv") sys.path.insert(0, curr)
if _local_viv.__file__:
self.local_source = Path(_local_viv.__file__) if _local_viv.__file__:
self.local_version = _local_viv.__version__ self.local_source = Path(_local_viv.__file__)
else: self.local_version = _local_viv.__version__
self.local_version = "Not Found" else:
except ImportError:
self.local_version = "Not Found" self.local_version = "Not Found"
except ImportError:
self.local_version = "Not Found"
if self.local_source: if self.local_source:
self.git = (self.local_source.parent.parent.parent / ".git").is_dir() self.git = (self.local_source.parent.parent.parent / ".git").is_dir()
@ -1721,11 +1722,12 @@ class Viv:
with tempfile.TemporaryDirectory(prefix="viv-") as tmpdir: with tempfile.TemporaryDirectory(prefix="viv-") as tmpdir:
tmppath = Path(tmpdir) tmppath = Path(tmpdir)
scriptpath = tmppath / name
if Path(script).is_file(): if Path(script).is_file():
script_text = Path(script).read_text() scriptpath = Path(script).absolute()
script_text = scriptpath.read_text()
else: else:
scriptpath = tmppath / name
script_text = fetch_script(script) script_text = fetch_script(script)
viv_used = uses_viv(script_text) viv_used = uses_viv(script_text)
@ -1752,7 +1754,11 @@ class Viv:
log.debug(f"script invokes viv.use passing along spec: \n '{spec}'") log.debug(f"script invokes viv.use passing along spec: \n '{spec}'")
subprocess_run_quit( subprocess_run_quit(
[sys.executable, "-S", scriptpath, *rest], [sys.executable, "-S", scriptpath, *rest],
env=dict(env, VIV_SPEC=" ".join(f"'{req}'" for req in spec)), env=dict(
env,
VIV_SPEC=" ".join(f"'{req}'" for req in spec),
PYTHONPATH=":".join((str(tmppath), env.get("PYTHONPATH", ""))),
),
) )
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")