Fix tests.
This commit is contained in:
parent
677358e0d5
commit
1741622d85
1 changed files with 4 additions and 7 deletions
|
@ -37,12 +37,12 @@ from debmutate.control import (
|
||||||
ensure_relation,
|
ensure_relation,
|
||||||
ControlEditor,
|
ControlEditor,
|
||||||
)
|
)
|
||||||
|
from debian.deb822 import PkgRelation
|
||||||
from debmutate.debhelper import (
|
from debmutate.debhelper import (
|
||||||
get_debhelper_compat_level,
|
get_debhelper_compat_level,
|
||||||
)
|
)
|
||||||
from debmutate.deb822 import (
|
from debmutate.deb822 import (
|
||||||
Deb822Editor,
|
Deb822Editor,
|
||||||
PkgRelation,
|
|
||||||
)
|
)
|
||||||
from debmutate.reformatting import (
|
from debmutate.reformatting import (
|
||||||
FormattingUnpreservable,
|
FormattingUnpreservable,
|
||||||
|
@ -243,7 +243,7 @@ def commit_debian_changes(
|
||||||
def targeted_python_versions(tree: Tree) -> Set[str]:
|
def targeted_python_versions(tree: Tree) -> Set[str]:
|
||||||
with tree.get_file("debian/control") as f:
|
with tree.get_file("debian/control") as f:
|
||||||
control = Deb822(f)
|
control = Deb822(f)
|
||||||
build_depends = PkgRelation.parse(control.get("Build-Depends", ""))
|
build_depends = PkgRelation.parse_relations(control.get("Build-Depends", ""))
|
||||||
all_build_deps: Set[str] = set()
|
all_build_deps: Set[str] = set()
|
||||||
for or_deps in build_depends:
|
for or_deps in build_depends:
|
||||||
all_build_deps.update(or_dep["name"] for or_dep in or_deps)
|
all_build_deps.update(or_dep["name"] for or_dep in or_deps)
|
||||||
|
@ -317,9 +317,7 @@ def fix_missing_python_distribution(error, context): # noqa: C901
|
||||||
|
|
||||||
for dep_pkg in extra_build_deps:
|
for dep_pkg in extra_build_deps:
|
||||||
assert dep_pkg is not None
|
assert dep_pkg is not None
|
||||||
if not context.add_dependency(
|
if not context.add_dependency(dep_pkg):
|
||||||
AptRequirement.simple(
|
|
||||||
dep_pkg.package, minimum_version=error.minimum_version)):
|
|
||||||
return False
|
return False
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
@ -370,8 +368,7 @@ def fix_missing_python_module(error, context):
|
||||||
|
|
||||||
for dep_pkg in extra_build_deps:
|
for dep_pkg in extra_build_deps:
|
||||||
assert dep_pkg is not None
|
assert dep_pkg is not None
|
||||||
if not context.add_dependency(
|
if not context.add_dependency(dep_pkg):
|
||||||
AptRequirement.simple(dep_pkg.package, error.minimum_version)):
|
|
||||||
return False
|
return False
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue