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

fix: don't use none type

Browse source
This commit is contained in:
Daylin Morgan 2023-06-02 13:14:04 -05:00
parent ccccbbb147
commit f069eafb11
Signed by: daylin
GPG key ID: C1E52E7DD81DF79F
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
examples/black
View file

@ -1,4 +1,8 @@
#!/usr/bin/env python3 #!/usr/bin/env python
# AUTOGENERATED by viv (v23.5a4-37-gf8ebd9d-dev)
# see `python3 <(curl -fsSL viv.dayl.in/viv.py) --help`
def _viv_use(*pkgs, track_exe=False, name=""): def _viv_use(*pkgs, track_exe=False, name=""):
import hashlib, json, os, site, shutil, sys, venv # noqa import hashlib, json, os, site, shutil, sys, venv # noqa
from pathlib import Path # noqa from pathlib import Path # noqa
@ -18,7 +22,7 @@ def _viv_use(*pkgs, track_exe=False, name=""):
_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).create(env) venv.create(env, symlinks=True, with_pip=True, clear=True)
(env / "pip.conf").write_text("[global]\ndisable-pip-version-check=true") (env / "pip.conf").write_text("[global]\ndisable-pip-version-check=true")
run_kw = dict(zip(("stdout", "stderr"), ((None,) * 2 if verbose else (-1, 2)))) run_kw = dict(zip(("stdout", "stderr"), ((None,) * 2 if verbose else (-1, 2))))
p = run([env / "bin" / "pip", "install", "--force-reinstall", *spec], **run_kw) p = run([env / "bin" / "pip", "install", "--force-reinstall", *spec], **run_kw)

11
src/viv/viv.py
View file

@ -51,7 +51,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.5a4-37-gf8ebd9d-dev" __version__ = "23.5a4-40-gccccbbb-dev"
class Spinner: class Spinner:
@ -222,7 +222,7 @@ 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).create(env) venv.create(env, symlinks=True, with_pip=True, clear=True)
(env / "pip.conf").write_text("[global]\ndisable-pip-version-check=true") (env / "pip.conf").write_text("[global]\ndisable-pip-version-check=true")
run_kw = dict(zip(("stdout", "stderr"), ((None,) * 2 if verbose else (-1, 2)))) run_kw = dict(zip(("stdout", "stderr"), ((None,) * 2 if verbose else (-1, 2))))
p = run([env / "bin" / "pip", "install", "--force-reinstall", *spec], **run_kw) p = run([env / "bin" / "pip", "install", "--force-reinstall", *spec], **run_kw)
@ -258,8 +258,8 @@ to create/activate a vivenv:
(self._standalone_func, self.noqa(self._use_str(spec, standalone=True))) (self._standalone_func, self.noqa(self._use_str(spec, standalone=True)))
) )
return f""" return f"""
# see `python3 <(curl -fsSL viv.dayl.in/viv.py) --help`
# AUTOGENERATED by viv (v{__version__}) # AUTOGENERATED by viv (v{__version__})
# see `python3 <(curl -fsSL viv.dayl.in/viv.py) --help`
{func_use} {func_use}
""" """
@ -313,7 +313,10 @@ to create/activate a vivenv:
else: else:
imports = "" imports = ""
return f"""\ return f"""\
#!/usr/bin/env python3 #!/usr/bin/env python
# AUTOGENERATED by viv (v{__version__})
# see `python3 <(curl -fsSL viv.dayl.in/viv.py) --help`
{imports} {imports}
import subprocess import subprocess
import sys import sys