diff --git a/bonobo/core/__init__.py b/bonobo/core/__init__.py deleted file mode 100644 index 086efcc..0000000 --- a/bonobo/core/__init__.py +++ /dev/null @@ -1 +0,0 @@ -""" Core required libraries. """ diff --git a/bonobo/execution/node.py b/bonobo/execution/node.py index ade3472..635068e 100644 --- a/bonobo/execution/node.py +++ b/bonobo/execution/node.py @@ -3,15 +3,15 @@ from queue import Empty from time import sleep from bonobo.constants import INHERIT_INPUT, NOT_MODIFIED -from bonobo.core.inputs import Input -from bonobo.core.statistics import WithStatistics from bonobo.errors import InactiveReadableError from bonobo.execution.base import LoopingExecutionContext from bonobo.structs.bags import Bag +from bonobo.structs.inputs import Input from bonobo.util.compat import deprecated_alias from bonobo.util.errors import is_error from bonobo.util.iterators import iter_if_not_sequence from bonobo.util.objects import get_name +from bonobo.util.statistics import WithStatistics class NodeExecutionContext(WithStatistics, LoopingExecutionContext): diff --git a/bonobo/core/inputs.py b/bonobo/structs/inputs.py similarity index 100% rename from bonobo/core/inputs.py rename to bonobo/structs/inputs.py diff --git a/bonobo/core/statistics.py b/bonobo/util/statistics.py similarity index 100% rename from bonobo/core/statistics.py rename to bonobo/util/statistics.py diff --git a/tests/core/test_inputs.py b/tests/structs/test_inputs.py similarity index 97% rename from tests/core/test_inputs.py rename to tests/structs/test_inputs.py index 5739dc3..d2ce827 100644 --- a/tests/core/test_inputs.py +++ b/tests/structs/test_inputs.py @@ -19,8 +19,8 @@ from queue import Empty import pytest from bonobo.constants import BEGIN, END -from bonobo.core.inputs import Input from bonobo.errors import InactiveWritableError, InactiveReadableError +from bonobo.structs.inputs import Input def test_input_runlevels(): diff --git a/tests/core/test_statistics.py b/tests/util/test_statistics.py similarity index 83% rename from tests/core/test_statistics.py rename to tests/util/test_statistics.py index 9b05175..bb787eb 100644 --- a/tests/core/test_statistics.py +++ b/tests/util/test_statistics.py @@ -1,4 +1,4 @@ -from bonobo.core.statistics import WithStatistics +from bonobo.util.statistics import WithStatistics class MyThingWithStats(WithStatistics):