civics-cdf-validator 1.58.dev6__tar.gz → 1.58.dev8__tar.gz

{civics_cdf_validator-1.58.dev6/civics_cdf_validator.egg-info → civics_cdf_validator-1.58.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: civics_cdf_validator
-Version: 1.58.dev6
+Version: 1.58.dev8
 Summary: Checks if an election feed follows best practices
 Home-page: https://github.com/google/civics_cdf_validator
 Author: Google Civics

{civics_cdf_validator-1.58.dev6 → civics_cdf_validator-1.58.dev8/civics_cdf_validator.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: civics_cdf_validator
-Version: 1.58.dev6
+Version: 1.58.dev8
 Summary: Checks if an election feed follows best practices
 Home-page: https://github.com/google/civics_cdf_validator
 Author: Google Civics

{civics_cdf_validator-1.58.dev6 → civics_cdf_validator-1.58.dev8}/rules.py

@@ -4869,21 +4869,16 @@ ELECTION_RULES = COMMON_RULES + (
     MultipleCandidatesPointToTheSamePersonInTheSameContest,
     MultipleInternationalizedTextWithSameLanguageCode,
     OfficeHasjurisdictionSameAsElectoralDistrict,
+    PartiesHaveValidColors,
     PartisanPrimary,
     PartisanPrimaryHeuristic,
+    PercentSum,
     ProperBallotSelection,
     SelfDeclaredCandidateMethod,
     SingularPartySelection,
     SubsequentContestIdIsValidRelatedContest,
-    ValidateInfoUriAnnotation,
-    # go/keep-sorted end
-)
-
-ELECTION_RESULTS_RULES = ELECTION_RULES + (
-    # go/keep-sorted start
-    PartiesHaveValidColors,
-    PercentSum,
     ValidateDuplicateColors,
+    ValidateInfoUriAnnotation,
     VoteCountTypesCoherency,
     VoteCountValidSeatsDeltaTypes,
     # go/keep-sorted end
@@ -4948,7 +4943,6 @@ VOTER_INFORMATION_RULES = COMMON_RULES + (
 ALL_RULES = frozenset(
     COMMON_RULES
     + ELECTION_RULES
-    + ELECTION_RESULTS_RULES
     + OFFICEHOLDER_RULES
     + COMMITTEE_RULES
     + ELECTION_DATES_RULES

{civics_cdf_validator-1.58.dev6 → civics_cdf_validator-1.58.dev8}/validator.py

@@ -249,26 +249,26 @@ def filter_all_rules_using_user_arg(rules_allowlist, rule_set, rules_blocklist):
     rule_names = rules_allowlist
   else:
     if rule_set == rules.RuleSet.ELECTION:
-      rule_names = [x.__name__ for x in rules.ELECTION_RULES]
+      rule_names = [rule.__name__ for rule in rules.ELECTION_RULES]
+    elif rule_set == rules.RuleSet.ELECTION_RESULTS:
+      rule_names = [rule.__name__ for rule in rules.ELECTION_RULES]
     elif rule_set == rules.RuleSet.OFFICEHOLDER:
-      rule_names = [x.__name__ for x in rules.OFFICEHOLDER_RULES]
+      rule_names = [rule.__name__ for rule in rules.OFFICEHOLDER_RULES]
     elif rule_set == rules.RuleSet.COMMITTEE:
-      rule_names = [x.__name__ for x in rules.COMMITTEE_RULES]
+      rule_names = [rule.__name__ for rule in rules.COMMITTEE_RULES]
     elif rule_set == rules.RuleSet.ELECTION_DATES:
-      rule_names = [x.__name__ for x in rules.ELECTION_DATES_RULES]
-    elif rule_set == rules.RuleSet.ELECTION_RESULTS:
-      rule_names = [x.__name__ for x in rules.ELECTION_RESULTS_RULES]
+      rule_names = [rule.__name__ for rule in rules.ELECTION_DATES_RULES]
     elif rule_set == rules.RuleSet.METADATA:
-      rule_names = [x.__name__ for x in rules.METADATA_RULES]
+      rule_names = [rule.__name__ for rule in rules.METADATA_RULES]
     elif rule_set == rules.RuleSet.VOTER_INFORMATION:
-      rule_names = [x.__name__ for x in rules.VOTER_INFORMATION_RULES]
+      rule_names = [rule.__name__ for rule in rules.VOTER_INFORMATION_RULES]
     else:
       raise AssertionError("Invalid rule_set: " + rule_set)
     if rules_blocklist:
       rule_names = set(rule_names) - set(rules_blocklist)
 
   rule_classes_to_check = [
-      x for x in rules.ALL_RULES if x.__name__ in rule_names
+      rule for rule in rules.ALL_RULES if rule.__name__ in rule_names
   ]
   return rule_classes_to_check
 

{civics_cdf_validator-1.58.dev6 → civics_cdf_validator-1.58.dev8}/version.py

@@ -5,4 +5,4 @@ No dependencies should be added to this module.
 See https://packaging.python.org/guides/single-sourcing-package-version/
 """
 
-__version__ = '1.58.dev6'
+__version__ = '1.58.dev8'