Skip to content

feat: add Perl and R test elements to schema and model #59

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.

Sign up for GitHub

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

Merged
wolfv merged 1 commit into from
May 14, 2025
Merged

feat: add Perl and R test elements to schema and model #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion conda_recipe_v2_schema/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,26 @@ class PythonTestElement(StrictBaseModel):
python: PythonTestElementInner = Field(..., description="Python specific test configuration")


class PerlTestElementInner(StrictBaseModel):
uses: ConditionalList[NonEmptyStr] = Field(
..., description="A list of Perl modules to check after having installed the built package."
)


class PerlTestElement(StrictBaseModel):
perl: PerlTestElementInner = Field(..., description="Perl specific test configuration")


class RTestElementInner(StrictBaseModel):
libraries: ConditionalList[NonEmptyStr] = Field(
..., description="A list of R libraries to check after having installed the built package."
)


class RTestElement(StrictBaseModel):
r: RTestElementInner = Field(..., description="R specific test configuration")


class DownstreamTestElement(StrictBaseModel):
downstream: MatchSpec = Field(
...,
Expand Down Expand Up @@ -508,7 +528,14 @@ class PackageContentTest(StrictBaseModel):
)


TestElement = ScriptTestElement | PythonTestElement | DownstreamTestElement | PackageContentTest
TestElement = (
ScriptTestElement
| PythonTestElement
| PerlTestElement
| RTestElement
| DownstreamTestElement
| PackageContentTest
)

#########
# About #
Expand Down
166 changes: 162 additions & 4 deletions schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1858,7 +1858,7 @@
"title": "IfStatement[Annotated[str, StringConstraints]]",
"type": "object"
},
"IfStatement_Union_ScriptTestElement__PythonTestElement__DownstreamTestElement__PackageContentTest__": {
"IfStatement_Union_ScriptTestElement__PythonTestElement__PerlTestElement__RTestElement__DownstreamTestElement__PackageContentTest__": {
"additionalProperties": false,
"properties": {
"if": {
Expand All @@ -1873,6 +1873,12 @@
{
"$ref": "#/$defs/PythonTestElement"
},
{
"$ref": "#/$defs/PerlTestElement"
},
{
"$ref": "#/$defs/RTestElement"
},
{
"$ref": "#/$defs/DownstreamTestElement"
},
Expand All @@ -1888,6 +1894,12 @@
{
"$ref": "#/$defs/PythonTestElement"
},
{
"$ref": "#/$defs/PerlTestElement"
},
{
"$ref": "#/$defs/RTestElement"
},
{
"$ref": "#/$defs/DownstreamTestElement"
},
Expand All @@ -1909,6 +1921,12 @@
{
"$ref": "#/$defs/PythonTestElement"
},
{
"$ref": "#/$defs/PerlTestElement"
},
{
"$ref": "#/$defs/RTestElement"
},
{
"$ref": "#/$defs/DownstreamTestElement"
},
Expand All @@ -1924,6 +1942,12 @@
{
"$ref": "#/$defs/PythonTestElement"
},
{
"$ref": "#/$defs/PerlTestElement"
},
{
"$ref": "#/$defs/RTestElement"
},
{
"$ref": "#/$defs/DownstreamTestElement"
},
Expand All @@ -1946,7 +1970,7 @@
"if",
"then"
],
"title": "IfStatement[Union[ScriptTestElement, PythonTestElement, DownstreamTestElement, PackageContentTest]]",
"title": "IfStatement[Union[ScriptTestElement, PythonTestElement, PerlTestElement, RTestElement, DownstreamTestElement, PackageContentTest]]",
"type": "object"
},
"IfStatement_Union_UrlSource__GitRev__GitTag__GitBranch__BaseGitSource__LocalSource__": {
Expand Down Expand Up @@ -2430,14 +2454,20 @@
{
"$ref": "#/$defs/PythonTestElement"
},
{
"$ref": "#/$defs/PerlTestElement"
},
{
"$ref": "#/$defs/RTestElement"
},
{
"$ref": "#/$defs/DownstreamTestElement"
},
{
"$ref": "#/$defs/PackageContentTest"
},
{
"$ref": "#/$defs/IfStatement_Union_ScriptTestElement__PythonTestElement__DownstreamTestElement__PackageContentTest__"
"$ref": "#/$defs/IfStatement_Union_ScriptTestElement__PythonTestElement__PerlTestElement__RTestElement__DownstreamTestElement__PackageContentTest__"
},
{
"items": {
Expand All @@ -2448,14 +2478,20 @@
{
"$ref": "#/$defs/PythonTestElement"
},
{
"$ref": "#/$defs/PerlTestElement"
},
{
"$ref": "#/$defs/RTestElement"
},
{
"$ref": "#/$defs/DownstreamTestElement"
},
{
"$ref": "#/$defs/PackageContentTest"
},
{
"$ref": "#/$defs/IfStatement_Union_ScriptTestElement__PythonTestElement__DownstreamTestElement__PackageContentTest__"
"$ref": "#/$defs/IfStatement_Union_ScriptTestElement__PythonTestElement__PerlTestElement__RTestElement__DownstreamTestElement__PackageContentTest__"
}
]
},
Expand Down Expand Up @@ -3045,6 +3081,61 @@
"title": "PackageContentTestInner",
"type": "object"
},
"PerlTestElement": {
"additionalProperties": false,
"properties": {
"perl": {
"allOf": [
{
"$ref": "#/$defs/PerlTestElementInner"
}
],
"description": "Perl specific test configuration"
}
},
"required": [
"perl"
],
"title": "PerlTestElement",
"type": "object"
},
"PerlTestElementInner": {
"additionalProperties": false,
"properties": {
"uses": {
"anyOf": [
{
"minLength": 1,
"type": "string"
},
{
"$ref": "#/$defs/IfStatement"
},
{
"items": {
"anyOf": [
{
"minLength": 1,
"type": "string"
},
{
"$ref": "#/$defs/IfStatement"
}
]
},
"type": "array"
}
],
"description": "A list of Perl modules to check after having installed the built package.",
"title": "Uses"
}
},
"required": [
"uses"
],
"title": "PerlTestElementInner",
"type": "object"
},
"PrefixDetection": {
"additionalProperties": false,
"properties": {
Expand Down Expand Up @@ -3379,6 +3470,61 @@
"title": "PythonTestElementInner",
"type": "object"
},
"RTestElement": {
"additionalProperties": false,
"properties": {
"r": {
"allOf": [
{
"$ref": "#/$defs/RTestElementInner"
}
],
"description": "R specific test configuration"
}
},
"required": [
"r"
],
"title": "RTestElement",
"type": "object"
},
"RTestElementInner": {
"additionalProperties": false,
"properties": {
"libraries": {
"anyOf": [
{
"minLength": 1,
"type": "string"
},
{
"$ref": "#/$defs/IfStatement"
},
{
"items": {
"anyOf": [
{
"minLength": 1,
"type": "string"
},
{
"$ref": "#/$defs/IfStatement"
}
]
},
"type": "array"
}
],
"description": "A list of R libraries to check after having installed the built package.",
"title": "Libraries"
}
},
"required": [
"libraries"
],
"title": "RTestElementInner",
"type": "object"
},
"Requirements": {
"additionalProperties": false,
"properties": {
Expand Down Expand Up @@ -3920,6 +4066,12 @@
{
"$ref": "#/$defs/PythonTestElement"
},
{
"$ref": "#/$defs/PerlTestElement"
},
{
"$ref": "#/$defs/RTestElement"
},
{
"$ref": "#/$defs/DownstreamTestElement"
},
Expand All @@ -3938,6 +4090,12 @@
{
"$ref": "#/$defs/PythonTestElement"
},
{
"$ref": "#/$defs/PerlTestElement"
},
{
"$ref": "#/$defs/RTestElement"
},
{
"$ref": "#/$defs/DownstreamTestElement"
},
Expand Down
58 changes: 58 additions & 0 deletions tests/test_recipy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,61 @@ def test_patches_invalid_conditional():
# This should raise a validation error
with pytest.raises(PydanticValidationError):
Recipe.validate_python(recipe_dict)


def test_perl_test_valid():
"""Test that recipes with a Perl test pass validation."""
recipe_yaml = """
package:
name: test
version: 1.0.0
tests:
- perl:
uses:
- Call::Context
"""
recipe_dict = yaml.safe_load(recipe_yaml)
Recipe.validate_python(recipe_dict)


def test_perl_test_invalid_missing_uses():
"""Test that a Perl test without uses fails validation."""
recipe_yaml = """
package:
name: test
version: 1.0.0
tests:
- perl: {}
"""
recipe_dict = yaml.safe_load(recipe_yaml)
with pytest.raises(PydanticValidationError):
Recipe.validate_python(recipe_dict)


def test_r_test_valid():
"""Test that recipes with an R test pass validation."""
recipe_yaml = """
package:
name: test
version: 1.0.0
tests:
- r:
libraries:
- ggplot2
"""
recipe_dict = yaml.safe_load(recipe_yaml)
Recipe.validate_python(recipe_dict)


def test_r_test_invalid_missing_libraries():
"""Test that an R test without libraries fails validation."""
recipe_yaml = """
package:
name: test
version: 1.0.0
tests:
- r: {}
"""
recipe_dict = yaml.safe_load(recipe_yaml)
with pytest.raises(PydanticValidationError):
Recipe.validate_python(recipe_dict)