0.9.7: rules expert: raise if intelmqmail cannot be imported

and list intelmqmail as python package dependency
Intevation · Jun 29, 2022 · 33e8d88 · 33e8d88
1 parent f2f2b9c
commit 33e8d88
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+intelmq-certbund-contact (0.9.7-1) unstable; urgency=medium
+
+  * rules expert: raise error if intelmqmail cannot be imported.
+  * list intelmqmail as dependency in python package.
+
+ -- Sebastian Wagner <[email protected]>  Wed, 29 Jun 2022 15:46:40 +0200
+
 intelmq-certbund-contact (0.9.6-2) unstable; urgency=medium
 
   * Packaging: Try with --with-quilt in rules.

diff --git a/intelmq/bots/experts/certbund_rules/expert.py b/intelmq/bots/experts/certbund_rules/expert.py
@@ -29,6 +29,8 @@
     if 'unittest' in sys.modules:
         import unittest
         raise unittest.SkipTest("Importing intelmqmail.script failed.")
+    else:
+        raise
 
 from intelmq.lib.bot import Bot
 from intelmq_certbund_contact.rulesupport import Context

diff --git a/setup.py b/setup.py
@@ -7,6 +7,7 @@
 REQUIRES = [
     'intelmq>=3.0.2',
     'psycopg2',
+    'intelmqmail',
 ]
 
 BOTS = []
@@ -24,7 +25,7 @@
 
 setup(
     name='intelmq_certbund_contact',
-    version="0.9.5",
+    version="0.9.7",
     maintainer='Intevation GmbH',
     maintainer_email='[email protected]',
     python_requires='>=3.4',