Skip to content

Commit f0b25d2

Browse files
committed
[problem] ProblemSettings: Add other missing keys from 2023-07-draft spec
1 parent da9da87 commit f0b25d2

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

bin/config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
]
2121

2222
KNOWN_LICENSES: Final[Sequence[str]] = [
23-
"cc by-sa",
2423
"cc by",
24+
"cc by-sa",
2525
"cc0",
26-
"public domain",
2726
"educational",
2827
"permission",
28+
"public domain",
2929
"unknown",
3030
]
3131

bin/problem.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,16 @@ def __init__(
242242
self.source_url: str = parse_setting(yaml_data, "source_url", "")
243243
self.license: str = parse_setting(yaml_data, "license", "unknown")
244244
self.rights_owner: str = parse_setting(yaml_data, "rights_owner", "")
245+
# Not implemented in BAPCtools. Should be a date, but we don't do anything with this anyway.
246+
self.embargo_until: str = parse_setting(yaml_data, "embargo-until", "")
245247
self.limits = ProblemLimits(parse_setting(yaml_data, "limits", {}), problem, self)
248+
# TODO: move to testdata.yaml
246249
self.validator_flags: list[str] = parse_setting(yaml_data, "validator_flags", [])
247250
self.keywords: str = parse_setting(yaml_data, "keywords", "")
251+
# Not implemented in BAPCtools. We always test all languges in langauges.yaml.
252+
self.languages: list[str] = parse_optional_list_setting(yaml_data, "languages", str)
253+
# Not yet implemented, pending https://github.com/Kattis/problem-package-format/issues/344
254+
self.constants: dict[str, Any] = parse_setting(yaml_data, "constants", {})
248255

249256
# BAPCtools extensions:
250257
self.verified: Optional[str] = parse_optional_setting(yaml_data, "verified", str)

0 commit comments

Comments
 (0)