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

refactor: use dedicated python/pip attributes

Browse source
This commit is contained in:
Daylin Morgan 2023-06-11 08:52:12 -05:00
parent fac4b38e13
commit baa7f9cded
Signed by: daylin
GPG key ID: C1E52E7DD81DF79F
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
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-21-g135f2bf-dev" __version__ = "23.5a5-22-gfac4b38-dev"
class Spinner: class Spinner:
@ -714,6 +714,8 @@ class ViVenv:
self.name = name if name else id self.name = name if name else id
self.path = path if path else Cache().venv / self.name self.path = path if path else Cache().venv / self.name
self.python = self.path / "bin" / "python"
self.pip = ("pip", "--python", self.python)
if not metadata: if not metadata:
if self.name in (d.name for d in Cache().venv.iterdir()): if self.name in (d.name for d in Cache().venv.iterdir()):
@ -766,9 +768,7 @@ class ViVenv:
def install_pkgs(self) -> None: def install_pkgs(self) -> None:
cmd: List[str] = [ cmd: List[str] = [
"pip", *self.pip,
"--python",
str(self.path / "bin" / "python"),
"install", "install",
"--force-reinstall", "--force-reinstall",
] + self.meta.spec ] + self.meta.spec
@ -1341,11 +1341,7 @@ class Viv:
vivenv.touch() vivenv.touch()
vivenv.meta.write() vivenv.meta.write()
sys.exit( sys.exit(subprocess.run([vivenv.python, script, *rest]).returncode)
subprocess.run(
[vivenv.path / "bin" / "python", script, *rest]
).returncode
)
else: else:
_, bin = self._pick_bin(reqs, bin) _, bin = self._pick_bin(reqs, bin)