cleaner ipyparallel warning handling

quaquel · quaquel · commit c59ce162f9fb · 2023-12-08T16:25:21.000+01:00
diff --git a/ema_workbench/em_framework/__init__.py b/ema_workbench/em_framework/__init__.py
@@ -93,15 +93,15 @@
     to_problem,
     to_robust_problem,
 )
-from .futures_ipyparallel import IpyparallelEvaluator
-from .futures_multiprocessing import MultiprocessingEvaluator
-from .futures_mpi import MPIEvaluator
-from .outputspace_exploration import OutputSpaceExploration
 
 try:
-    from .evaluators import IpyparallelEvaluator
+    from .futures_ipyparallel import IpyparallelEvaluator
 except ImportError:
+    warnings.warn("ipyparallel not installed - IpyparalleEvaluator not available")
     IpyparallelEvaluator = None
-    warnings.warn("ipyparallel not available", ImportWarning)
+
+from .futures_multiprocessing import MultiprocessingEvaluator
+from .futures_mpi import MPIEvaluator
+from .outputspace_exploration import OutputSpaceExploration
 
 del warnings
diff --git a/ema_workbench/em_framework/futures_ipyparallel.py b/ema_workbench/em_framework/futures_ipyparallel.py
@@ -9,20 +9,14 @@
 import shutil
 import socket
 import threading
-import warnings
-
-warnings.simplefilter("once", ImportWarning)
-
-try:
-    import zmq
-    from ipyparallel.engine.log import EnginePUBHandler
-    from jupyter_client.localinterfaces import localhost
-    from traitlets import Unicode, Instance, List
-    from traitlets.config import Application
-    from traitlets.config.configurable import LoggingConfigurable
-    from zmq.eventloop import ioloop, zmqstream
-except (ImportError, ModuleNotFoundError):
-    warnings.warn("ipyparallel not installed - IpyparalleEvaluator not available")
+
+import zmq
+from ipyparallel.engine.log import EnginePUBHandler
+from jupyter_client.localinterfaces import localhost
+from traitlets import Unicode, Instance, List
+from traitlets.config import Application
+from traitlets.config.configurable import LoggingConfigurable
+from zmq.eventloop import ioloop, zmqstream
 
 from . import experiment_runner
 from .futures_util import setup_working_directories
