civics-cdf-validator 1.66.dev13__tar.gz → 1.67.dev0__tar.gz

{civics_cdf_validator-1.66.dev13/civics_cdf_validator.egg-info → civics_cdf_validator-1.67.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: civics_cdf_validator
-Version: 1.66.dev13
+Version: 1.67.dev0
 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.66.dev13 → civics_cdf_validator-1.67.dev0/civics_cdf_validator.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: civics_cdf_validator
-Version: 1.66.dev13
+Version: 1.67.dev0
 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.66.dev13 → civics_cdf_validator-1.67.dev0}/rules.py

@@ -945,9 +945,10 @@ class CandidatesReferencedInRelatedContests(base.BaseRule):
   """Candidate should not be referred to by multiple unrelated contests.
 
   A Candidate object should only be referenced from one contest, unless the
-  contests are related (connected by ComposingContestIds). If a Person is
-  running in multiple unrelated Contests, then that Person is a Candidate
-  several times over, but a Candida(te|cy) can't span unrelated contests.
+  contests are related (connected by ComposingContestIds or
+  SubsequentContestId). If a Person is running in multiple unrelated Contests,
+  then that Person is a Candidate several times over, but a Candida(te|cy)
+  can't span unrelated contests.
   """
 
   def __init__(self, election_tree, schema_tree, **kwargs):
@@ -1005,6 +1006,21 @@ class CandidatesReferencedInRelatedContests(base.BaseRule):
       self.contest_graph.add_node(contest.get("objectId"))
 
     for contest in contests:
+      subsequent_contest = contest.find("SubsequentContestId")
+      if element_has_text(subsequent_contest):
+        subsequent_contest_id = subsequent_contest.text
+        # subsequent contest id is not valid if it isn't in the graph
+        if not self.contest_graph.has_node(subsequent_contest_id):
+          raise loggers.ElectionError.from_message(
+              (
+                  "Contest {} contains a subsequent Contest Id ({}) that does "
+                  "not exist."
+              ).format(contest.get("objectId"), subsequent_contest_id),
+              [subsequent_contest],
+          )
+        self.contest_graph.add_edge(
+            contest.get("objectId"), subsequent_contest_id
+        )
       # Add the composing contest if it exists
       composing_contests = contest.find("ComposingContestIds")
       if element_has_text(composing_contests):

{civics_cdf_validator-1.66.dev13 → civics_cdf_validator-1.67.dev0}/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.66.dev13'
+__version__ = '1.67.dev0'