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

refactor: use less ambiguous name

Browse source
This commit is contained in:
Daylin Morgan 2023-08-08 08:54:15 -05:00
parent d26c0b1d53
commit 821a335381
Signed by: daylin
GPG key ID: C1E52E7DD81DF79F
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/viv/viv.py
View file

@ -53,7 +53,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.8a2-1-g5707938-dev" __version__ = "23.8a2-2-gd26c0b1-dev"
class Spinner: class Spinner:
@ -714,7 +714,7 @@ class ArgumentParser(StdArgParser):
sys.exit(2) sys.exit(2)
def run( def subprocess_run(
command: List[str], command: List[str],
spinmsg: str = "", spinmsg: str = "",
clean_up_path: Optional[Path] = None, clean_up_path: Optional[Path] = None,
@ -920,7 +920,7 @@ class ViVenv:
if not Env().viv_no_setuptools and "setuptools" not in self.meta.spec: if not Env().viv_no_setuptools and "setuptools" not in self.meta.spec:
cmd.append("setuptools") cmd.append("setuptools")
run( subprocess_run(
cmd, cmd,
spinmsg="installing packages in vivenv", spinmsg="installing packages in vivenv",
clean_up_path=self.path, clean_up_path=self.path,
@ -1038,7 +1038,9 @@ def resolve_deps(reqs: List[str], requirements: Path) -> List[str]:
"-", "-",
] + spec ] + spec
report = json.loads(run(cmd, check_output=True, spinmsg="resolving depedencies")) report = json.loads(
subprocess_run(cmd, check_output=True, spinmsg="resolving depedencies")
)
resolved_spec = [ resolved_spec = [
f"{pkg['metadata']['name']}=={pkg['metadata']['version']}" f"{pkg['metadata']['name']}=={pkg['metadata']['version']}"
for pkg in report["install"] for pkg in report["install"]
@ -1398,7 +1400,8 @@ class Viv:
full_cmd = [str(bin), *rest] full_cmd = [str(bin), *rest]
run(full_cmd, verbose=True) # TODO: use subprocess_run_quit
subprocess_run(full_cmd, verbose=True)
def cache_info(self, vivenv_id: str, path: bool, use_json: bool) -> None: def cache_info(self, vivenv_id: str, path: bool, use_json: bool) -> None:
"""get metadata about a vivenv""" """get metadata about a vivenv"""
@ -1592,10 +1595,10 @@ class Viv:
make_executable(output) make_executable(output)
def _run_script( def _run_script(
self, spec: List[str], script: str, keep: bool, rest: List[str] self, spec: List[str], script: Path, keep: bool, rest: List[str]
) -> None: ) -> None:
env = os.environ env = os.environ
name = script.split("/")[-1] name = script.name.split("/")[-1]
# TODO: reduce boilerplate and dry out # TODO: reduce boilerplate and dry out
with tempfile.TemporaryDirectory(prefix="viv-") as tmpdir: with tempfile.TemporaryDirectory(prefix="viv-") as tmpdir: