civics-cdf-validator 1.49.dev12__py3-none-any.whl → 1.49.dev13__py3-none-any.whl

civics_cdf_validator/rules.py

@@ -4182,34 +4182,32 @@ class ElectionEventDatesAreSequential(base.DateRule):
       raise loggers.ElectionError(self.error_log)
 
 
-class NoSourceDirPathBeforeInitialDeliveryDate(base.BaseRule):
-  """SourceDirPath should only be defined if one of the initial delivery dates is in the past."""
+class SourceDirPathMustBeSetAfterInitialDeliveryDate(base.BaseRule):
+  """SourceDirPath must be set if any InitialDeliveryDate is in the past."""
 
   def elements(self):
     return ["Feed"]
 
   def check(self, element):
-    if not element_has_text(element.find("SourceDirPath")):
+    if element_has_text(element.find("SourceDirPath")):
       return
     today = datetime.date.today()
     today_partial_date = base.PartialDate(
         year=today.year, month=today.month, day=today.day
     )
-    initial_deliveries = element.findall(".//InitialDeliveryDate")
-    if initial_deliveries:
-      for initial_delivery in initial_deliveries:
-        initial_delivery_date = (
-            base.PartialDate.init_partial_date(initial_delivery.text)
-            if element_has_text(initial_delivery)
-            else None
-        )
-        if initial_delivery_date and initial_delivery_date < today_partial_date:
-          return
-      raise loggers.ElectionWarning.from_message(
-          "SourceDirPath is defined but all initialDeliveryDate are in the"
-          " future.",
-          [element],
+    initial_deliveries = element.findall(".//InitialDeliveryDate") or []
+    for initial_delivery in initial_deliveries:
+      initial_delivery_date = (
+          base.PartialDate.init_partial_date(initial_delivery.text)
+          if element_has_text(initial_delivery)
+          else None
       )
+      if initial_delivery_date and initial_delivery_date < today_partial_date:
+        raise loggers.ElectionError.from_message(
+            "SourceDirPath is not set but an InitialDeliveryDate is in the "
+            f"past for feed {element.find('FeedId').text}.",
+            [element],
+        )
 
 
 class OfficeHolderSubFeedDatesAreSequential(base.DateRule):
@@ -4790,10 +4788,10 @@ METADATA_RULES = (
     FeedInactiveDateIsLatestDate,
     FeedInactiveDateSetForNonEvergreenFeed,
     FeedTypeHasValidFeedLongevity,
-    NoSourceDirPathBeforeInitialDeliveryDate,
     OfficeHolderSubFeedDatesAreSequential,
     OptionalAndEmpty,
     Schema,
+    SourceDirPathMustBeSetAfterInitialDeliveryDate,
     SourceDirPathsAreUnique,
     UniqueLabel,
     # go/keep-sorted end

civics_cdf_validator/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.49.dev12'
+__version__ = '1.49.dev13'

{civics_cdf_validator-1.49.dev12.dist-info → civics_cdf_validator-1.49.dev13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: civics_cdf_validator
-Version: 1.49.dev12
+Version: 1.49.dev13
 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.49.dev12.dist-info → civics_cdf_validator-1.49.dev13.dist-info}/RECORD

@@ -3,13 +3,13 @@ civics_cdf_validator/base.py,sha256=5zntjAdAA-bdwYOOStFgUle9LGX_ccelS--thMhUG9A,
 civics_cdf_validator/gpunit_rules.py,sha256=Cg-qlOeVKTCQ5qUKYSxbVrrh3tdLt1X5Eg-7uyyR_SY,9487
 civics_cdf_validator/loggers.py,sha256=LS6U9YWzu72V2Q0PwyE9xE03Ul392UAPRnrp2uRBMLA,6923
 civics_cdf_validator/office_utils.py,sha256=aFxcFQZF2oBn0gPXt_kv1LxHGvwzABScT8X5yaYtVLw,2705
-civics_cdf_validator/rules.py,sha256=mQByCHxof6D0Ifw-SpfnlQcIbPLPaO7f6qPSTLIZGj8,159916
+civics_cdf_validator/rules.py,sha256=Ucw1vURByvUoyMVdBUDnzggO15kExbnpsBZU0Wlg-EE,159895
 civics_cdf_validator/stats.py,sha256=YNqv3Khkt_hJxCIunFBRSl23oXqu5gNjCmWMHFbAcSU,3819
 civics_cdf_validator/validator.py,sha256=2nwlFfQ9AmpTaO5n5ekaO845Rm0JPjNF-Il6FJW_50k,12678
-civics_cdf_validator/version.py,sha256=XR8QyYKrxeV1eHqomROga81p7X4JpjgDXULUY7MGvQU,189
-civics_cdf_validator-1.49.dev12.dist-info/licenses/LICENSE-2.0.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-civics_cdf_validator-1.49.dev12.dist-info/METADATA,sha256=5cxrxIuKc_9jy4AY3mF2hlOt9br6zBmP57K8S-1xow0,1009
-civics_cdf_validator-1.49.dev12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-civics_cdf_validator-1.49.dev12.dist-info/entry_points.txt,sha256=QibgvtMOocwDi7fQ1emgMJ2lIlI41sW0__KIQdnVn90,77
-civics_cdf_validator-1.49.dev12.dist-info/top_level.txt,sha256=PYT5Eclxbop5o6DJIcgs4IeU6Ds5jqyftjoFbgkkJYo,21
-civics_cdf_validator-1.49.dev12.dist-info/RECORD,,
+civics_cdf_validator/version.py,sha256=VFMdAjvjwr34E1vqDkhcL8mmJWGxF_XUDagoSEfJ11Y,189
+civics_cdf_validator-1.49.dev13.dist-info/licenses/LICENSE-2.0.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+civics_cdf_validator-1.49.dev13.dist-info/METADATA,sha256=MBpl8nej6fgkR0c0jy0owtovKInrOYSLDPpp1k8viaw,1009
+civics_cdf_validator-1.49.dev13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+civics_cdf_validator-1.49.dev13.dist-info/entry_points.txt,sha256=QibgvtMOocwDi7fQ1emgMJ2lIlI41sW0__KIQdnVn90,77
+civics_cdf_validator-1.49.dev13.dist-info/top_level.txt,sha256=PYT5Eclxbop5o6DJIcgs4IeU6Ds5jqyftjoFbgkkJYo,21
+civics_cdf_validator-1.49.dev13.dist-info/RECORD,,