Skip to content

Revert "Merge pull request #619 from dodona-edu/files-features" #623

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
chvp merged 1 commit into from
Mar 10, 2026
+401 −4,274
Merged

Revert "Merge pull request #619 from dodona-edu/files-features" #623

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
2 changes: 1 addition & 1 deletion tested/configs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class Options:
"""


@fallback_field({"testplan": "test_suite", "plan_name": "test_suite"})
@fallback_field(get_converter(), {"testplan": "test_suite", "plan_name": "test_suite"})
@define
class DodonaConfig:
resources: Path
Expand Down
170 changes: 5 additions & 165 deletions tested/dsl/schema-strict.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,18 +276,11 @@
},
"stdin" : {
"description" : "Stdin for this context",
"oneOf" : [
{
"type" : [
"string",
"number",
"integer",
"boolean"
]
},
{
"$ref": "#/definitions/fileData"
}
"type" : [
"string",
"number",
"integer",
"boolean"
]
},
"arguments" : {
Expand Down Expand Up @@ -343,18 +336,11 @@
]
},
"files" : {
"description" : "Deprecated: use input_files instead.",
"type" : "array",
"items" : {
"$ref" : "#/definitions/file"
}
},
"input_files": {
"type": "array",
"items": {
"$ref": "#/definitions/fileDataRequiredPath"
}
},
"return" : {
"description" : "Expected return value",
"$ref" : "#/definitions/returnOutputChannel"
Expand All @@ -368,10 +354,6 @@
"$ref" : "#/definitions/textOutputChannel"
},
"file": {
"description" : "Deprecated: use output_files instead.",
"$ref" : "#/definitions/fileOutputChannel"
},
"output_files": {
"description" : "Expected files generated by the submission.",
"$ref" : "#/definitions/fileOutputChannel"
},
Expand Down Expand Up @@ -616,35 +598,6 @@
}
}
},
{
"type" : "object",
"description" : "Built-in oracle for files.",
"required" : [
"data"
],
"properties" : {
"data" : {
"type" : "array",
"description" : "Files to expect.",
"items" : {
"$ref" : "#/definitions/fileDataFullyRequired"
}
},
"oracle" : {
"const" : "builtin"
},
"config" : {
"$ref" : "#/definitions/fileConfigurationOptions"
}
}
},
{
"type" : "array",
"description" : "Built-in oracle for files.",
"items" : {
"$ref" : "#/definitions/fileDataFullyRequired"
}
},
{
"type" : "object",
"description" : "Custom oracle for file values.",
Expand Down Expand Up @@ -690,49 +643,6 @@
}
}
}
},
{
"type" : "object",
"description" : "Custom oracle for file values.",
"required" : [
"oracle",
"data"
],
"properties" : {
"oracle" : {
"const" : "custom_check"
},
"data" : {
"type" : "array",
"description" : "Files to expect.",
"items" : {
"$ref" : "#/definitions/fileDataFullyRequired"
}
},
"file" : {
"type" : "string",
"description" : "The path to the file containing the custom check function."
},
"name" : {
"type" : "string",
"description" : "The name of the custom check function.",
"default" : "evaluate"
},
"arguments" : {
"type" : "array",
"description" : "List of YAML (or tagged expression) values to use as arguments to the function.",
"items" : {
"$ref" : "#/definitions/yamlValueOrPythonExpression"
}
},
"languages": {
"type" : "array",
"description" : "Which programming languages are supported by this oracle.",
"items" : {
"$ref" : "#/definitions/programmingLanguage"
}
}
}
}
]
},
Expand Down Expand Up @@ -980,76 +890,6 @@
"$ref" : "#/definitions/fileConfigurationOptions"
}
}
},
"fileData": {
"type": "object",
"additionalProperties" : false,
"anyOf" : [
{
"required" : [
"content"
]
},
{
"required" : [
"path"
]
}
],
"properties": {
"content": {
"type": [
"string",
"path"
],
"description" : "Content of the file, which will be provided inline or written to disk in the workdir. If a !path, the file contents will be read from the provided path."
},
"path": {
"type": "string",
"description" : "Path to the file, relative to the workdir. Used to display in the output."
}
}
},
"fileDataRequiredPath": {
"type": "object",
"additionalProperties" : false,
"required" : [
"path"
],
"properties": {
"content": {
"type": [
"string",
"path"
],
"description" : "Content of the file, which will be provided inline or written to disk in the workdir. If a !path, the file contents will be read from the provided path."
},
"path": {
"type": "string",
"description" : "Path to the file, relative to the workdir. Used to display in the output."
}
}
},
"fileDataFullyRequired": {
"type": "object",
"additionalProperties" : false,
"required" : [
"path",
"content"
],
"properties": {
"content": {
"type": [
"string",
"path"
],
"description" : "Content of the file, which will be provided inline or written to disk in the workdir. If a !path, the file contents will be read from the provided path."
},
"path": {
"type": "string",
"description" : "Path to the file, relative to the workdir. Used to display in the output."
}
}
}
}
}
Loading