From 07e3b29bb015c6de1cf0ecb48569ea2d9637c4aa Mon Sep 17 00:00:00 2001 From: Civics Team Date: Tue, 29 Apr 2025 08:36:47 -0700 Subject: [PATCH] Update the use of the deprecated government-body external identifier from a warning to an error. PiperOrigin-RevId: 752748452 --- rules.py | 8 ++------ tests/rules_test.py | 4 ++-- version.py | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/rules.py b/rules.py index d759be0..5eb2ac0 100755 --- a/rules.py +++ b/rules.py @@ -4589,11 +4589,7 @@ def check(self, element): class GovernmentBodyExternalId(base.BaseRule): - """Warns if the government body is set using an external identifier instead of the GovernmentBody element. - - This rule will be upgraded to an error once all feeds are migrated to the new - schema. - """ + """Errors if the government body is set using an external identifier instead of the GovernmentBody element.""" def elements(self): return ["ExternalIdentifiers"] @@ -4602,7 +4598,7 @@ def check(self, element): if get_external_id_values( element, "government-body" ) or get_external_id_values(element, "governmental-body"): - raise loggers.ElectionWarning.from_message( + raise loggers.ElectionError.from_message( "Specifying government body via external identifiers is deprecated." " Please use the top level GovernmentBody element instead." ) diff --git a/tests/rules_test.py b/tests/rules_test.py index 96191ae..8292482 100644 --- a/tests/rules_test.py +++ b/tests/rules_test.py @@ -12124,7 +12124,7 @@ def testGovernmentBodyExternalId(self): """ - with self.assertRaises(loggers.ElectionWarning) as cm: + with self.assertRaises(loggers.ElectionError) as cm: self.validator.check(etree.fromstring(government_body_string)) self.assertEqual( cm.exception.log_entry[0].message, @@ -12145,7 +12145,7 @@ def testGovernmentalBodyExternalId(self): """ - with self.assertRaises(loggers.ElectionWarning) as cm: + with self.assertRaises(loggers.ElectionError) as cm: self.validator.check(etree.fromstring(government_body_string)) self.assertEqual( cm.exception.log_entry[0].message, diff --git a/version.py b/version.py index ff53f1a..84e157c 100644 --- a/version.py +++ b/version.py @@ -5,4 +5,4 @@ See https://packaging.python.org/guides/single-sourcing-package-version/ """ -__version__ = '1.56.dev2' +__version__ = '1.56.dev3'