daylin/viv
1
0
Fork 0
mirror of https://github.com/daylinmorgan/viv.git synced 2024-09-19 19:47:18 -05:00
Code Issues Projects Releases Packages Wiki Activity

fix: properly handle only deps case

Browse source
This commit is contained in:
Daylin Morgan 2023-08-20 08:12:07 -05:00
parent eefcabec24
commit 182d99ca17
Signed by: daylin
GPG key ID: C1E52E7DD81DF79F
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/viv/viv.py
View file

@ -56,7 +56,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-dev" __version__ = "23.8b1-1-geefcabe-dev"
class Spinner: class Spinner:
@ -1681,10 +1681,11 @@ class Viv:
if viv_used and deps: if viv_used and deps:
error( error(
"Script Dependencies block and " "Script Dependencies block and "
"`viv` API can't be used in the same script" "`viv.use` API can't be used in the same script"
) )
if not self.local_source and viv_used: if not self.local_source and viv_used:
log.debug("fetching remote copy to use for python api")
(tmppath / "viv.py").write_text( (tmppath / "viv.py").write_text(
fetch_script( fetch_script(
"https://raw.githubusercontent.com/daylinmorgan/viv/latest/src/viv/viv.py" "https://raw.githubusercontent.com/daylinmorgan/viv/latest/src/viv/viv.py"
@ -1699,9 +1700,8 @@ 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, scriptpath, *rest], env=env)
elif not spec: 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, scriptpath, *rest])
else: else:
@ -1712,7 +1712,6 @@ class Viv:
vivenv.touch() vivenv.touch()
vivenv.meta.write() vivenv.meta.write()
subprocess_run_quit([vivenv.python, scriptpath, *rest]) subprocess_run_quit([vivenv.python, scriptpath, *rest])
def cmd_run( def cmd_run(