civics-cdf-validator 1.61.dev2__tar.gz → 1.61.dev4__tar.gz

{civics_cdf_validator-1.61.dev2/civics_cdf_validator.egg-info → civics_cdf_validator-1.61.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: civics_cdf_validator
-Version: 1.61.dev2
+Version: 1.61.dev4
 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.61.dev2 → civics_cdf_validator-1.61.dev4/civics_cdf_validator.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: civics_cdf_validator
-Version: 1.61.dev2
+Version: 1.61.dev4
 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.61.dev2 → civics_cdf_validator-1.61.dev4}/rules.py

@@ -153,14 +153,7 @@ def _is_executive_office(element, is_post_office_split_feed=False):
 
 
 def _has_government_body(element):
-  if element_has_text(element.find("GovernmentBodyIds")):
-    return True
-  governmental_body = get_entity_info_for_value_type(
-      element,
-      "governmental-body",
-  )
-  government_body = get_entity_info_for_value_type(element, "government-body")
-  return bool(governmental_body or government_body)
+  return element_has_text(element.find("GovernmentBodyIds"))
 
 
 def get_external_id_values(
@@ -415,10 +408,10 @@ class HungarianStyleNotation(base.BaseRule):
 
 
 class LanguageCode(base.BaseRule):
-  """Check that Text elements have a valid language code."""
+  """Check that Text and Uri elements have a valid language code."""
 
   def elements(self):
-    return ["Text"]
+    return ["Text", "Uri"]
 
   def check(self, element):
     if "language" not in element.attrib:
@@ -4935,22 +4928,6 @@ class DeprecatedPartyLeadershipSchema(base.BaseRule):
       )
 
 
-class GovernmentBodyExternalId(base.BaseRule):
-  """Errors if the government body is set using an external identifier instead of the GovernmentBody element."""
-
-  def elements(self):
-    return ["ExternalIdentifiers"]
-
-  def check(self, element):
-    if get_external_id_values(
-        element, "government-body"
-    ) or get_external_id_values(element, "governmental-body"):
-      raise loggers.ElectionError.from_message(
-          "Specifying government body via external identifiers is deprecated."
-          " Please use the top level GovernmentBody element instead."
-      )
-
-
 class ElectoralCommissionCollectionExists(base.BaseRule):
   """ElectoralCommissionCollection should exist."""
 
@@ -5495,7 +5472,6 @@ COMMON_RULES = (
     EmptyText,
     Encoding,
     ExecutiveOfficeShouldNotHaveGovernmentBody,
-    GovernmentBodyExternalId,
     GpUnitOcdId,
     GpUnitsCyclesRefsValidation,
     GpUnitsHaveInternationalizedName,

{civics_cdf_validator-1.61.dev2 → civics_cdf_validator-1.61.dev4}/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.61.dev2'
+__version__ = '1.61.dev4'