From ab1444ace7cea6d2728492b90608f2d185850984 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Fri, 12 Jul 2024 14:37:07 -0500 Subject: [PATCH] refactor: make standalone less LOC --- README.md | 4 ++-- examples/black | 64 +++++++++++++++++++++----------------------------- src/viv/viv.py | 54 +++++++++++++++++------------------------- 3 files changed, 51 insertions(+), 71 deletions(-) diff --git a/README.md b/README.md index 89a7870..fa97f9a 100644 --- a/README.md +++ b/README.md @@ -129,12 +129,12 @@ python3 <(curl -fsSL viv.dayl.in/viv.py) run \ -s https://gist.githubusercontent.com/cs01/fa721a17a326e551ede048c5088f9e0f/raw/6bdfbb6e9c1132b1c38fdd2f195d4a24c540c324/pipx-demo.py ``` -## Bonus: use `viv` with just standalone snippet (37LOC) +## Bonus: use `viv` with just standalone snippet (30LOC) `--standalone` will auto-generate a mini-function version of `viv` to accomplish the same basic task as using a local copy of `viv`. After generating this standalone shim you can freely use this script -across Unix machines which have Python > 3.8. +across Unix machines which have Python > 3.8 and pip. See [examples/black](https://github.com/daylinmorgan/viv/blob/dev/examples/black) for output of the below command. diff --git a/examples/black b/examples/black index 537b92c..142a009 100755 --- a/examples/black +++ b/examples/black @@ -1,47 +1,37 @@ #!/usr/bin/env python3 -# AUTOGENERATED by viv (v2023.1001-dev) +# AUTOGENERATED by viv (v2024.1005-dev) # see `python3 <(curl -fsSL viv.dayl.in/viv.py) --help` def _viv_use(*pkgs, track_exe=False, name=""): - import hashlib, json, os, site, shutil, sys, venv # noqa - from pathlib import Path # noqa - from datetime import datetime # noqa - from subprocess import run # noqa - - if not {*map(type, pkgs)} == {str}: - raise ValueError(f"spec: {pkgs} is invalid") - - meta = dict.fromkeys(("created", "accessed"), (t := str(datetime.today()))) - runner = str(Path(__file__).absolute().resolve()) - envvar = lambda x: os.getenv(f"VIV_{x}") # noqa + i, meta, add_meta = __import__, {}, lambda **kw: meta.update(**kw) + P, ge, q, noop = i("pathlib").Path, i("os").getenv, i("sys").exit, lambda: None + _if, p_str = lambda x, f: (noop, f)[x](), lambda x: f"{P(x).absolute().resolve()}" nopkgs = lambda p: not p.endswith(("dist-packages", "site-packages")) # noqa - F, V, no_st = map(envvar, ("FORCE", "VERBOSE", "NO_SETUPTOOLS")) - base = Path(xdg) if (xdg := os.getenv("XDG_CACHE_HOME")) else Path.home() / ".cache" + _if({*map(type, spec := [*pkgs])} != {str}, lambda: q(f"spec: {pkgs} not string")) + F, V, NS = map(lambda x: ge(f"VIV_{x}"), ("FORCE", "VERBOSE", "NO_SETUPTOOLS")) + ST = not (NS and [x for x in spec if x.startswith("setuptools")]) + add_meta(created=(now := str(i("datetime").datetime.today()))) + base = P(xdg) if (xdg := ge("XDG_CACHE_HOME")) else P.home() / ".cache" (cache := (base) / "viv/venvs").mkdir(parents=True, exist_ok=True) - exe = str(Path(sys.executable).resolve()) if track_exe else "N/A" - _id = hashlib.sha256((str(spec := [*pkgs]) + exe).encode()).hexdigest() + exe = p_str(i("sys").executable) if track_exe else "N/A" + _id = i("hashlib").sha256((str(spec) + exe).encode()).hexdigest() if (env := cache / (name if name else _id[:8])) not in cache.glob("*/") or F: - sys.stderr.write(f"generating new vivenv -> {env.name}\n") - venv.create(env, prompt=f"viv-{name}", symlinks=True, clear=True) - kw = dict(zip(("stdout", "stderr"), ((None,) * 2 if V else (-1, 2)))) + i("sys").stderr.write(f"generating new vivenv -> {env.name}\n") + i("venv").create(env, prompt=f"viv-{name}", symlinks=True, clear=True) + run_kw = dict(zip(("stdout", "stderr"), ((None,) * 2 if V else (-1, 2)))) cmd = ["pip", "--python", str(env / "bin" / "python"), "install", *spec] - if (not no_st) and (not [x for x in spec if x.startswith("setuptools")]): - cmd.append("setuptools") - p = run(cmd, **kw) - if (rc := p.returncode) != 0: - if env.is_dir(): - shutil.rmtree(env) - sys.stderr.write(f"pip had non zero exit ({rc})\n{p.stdout.decode()}\n") - sys.exit(rc) - meta.update(dict(id=_id, spec=spec, exe=exe, name=name, files=[runner])) + _if(ST, lambda: cmd.append("setuptools")) + if (rc := (p := i("subprocess").run(cmd, **run_kw)).returncode) != 0: + _if(env.is_dir(), lambda: i("shutil").rmtree(env)) + q(f"pip had non zero exit ({rc})\n{p.stdout.decode()}\n") + add_meta(id=_id, spec=spec, exe=exe, name=name) else: - meta = json.loads((env / "vivmeta.json").read_text()) - meta.update(dict(accessed=t, files=sorted({*meta["files"], runner}))) - (env / "vivmeta.json").write_text(json.dumps(meta)) - site.addsitedir(sitepkgs := str(*(env / "lib").glob("py*/si*"))) + meta = i("json").loads((env / "vivmeta.json").read_text()) + add_meta(accessed=now, files=sorted({*meta.get("files", []), p_str(__file__)})) + (env / "vivmeta.json").write_text(i("json").dumps(meta)) + i("site").addsitedir(sitepkgs := str(*(env / "lib").glob("py*/si*"))) sys.path = [sitepkgs, *filter(nopkgs, sys.path)] - return env @@ -50,11 +40,11 @@ import sys if __name__ == "__main__": vivenv = _viv_use( - "black==23.7.0", + "black==24.4.2", "click==8.1.7", "mypy-extensions==1.0.0", - "packaging==23.1", # noqa - "pathspec==0.11.2", - "platformdirs==3.10.0", + "packaging==24.1", # noqa + "pathspec==0.12.1", + "platformdirs==4.2.2", ) # noqa sys.exit(subprocess.run([vivenv / "bin" / "black", *sys.argv[1:]]).returncode) diff --git a/src/viv/viv.py b/src/viv/viv.py index 635581c..a107b4c 100755 --- a/src/viv/viv.py +++ b/src/viv/viv.py @@ -2008,44 +2008,34 @@ def err_quit(*msg: str, code: int = 1) -> NoReturn: class Template: _standalone_func = r"""def _viv_use(*pkgs, track_exe=False, name=""): - import hashlib, json, os, site, shutil, sys, venv # noqa - from pathlib import Path # noqa - from datetime import datetime # noqa - from subprocess import run # noqa - - if not {*map(type, pkgs)} == {str}: - raise ValueError(f"spec: {pkgs} is invalid") - - meta = dict.fromkeys(("created", "accessed"), (t := str(datetime.today()))) - runner = str(Path(__file__).absolute().resolve()) - envvar = lambda x: os.getenv(f"VIV_{x}") # noqa + i, meta, add_meta = __import__, {}, lambda **kw: meta.update(**kw) + P, ge, q, noop = i("pathlib").Path, i("os").getenv, i("sys").exit, lambda: None + _if, p_str = lambda x, f: (noop, f)[x](), lambda x: f"{P(x).absolute().resolve()}" nopkgs = lambda p: not p.endswith(("dist-packages", "site-packages")) # noqa - F, V, no_st = map(envvar, ("FORCE", "VERBOSE", "NO_SETUPTOOLS")) - base = Path(xdg) if (xdg := os.getenv("XDG_CACHE_HOME")) else Path.home() / ".cache" + _if({*map(type, spec := [*pkgs])} != {str}, lambda: q(f"spec: {pkgs} not string")) + F, V, NS = map(lambda x: ge(f"VIV_{x}"), ("FORCE", "VERBOSE", "NO_SETUPTOOLS")) + ST = not (NS and [x for x in spec if x.startswith("setuptools")]) + add_meta(created=(now := str(i("datetime").datetime.today()))) + base = P(xdg) if (xdg := ge("XDG_CACHE_HOME")) else P.home() / ".cache" (cache := (base) / "viv/venvs").mkdir(parents=True, exist_ok=True) - exe = str(Path(sys.executable).resolve()) if track_exe else "N/A" - _id = hashlib.sha256((str(spec := [*pkgs]) + exe).encode()).hexdigest() + exe = p_str(i("sys").executable) if track_exe else "N/A" + _id = i("hashlib").sha256((str(spec) + exe).encode()).hexdigest() if (env := cache / (name if name else _id[:8])) not in cache.glob("*/") or F: - sys.stderr.write(f"generating new vivenv -> {env.name}\n") - venv.create(env, prompt=f"viv-{name}", symlinks=True, clear=True) - kw = dict(zip(("stdout", "stderr"), ((None,) * 2 if V else (-1, 2)))) + i("sys").stderr.write(f"generating new vivenv -> {env.name}\n") + i("venv").create(env, prompt=f"viv-{name}", symlinks=True, clear=True) + run_kw = dict(zip(("stdout", "stderr"), ((None,) * 2 if V else (-1, 2)))) cmd = ["pip", "--python", str(env / "bin" / "python"), "install", *spec] - if (not no_st) and (not [x for x in spec if x.startswith("setuptools")]): - cmd.append("setuptools") - p = run(cmd, **kw) - if (rc := p.returncode) != 0: - if env.is_dir(): - shutil.rmtree(env) - sys.stderr.write(f"pip had non zero exit ({rc})\n{p.stdout.decode()}\n") - sys.exit(rc) - meta.update(dict(id=_id, spec=spec, exe=exe, name=name, files=[runner])) + _if(ST, lambda: cmd.append("setuptools")) + if (rc := (p := i("subprocess").run(cmd, **run_kw)).returncode) != 0: + _if(env.is_dir(), lambda: i("shutil").rmtree(env)) + q(f"pip had non zero exit ({rc})\n{p.stdout.decode()}\n") + add_meta(id=_id, spec=spec, exe=exe, name=name) else: - meta = json.loads((env / "vivmeta.json").read_text()) - meta.update(dict(accessed=t, files=sorted({*meta["files"], runner}))) - (env / "vivmeta.json").write_text(json.dumps(meta)) - site.addsitedir(sitepkgs := str(*(env / "lib").glob("py*/si*"))) + meta = i("json").loads((env / "vivmeta.json").read_text()) + add_meta(accessed=now, files=sorted({*meta.get("files", []), p_str(__file__)})) + (env / "vivmeta.json").write_text(i("json").dumps(meta)) + i("site").addsitedir(sitepkgs := str(*(env / "lib").glob("py*/si*"))) sys.path = [sitepkgs, *filter(nopkgs, sys.path)] - return env """