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

feat: remove pip from vivenv's

Browse source
This commit is contained in:
Daylin Morgan 2023-06-05 14:01:49 -05:00
parent 33e2ff586c
commit dbc22489e6
Signed by: daylin
GPG key ID: C1E52E7DD81DF79F
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
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-10-g5326324-dev" __version__ = "23.5a5-9-g33e2ff5-dev"
class Spinner: class Spinner:
@ -118,7 +118,10 @@ class Env:
) )
def __getattr__(self, attr: str) -> Any: def __getattr__(self, attr: str) -> Any:
if not attr.startswith("_") and (defined:=getattr(self, f"_{attr}")) is not None: if (
not attr.startswith("_")
and (defined := getattr(self, f"_{attr}")) is not None
):
return defined return defined
else: else:
return os.getenv(attr.upper(), self.defaults.get(attr)) return os.getenv(attr.upper(), self.defaults.get(attr))
@ -131,6 +134,7 @@ class Env:
def _viv_spec(self) -> List[str]: def _viv_spec(self) -> List[str]:
return [i for i in os.getenv("VIV_SPEC", "").split(" ") if i] return [i for i in os.getenv("VIV_SPEC", "").split(" ") if i]
class Cache: class Cache:
def __init__(self) -> None: def __init__(self) -> None:
self.base = Env().viv_cache self.base = Env().viv_cache
@ -268,9 +272,10 @@ to create/activate a vivenv:
_id = sha256.hexdigest() _id = sha256.hexdigest()
if (env := cache / (name if name else _id)) not in cache.glob("*/") or force: if (env := cache / (name if name else _id)) not in cache.glob("*/") or force:
sys.stderr.write(f"generating new vivenv -> {env.name}\n") sys.stderr.write(f"generating new vivenv -> {env.name}\n")
venv.create(env, symlinks=True, with_pip=True, clear=True, upgrade_deps=True) venv.create(env, symlinks=True, clear=True)
run_kw = dict(zip(("stdout", "stderr"), ((None,) * 2 if verbose else (-1, 2)))) kw = dict(zip(("stdout", "stderr"), ((None,) * 2 if verbose else (-1, 2))))
p = run([env / "bin" / "pip", "install", "--force-reinstall", *spec], **run_kw) cmd = ["pip", "--python", str(env / "bin" / "python"), "install", *spec]
p = run(cmd, **kw)
if (rc := p.returncode) != 0: if (rc := p.returncode) != 0:
if env.is_dir(): if env.is_dir():
shutil.rmtree(env) shutil.rmtree(env)
@ -744,14 +749,18 @@ class ViVenv:
echo(f"new unique vivenv -> {self.name}") echo(f"new unique vivenv -> {self.name}")
with Spinner("creating vivenv"): with Spinner("creating vivenv"):
venv.create( venv.create(
self.path, with_pip=True, clear=True, symlinks=True, upgrade_deps=True self.path,
clear=True,
symlinks=True,
) )
self.meta.created = str(datetime.today()) self.meta.created = str(datetime.today())
def install_pkgs(self) -> None: def install_pkgs(self) -> None:
cmd: List[str] = [ cmd: List[str] = [
str(self.path / "bin" / "pip"), "pip",
"--python",
str(self.path / "bin" / "python"),
"install", "install",
"--force-reinstall", "--force-reinstall",
] + self.meta.spec ] + self.meta.spec
@ -1061,8 +1070,8 @@ class Viv:
run binary/script in existing vivenv run binary/script in existing vivenv
examples: examples:
viv exe <vivenv> pip -- list
viv exe <vivenv> python -- script.py viv exe <vivenv> python -- script.py
viv exe <vivenv> python -- -m http.server
""" """
vivenv = self._match_vivenv(vivenv_id) vivenv = self._match_vivenv(vivenv_id)
@ -1426,13 +1435,15 @@ class Cli:
action="store_true", action="store_true",
), ),
], ],
("run", "freeze", "shim"): [ ("run", "shim"): [
Arg( Arg(
"-k", "-k",
"--keep", "--keep",
help="preserve environment", help="preserve environment",
action="store_true", action="store_true",
), ),
],
("run", "freeze", "shim"): [
Arg("reqs", help="requirements specifiers", nargs="*"), Arg("reqs", help="requirements specifiers", nargs="*"),
Arg( Arg(
"-r", "-r",