Rename result_backends to backends

For #42 * Import all backends into backends __init__ to allow simpler imports
TheGhouls · Jan 2, 2017 · e4c2371 · e4c2371
1 parent bff1a08
commit e4c2371
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 5 deletions.
diff --git a/oct/backends/__init__.py b/oct/backends/__init__.py
@@ -0,0 +1,12 @@
+from oct.backends.redis import RedisStore, RedisLoader
+from oct.backends.dummy import DummyStore, DummyLoader
+from oct.backends.sqlite import SQLiteStore, SQLiteLoader
+
+__all__ = [
+    'RedisStore',
+    'RedisLoader',
+    'DummyStore',
+    'DummyLoader',
+    'SQLiteStore',
+    'SQLiteLoader'
+]
diff --git a/oct/result_backends/base.py → oct/backends/base.py b/oct/result_backends/base.py → oct/backends/base.py
diff --git a/oct/result_backends/dummy.py → oct/backends/dummy.py b/oct/result_backends/dummy.py → oct/backends/dummy.py
diff --git a/oct/result_backends/redis.py → oct/backends/redis.py b/oct/result_backends/redis.py → oct/backends/redis.py
diff --git a/oct/result_backends/sqlite.py → oct/backends/sqlite.py b/oct/result_backends/sqlite.py → oct/backends/sqlite.py
diff --git a/oct/result_backends/__init__.py b/oct/result_backends/__init__.py
diff --git a/oct/utilities/configuration.py b/oct/utilities/configuration.py
@@ -103,7 +103,7 @@ def get_loader_class(config):
     :param dict config: project configuration dict
     """
     loader_str = config.get('results_backend', {})\
-                       .get('loader', 'oct.result_backends.sqlite.SQLiteLoader')
+                       .get('loader', 'oct.backends.SQLiteLoader')
 
     as_list = loader_str.split('.')
     module = importlib.import_module(".".join(as_list[:-1]))
@@ -117,7 +117,7 @@ def get_store_class(config):
     :param dict config: project configuration dict
     """
     store_str = config.get('results_backend', {})\
-                      .get('store', 'oct.result_backends.sqlite.SQLiteStore')
+                      .get('store', 'oct.backends.SQLiteStore')
 
     as_list = store_str.split('.')
     module = importlib.import_module(".".join(as_list[:-1]))

diff --git a/oct/utilities/templates/configuration/config.yml b/oct/utilities/templates/configuration/config.yml
@@ -32,8 +32,8 @@ results_database:
   params: null
   insert_limit: 150
 results_backend:
-  store: "oct.result_backends.sqlite.SQLiteStore"
-  loader: "oct.result_backends.sqlite.SQLiteStore"
+  store: "oct.backends.SQLiteStore"
+  loader: "oct.backends.SQLiteLoader"
   backend_params:
     db: 0
     host: 'localhost'

diff --git a/setup.py b/setup.py
@@ -18,7 +18,7 @@
         'oct.utilities',
         'oct.tools',
         'oct.results',
-        'oct.result_backends'
+        'oct.backends'
     ],
     package_data={
         'oct.utilities': [