mirror of
https://github.com/daylinmorgan/viv.git
synced 2024-11-14 04:57:53 -06:00
fix: use pip --report instead of fake environment
This commit is contained in:
parent
0996628a97
commit
d1ea8c3868
1 changed files with 13 additions and 14 deletions
|
@ -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.5a4-32-g2dd4b35-dev"
|
__version__ = "23.5a4-33-g0996628-dev"
|
||||||
|
|
||||||
|
|
||||||
class Spinner:
|
class Spinner:
|
||||||
|
@ -808,24 +808,23 @@ def combined_spec(reqs: List[str], requirements: Path) -> List[str]:
|
||||||
def resolve_deps(args: Namespace) -> List[str]:
|
def resolve_deps(args: Namespace) -> List[str]:
|
||||||
spec = combined_spec(args.reqs, args.requirements)
|
spec = combined_spec(args.reqs, args.requirements)
|
||||||
|
|
||||||
with tempfile.TemporaryDirectory(prefix="viv-") as tmpdir:
|
with Spinner("resolving depedencies"):
|
||||||
echo("generating frozen spec")
|
|
||||||
vivenv = ViVenv(spec, track_exe=False, path=Path(tmpdir))
|
|
||||||
|
|
||||||
vivenv.create(quiet=True)
|
|
||||||
# populate the environment for now use
|
|
||||||
# custom cmd since using requirements file
|
|
||||||
cmd = [
|
cmd = [
|
||||||
str(vivenv.path / "bin" / "pip"),
|
"pip",
|
||||||
"install",
|
"install",
|
||||||
"--force-reinstall",
|
"--quiet",
|
||||||
|
"--ignore-installed",
|
||||||
|
"--report",
|
||||||
|
"-",
|
||||||
] + spec
|
] + spec
|
||||||
|
|
||||||
run(cmd, spinmsg="resolving dependencies", clean_up_path=vivenv.path)
|
report = json.loads(run(cmd, check_output=True))
|
||||||
|
resolved_spec = [
|
||||||
|
f"{pkg['metadata']['name']}=={pkg['metadata']['version']}"
|
||||||
|
for pkg in report["install"]
|
||||||
|
]
|
||||||
|
|
||||||
cmd = [str(vivenv.path / "bin" / "pip"), "freeze"]
|
return resolved_spec
|
||||||
resolved_spec = run(cmd, check_output=True)
|
|
||||||
return resolved_spec.splitlines()
|
|
||||||
|
|
||||||
|
|
||||||
def fetch_source(reference: str) -> str:
|
def fetch_source(reference: str) -> str:
|
||||||
|
|
Loading…
Reference in a new issue