daylin/viv
1
0
Fork 0
mirror of https://github.com/daylinmorgan/viv.git synced 2024-12-22 02:30:44 -06:00
Code Issues Projects Releases Packages Wiki Activity

chore: sorry mypy forgot you were there

Browse source
This commit is contained in:
Daylin Morgan 2023-08-30 14:32:41 -05:00
parent fa04385997
commit ac02151a51
Signed by: daylin
GPG key ID: C1E52E7DD81DF79F
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/viv/viv.py
View file

@ -1253,8 +1253,8 @@ class Cache:
def __init__(self) -> None: def __init__(self) -> None:
self.vivenvs = self._get_venvs() self.vivenvs = self._get_venvs()
def _get_venvs(self, cache_dir: Path = Cfg().cache_venv) -> List[ViVenv]: def _get_venvs(self, cache_dir: Path = Cfg().cache_venv) -> Set[ViVenv]:
return [ViVenv.load(p.name) for p in cache_dir.iterdir()] return {ViVenv.load(p.name) for p in cache_dir.iterdir()}
@staticmethod @staticmethod
def _compare_dates( def _compare_dates(
@ -1294,7 +1294,7 @@ class Cache:
vivenv for vivenv in self.vivenvs if spec in ", ".join(vivenv.meta.spec) vivenv for vivenv in self.vivenvs if spec in ", ".join(vivenv.meta.spec)
} }
def filter(self, filters: Dict[str, str]) -> Dict[str, ViVenv]: def filter(self, filters: Dict[str, str]) -> Set[ViVenv]:
vivenv_sets = [] vivenv_sets = []
for k, v in filters.items(): for k, v in filters.items():
@ -1310,7 +1310,7 @@ class Cache:
if vivenv_sets: if vivenv_sets:
return {vivenv for vivenv in set.union(*vivenv_sets)} return {vivenv for vivenv in set.union(*vivenv_sets)}
else: else:
return {} return set()
class Viv: class Viv:
@ -1464,7 +1464,7 @@ class Viv:
vivenv.tree() vivenv.tree()
elif use_json: elif use_json:
sys.stdout.write( sys.stdout.write(
json.dumps({vivenv.name: vivenv.meta.__dict__ for vivenv in vivenvs()}) json.dumps({vivenv.name: vivenv.meta.__dict__ for vivenv in vivenvs})
) )
else: else:
for vivenv in vivenvs: for vivenv in vivenvs:
@ -1559,13 +1559,11 @@ class Viv:
) )
if system: if system:
import platform # noqa
echo(f"{a.yellow}System{a.end}:") echo(f"{a.yellow}System{a.end}:")
a.key_value( a.key_value(
{ {
"Python Exe": sys.executable, "Python Exe": sys.executable,
"Python Version": platform.sys.version, "Python Version": sys.version,
"Pip": subprocess_run( "Pip": subprocess_run(
["pip", "--version"], check_output=True ["pip", "--version"], check_output=True
).strip(), ).strip(),