Skip to content

Commit 061479d

Browse files
committed
move the overrides into the package policy
1 parent f011061 commit 061479d

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

minimum_versions.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,6 @@
2626
"exclude": {"type": "array", "items": {"type": "string"}},
2727
"channels": {"type": "array", "items": {"type": "string"}},
2828
"platforms": {"type": "array", "items": {"type": "string"}},
29-
"overrides": {
30-
"type": "object",
31-
"patternProperties": {
32-
"^[a-z][-a-z_]*": {"type": "string", "format": "date"}
33-
},
34-
"additionalProperties": False,
35-
},
3629
"policy": {
3730
"type": "object",
3831
"properties": {
@@ -44,15 +37,22 @@
4437
"additionalProperties": False,
4538
},
4639
"default": {"type": "integer", "minimum": 1},
40+
"overrides": {
41+
"type": "object",
42+
"patternProperties": {
43+
"^[a-z][-a-z_]*": {"type": "string", "format": "date"}
44+
},
45+
"additionalProperties": False,
46+
},
4747
"ignored_violations": {
4848
"type": "array",
4949
"items": {"type": "string", "pattern": "^[a-z][-a-z_]*$"},
5050
},
5151
},
52-
"required": ["packages", "default", "ignored_violations"],
52+
"required": ["packages", "default", "overrides", "ignored_violations"],
5353
},
5454
},
55-
"required": ["exclude", "channels", "platforms", "overrides"],
55+
"required": ["exclude", "channels", "platforms", "policy"],
5656
}
5757

5858

@@ -165,7 +165,7 @@ def parse_policy(file):
165165
package_months=package_policy["packages"],
166166
default_months=package_policy["default"],
167167
ignored_violations=package_policy["ignored_violations"],
168-
overrides=policy["overrides"],
168+
overrides=package_policy["overrides"],
169169
)
170170

171171

policy.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@ channels:
1515
platforms:
1616
- noarch
1717
- linux-64
18-
# in case conda-forge release dates are not accurate enough
19-
overrides: {}
2018
policy:
2119
# all packages in months
2220
packages:
2321
python: 30
2422
numpy: 18
2523
default: 12
24+
overrides: {}
2625
# these packages don't fail the CI, but will be printed in the report
2726
ignored_violations:
2827
- pydap

0 commit comments

Comments
 (0)