nn_ensemble is now a core backend, remove conditional imports

NatLibFi · Sep 30, 2019 · a789f46 · a789f46
1 parent 1b94abe
commit a789f46
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/annif/backend/__init__.py b/annif/backend/__init__.py
@@ -5,6 +5,7 @@
 from . import http
 from . import tfidf
 from . import pav
+from . import nn_ensemble
 import annif
 
 
@@ -27,6 +28,7 @@ def get_backend(backend_id):
 register_backend(http.HTTPBackend)
 register_backend(tfidf.TFIDFBackend)
 register_backend(pav.PAVBackend)
+register_backend(nn_ensemble.NNEnsembleBackend)
 
 # Optional backends
 try:
@@ -43,10 +45,3 @@ def get_backend(backend_id):
 except ImportError:
     annif.logger.debug("vowpalwabbit not available, not enabling " +
                        "vw_multi & vw_ensemble backends")
-
-try:
-    from . import nn_ensemble
-    register_backend(nn_ensemble.NNEnsembleBackend)
-except ImportError:
-    annif.logger.debug("Keras and TensorFlow not available, not enabling " +
-                       "nn_ensemble backend")
diff --git a/tests/test_backend_nn_ensemble.py b/tests/test_backend_nn_ensemble.py
@@ -7,8 +7,6 @@
 import annif.project
 from annif.exception import NotInitializedException
 
-pytest.importorskip("annif.backend.nn_ensemble")
-
 
 def test_nn_ensemble_suggest_no_model(datadir, project):
     nn_ensemble_type = annif.backend.get_backend('nn_ensemble')