civics-cdf-validator 1.47.dev4__tar.gz → 1.47.dev6__tar.gz

{civics_cdf_validator-1.47.dev4/civics_cdf_validator.egg-info → civics_cdf_validator-1.47.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: civics_cdf_validator
-Version: 1.47.dev4
+Version: 1.47.dev6
 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.47.dev4 → civics_cdf_validator-1.47.dev6/civics_cdf_validator.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: civics_cdf_validator
-Version: 1.47.dev4
+Version: 1.47.dev6
 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.47.dev4 → civics_cdf_validator-1.47.dev6}/gpunit_rules.py

@@ -155,9 +155,9 @@ class OcdIdsExtractor(object):
       else:
         if self.check_github:
           last_mod_date = datetime.datetime.fromtimestamp(
-              os.path.getmtime(countries_filename))
+              os.path.getmtime(countries_filename), datetime.timezone.utc)
 
-          seconds_since_mod = (datetime.datetime.now() -
+          seconds_since_mod = (datetime.datetime.now(datetime.timezone.utc) -
                                last_mod_date).total_seconds()
 
           # If 1 hour has elapsed, check GitHub for the last file update.

{civics_cdf_validator-1.47.dev4 → civics_cdf_validator-1.47.dev6}/rules.py

@@ -2168,6 +2168,31 @@ class ValidJurisdictionID(base.ValidReferenceRule):
     return {elem.get("objectId") for elem in gp_unit_elements}
 
 
+class OfficeHasjurisdictionSameAsElectoralDistrict(base.BaseRule):
+  """In election feeds, office has the electoral district same as jurisdiction."""
+
+  def elements(self):
+    return ["Office"]
+
+  def check(self, element):
+    jurisdiction_values = get_entity_info_for_value_type(
+        element, "jurisdiction-id")
+    jurisdiction_values = [
+        j_id.strip() for j_id in jurisdiction_values if j_id.strip()
+    ]
+    if not jurisdiction_values or len(jurisdiction_values) > 1:
+      return
+
+    electoral_district = element.find(".//ElectoralDistrictId")
+    if electoral_district is None:
+      return
+    if electoral_district.text.strip() != jurisdiction_values[0]:
+      raise loggers.ElectionInfo.from_message(
+          "Office has electoral district different from jurisdiction.",
+          [element],
+      )
+
+
 class OfficesHaveValidOfficeLevel(base.BaseRule):
   """Each office must have a valid office-level."""
 
@@ -4085,6 +4110,7 @@ ELECTION_RULES = COMMON_RULES + (
     ContestEndDateOccursBeforeSubsequentContestStartDate,
     ContestStartDateContainsCorrespondingEndDate,
     CandidateContestTypesAreCompatible,
+    OfficeHasjurisdictionSameAsElectoralDistrict,
 )
 
 ELECTION_RESULTS_RULES = ELECTION_RULES + (

{civics_cdf_validator-1.47.dev4 → civics_cdf_validator-1.47.dev6}/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.47.dev4'
+__version__ = '1.47.dev6'