diff --git a/taskflow/conductors/backends/impl_blocking.py b/taskflow/conductors/backends/impl_blocking.py index 26a75c8a..e3f2f5ab 100644 --- a/taskflow/conductors/backends/impl_blocking.py +++ b/taskflow/conductors/backends/impl_blocking.py @@ -83,7 +83,7 @@ class BlockingConductor(base.Conductor): raise ValueError("Invalid timeout literal: %s" % (wait_timeout)) self._dead = threading.Event() - @removals.removed_kwarg('timeout', version="0.8", removal_version="?") + @removals.removed_kwarg('timeout', version="0.8", removal_version="2.0") def stop(self, timeout=None): """Requests the conductor to stop dispatching. diff --git a/taskflow/conductors/single_threaded.py b/taskflow/conductors/single_threaded.py index e1fafcce..6f50fe74 100644 --- a/taskflow/conductors/single_threaded.py +++ b/taskflow/conductors/single_threaded.py @@ -22,7 +22,7 @@ from taskflow.conductors.backends import impl_blocking # TODO(harlowja): remove this module soon... removals.removed_module(__name__, replacement="the conductor entrypoints", - version="0.8", removal_version="?", + version="0.8", removal_version="2.0", stacklevel=4) # TODO(harlowja): remove this proxy/legacy class soon... diff --git a/taskflow/engines/base.py b/taskflow/engines/base.py index f41ae583..4b6a648d 100644 --- a/taskflow/engines/base.py +++ b/taskflow/engines/base.py @@ -55,7 +55,7 @@ class Engine(object): @property @moves.moved_property('atom_notifier', version="0.6", - removal_version="?") + removal_version="2.0") def task_notifier(self): """The task notifier. @@ -128,4 +128,4 @@ class Engine(object): # TODO(harlowja): remove in 0.7 or later... EngineBase = moves.moved_class(Engine, 'EngineBase', __name__, - version="0.6", removal_version="?") + version="0.6", removal_version="2.0") diff --git a/taskflow/engines/helpers.py b/taskflow/engines/helpers.py index a9171e46..679b65ea 100644 --- a/taskflow/engines/helpers.py +++ b/taskflow/engines/helpers.py @@ -92,7 +92,7 @@ def _extract_engine(**kwargs): stacklevel = sum(1 for _frame in finder) decorator = renames.renamed_kwarg('engine_conf', 'engine', version="0.6", - removal_version="?", + removal_version="2.0", # Three is added on since the # decorator adds three of its own # stack levels that we need to diff --git a/taskflow/listeners/base.py b/taskflow/listeners/base.py index a83cd79b..8a0badb0 100644 --- a/taskflow/listeners/base.py +++ b/taskflow/listeners/base.py @@ -166,7 +166,7 @@ class Listener(object): # TODO(harlowja): remove in 0.7 or later... ListenerBase = moves.moved_class(Listener, 'ListenerBase', __name__, - version="0.6", removal_version="?") + version="0.6", removal_version="2.0") @six.add_metaclass(abc.ABCMeta) @@ -213,7 +213,7 @@ class DumpingListener(Listener): # TODO(harlowja): remove in 0.7 or later... class LoggingBase(moves.moved_class(DumpingListener, 'LoggingBase', __name__, - version="0.6", removal_version="?")): + version="0.6", removal_version="2.0")): """Legacy logging base. diff --git a/taskflow/listeners/timing.py b/taskflow/listeners/timing.py index d91ff007..351b2bda 100644 --- a/taskflow/listeners/timing.py +++ b/taskflow/listeners/timing.py @@ -91,7 +91,7 @@ class DurationListener(base.Listener): TimingListener = moves.moved_class(DurationListener, 'TimingListener', __name__, - version="0.8", removal_version="?") + version="0.8", removal_version="2.0") class PrintingDurationListener(DurationListener): @@ -117,7 +117,7 @@ class PrintingDurationListener(DurationListener): PrintingTimingListener = moves.moved_class( PrintingDurationListener, 'PrintingTimingListener', __name__, - version="0.8", removal_version="?") + version="0.8", removal_version="2.0") class EventTimeListener(base.Listener): diff --git a/taskflow/persistence/backends/impl_memory.py b/taskflow/persistence/backends/impl_memory.py index 37a67d06..a056856d 100644 --- a/taskflow/persistence/backends/impl_memory.py +++ b/taskflow/persistence/backends/impl_memory.py @@ -193,7 +193,7 @@ class FakeFilesystem(object): return [selector_func(node, child_node) for child_node in node.bfs_iter()] - @removals.removed_kwarg('recursive', version="0.11", removal_version="?") + @removals.removed_kwarg('recursive', version="0.11", removal_version="2.0") def ls(self, path, recursive=False): """Return list of all children of the given path. diff --git a/taskflow/utils/misc.py b/taskflow/utils/misc.py index 87f68355..bd2e6e38 100644 --- a/taskflow/utils/misc.py +++ b/taskflow/utils/misc.py @@ -505,12 +505,12 @@ def ensure_tree(path): Failure = deprecation.moved_proxy_class(failure.Failure, 'Failure', __name__, - version="0.6", removal_version="?") + version="0.6", removal_version="2.0") Notifier = deprecation.moved_proxy_class(notifier.Notifier, 'Notifier', __name__, - version="0.6", removal_version="?") + version="0.6", removal_version="2.0") @contextlib.contextmanager