未验证 提交 29e03098 编写于 作者: F Frost Ming

fix failed testing

上级 6bd87ee9
......@@ -4,7 +4,6 @@ from pathlib import Path
from typing import Dict, Iterable, Optional, Sequence
import click
import halo
import pythonfinder
import tomlkit
from pkg_resources import safe_name
......@@ -48,9 +47,8 @@ def do_lock(
provider = project.get_provider(strategy, tracked_names)
requirements = requirements or project.all_dependencies
# TODO: switch reporter at io level.
with halo.Halo(
text="Resolving dependencies", spinner="dots"
with stream.open_spinner(
title="Resolving dependencies", spinner="dots"
) as spin, stream.logging("lock"):
reporter = project.get_reporter(requirements, tracked_names, spin)
resolver = project.core.resolver_class(provider, reporter)
......
......@@ -8,6 +8,7 @@ from tempfile import mktemp
from typing import List, Optional
import click
import halo
COLORS = ("red", "green", "yellow", "blue", "black", "magenta", "cyan", "white")
......@@ -106,5 +107,10 @@ class IOStream:
except OSError:
pass
@contextlib.contextmanager
def open_spinner(self, title: str, spinner: str = "dots"):
with halo.Halo(title, spinner=spinner) as spin:
yield spin
stream = IOStream()
......@@ -3,6 +3,7 @@ import itertools
import pytest
from pdm.exceptions import NoVersionsAvailable, ResolutionImpossible
from pdm.iostream import stream
from pdm.models.candidates import identify
from pdm.models.requirements import parse_requirement
from pdm.models.specifiers import PySpecSet
......@@ -11,7 +12,7 @@ from pdm.resolver import (
EagerUpdateProvider,
Resolver,
ReusePinProvider,
SimpleReporter,
SpinnerReporter,
resolve,
)
from tests import FIXTURES
......@@ -50,9 +51,10 @@ def resolve_requirements(
flat_reqs = list(
itertools.chain(*[deps.values() for _, deps in requirements.items()])
)
reporter = SimpleReporter(flat_reqs)
resolver = Resolver(provider, reporter)
mapping, *_ = resolve(resolver, requirements, requires_python)
with stream.open_spinner("Resolving dependencies") as spin:
reporter = SpinnerReporter(spin, flat_reqs)
resolver = Resolver(provider, reporter)
mapping, *_ = resolve(resolver, requirements, requires_python)
return mapping
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册