Merge "Move the persistence base to the parent directory"

doc/source/persistence.rst

@@ -38,7 +38,7 @@ How it is used
 
 On :doc:`engine <engines>` construction typically a backend (it can be
 optional) will be provided which satisfies the
-:py:class:`~taskflow.persistence.backends.base.Backend` abstraction. Along with
+:py:class:`~taskflow.persistence.base.Backend` abstraction. Along with
 providing a backend object a
 :py:class:`~taskflow.persistence.logbook.FlowDetail` object will also be
 created and provided (this object will contain the details about the flow to be
@@ -55,7 +55,7 @@ interface to the underlying backend storage objects (it provides helper
 functions that are commonly used by the engine, avoiding repeating code when
 interacting with the provided
 :py:class:`~taskflow.persistence.logbook.FlowDetail` and
-:py:class:`~taskflow.persistence.backends.base.Backend` objects). As an engine
+:py:class:`~taskflow.persistence.base.Backend` objects). As an engine
 initializes it will extract (or create)
 :py:class:`~taskflow.persistence.logbook.AtomDetail` objects for each atom in
 the workflow the engine will be executing.
@@ -72,7 +72,7 @@ predecessor :py:class:`~taskflow.persistence.logbook.AtomDetail` outputs and
 states (which may have been persisted in a past run). This will result in
 either using there previous information or by running those predecessors and
 saving their output to the :py:class:`~taskflow.persistence.logbook.FlowDetail`
-and :py:class:`~taskflow.persistence.backends.base.Backend` objects. This
+and :py:class:`~taskflow.persistence.base.Backend` objects. This
 execution, analysis and interaction with the storage objects continues (what is
 described here is a simplification of what really happens; which is quite a bit
 more complex) until the engine has finished running (at which point the engine
@@ -268,7 +268,7 @@ Interfaces
 ==========
 
 .. automodule:: taskflow.persistence.backends
-.. automodule:: taskflow.persistence.backends.base
+.. automodule:: taskflow.persistence.base
 .. automodule:: taskflow.persistence.logbook
 
 Implementations

taskflow/persistence/backends/impl_dir.py

@@ -24,7 +24,7 @@ import six
 
 from taskflow import exceptions as exc
 from taskflow import logging
-from taskflow.persistence.backends import base
+from taskflow.persistence import base
 from taskflow.persistence import logbook
 from taskflow.utils import lock_utils
 from taskflow.utils import misc

taskflow/persistence/backends/impl_memory.py

@@ -21,7 +21,7 @@ import six
 
 from taskflow import exceptions as exc
 from taskflow import logging
-from taskflow.persistence.backends import base
+from taskflow.persistence import base
 from taskflow.persistence import logbook
 from taskflow.utils import lock_utils
 

taskflow/persistence/backends/impl_sqlalchemy.py

@@ -33,9 +33,9 @@ from sqlalchemy import pool as sa_pool
 
 from taskflow import exceptions as exc
 from taskflow import logging
-from taskflow.persistence.backends import base
 from taskflow.persistence.backends.sqlalchemy import migration
 from taskflow.persistence.backends.sqlalchemy import models
+from taskflow.persistence import base
 from taskflow.persistence import logbook
 from taskflow.types import failure
 from taskflow.utils import eventlet_utils

taskflow/persistence/backends/impl_zookeeper.py

@@ -22,7 +22,7 @@ from oslo.serialization import jsonutils
 
 from taskflow import exceptions as exc
 from taskflow import logging
-from taskflow.persistence.backends import base
+from taskflow.persistence import base
 from taskflow.persistence import logbook
 from taskflow.utils import kazoo_utils as k_utils
 from taskflow.utils import misc