Skip to content

Commit ec543f1

Browse files
committed
Test prereqs, fix requireds
1 parent af9ecfc commit ec543f1

File tree

7 files changed

+369
-24
lines changed

7 files changed

+369
-24
lines changed

schema/v1/bugtracker.schema.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@
1616
"description": "An email address to which bug reports can be sent"
1717
}
1818
},
19-
"anyOf": [
20-
{ "required": ["web"] },
21-
{ "required": ["mailto"] },
22-
{ "required": ["web", "mailto"] }
23-
],
19+
"anyOf": [{ "required": ["web"] }, { "required": ["mailto"] }],
2420
"patternProperties": {
2521
"^[xX]_.": {
2622
"description": "Custom key"

schema/v1/no_index.schema.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,7 @@
2626
}
2727
}
2828
},
29-
"anyOf": [
30-
{ "required": ["file"] },
31-
{ "required": ["directory"] },
32-
{ "required": ["file", "directory"] }
33-
],
29+
"anyOf": [{ "required": ["file"] }, { "required": ["directory"] }],
3430
"patternProperties": {
3531
"^[xX]_.": {
3632
"description": "Custom key"

schema/v1/prereq_phase.schema.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,12 @@
2828
}
2929
},
3030
"additionalProperties": false,
31-
"minProperties": 1,
32-
"$comment": "Really should require at least one of the named properties; this allows for a single _x property. Good enough for now.",
31+
"anyOf": [
32+
{ "required": ["requires"] },
33+
{ "required": ["recommends"] },
34+
{ "required": ["suggests"] },
35+
{ "required": ["conflicts"] }
36+
],
3337
"examples": [
3438
{
3539
"requires": {

schema/v1/prereqs.schema.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,13 @@
2626
"description": "The develop phase’s prereqs are extensions needed to work on the distribution’s source code as its maintainer does. These tools might be needed to build a release tarball, to run maintainer-only tests, or to perform other tasks related to developing new versions of the distribution."
2727
}
2828
},
29-
"minProperties": 1,
30-
"$comment": "Really should require at least one of the named properties; this allows for a single _x property. Good enough for now.",
29+
"anyOf": [
30+
{ "required": ["configure"] },
31+
{ "required": ["build"] },
32+
{ "required": ["test"] },
33+
{ "required": ["runtime"] },
34+
{ "required": ["develop"] }
35+
],
3136
"patternProperties": {
3237
"^[xX]_.": {
3338
"description": "Custom key"

schema/v1/repository.schema.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@
2020
"description": "a lowercase string indicating the VCS used."
2121
}
2222
},
23-
"anyOf": [
24-
{ "required": ["url", "type"] },
25-
{ "required": ["web"] },
26-
{ "required": ["web", "url", "type"] }
27-
],
23+
"anyOf": [{ "required": ["url", "type"] }, { "required": ["web"] }],
2824
"patternProperties": {
2925
"^[xX]_.": {
3026
"description": "Custom key"

schema/v1/resources.schema.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
}
2020
},
2121
"additionalProperties": false,
22-
"minProperties": 1,
23-
"$comment": "Really should require at least one of the named properties; this allows for a single _x property. Good enough for now.",
22+
"anyOf": [
23+
{ "required": ["homepage"] },
24+
{ "required": ["bugtracker"] },
25+
{ "required": ["repository"] }
26+
],
2427
"examples": [
2528
{
2629
"homepage": "https://pgxn.org/",

0 commit comments

Comments
 (0)