Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

parts: use part validator from craft-parts #3909

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion requirements-devel.txt
Expand Up @@ -11,7 +11,7 @@ codespell==2.1.0
coverage==6.4.2
craft-cli==1.1.0
craft-grammar==1.1.1
craft-parts==1.12.1
craft-parts==1.14.0
craft-providers==1.4.1
craft-store==2.2.1
cryptography==3.4
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Expand Up @@ -7,7 +7,7 @@ charset-normalizer==2.1.0
click==8.1.3
craft-cli==1.1.0
craft-grammar==1.1.1
craft-parts==1.12.1
craft-parts==1.14.0
craft-providers==1.4.1
craft-store==2.2.1
cryptography==3.4
Expand Down
4 changes: 3 additions & 1 deletion snapcraft/parts/__init__.py
Expand Up @@ -16,6 +16,8 @@

"""Parts lifecycle processing."""

from craft_parts import validate_part

from .parts import PartsLifecycle

__all__ = ["PartsLifecycle"]
__all__ = ["PartsLifecycle", "validate_part"]
47 changes: 0 additions & 47 deletions snapcraft/parts/validation.py

This file was deleted.

5 changes: 2 additions & 3 deletions snapcraft/projects.py
Expand Up @@ -23,9 +23,8 @@
from craft_grammar.models import GrammarSingleEntryDictList, GrammarStr, GrammarStrList
from pydantic import conlist, constr

from snapcraft import repo
from snapcraft import parts, repo
from snapcraft.errors import ProjectValidationError
from snapcraft.parts import validation as parts_validation
from snapcraft.utils import get_effective_base, get_host_architecture


Expand Down Expand Up @@ -489,7 +488,7 @@ def _validate_package_repositories(cls, item):
@classmethod
def _validate_parts(cls, item):
"""Verify each part (craft-parts will re-validate this)."""
parts_validation.validate_part(item)
parts.validate_part(item)
return item

@pydantic.validator("epoch")
Expand Down
66 changes: 0 additions & 66 deletions tests/unit/parts/test_validation.py

This file was deleted.