cleanup: Use relative imports everywhere

pdxjohnny · pdxjohnny · commit cf6a89028c4e · 2020-04-28T10:25:14.000-07:00
Signed-off-by: John Andersen &lt;johnandersenpdx@gmail.com&gt;
diff --git a/dffml/configloader/configloader.py b/dffml/configloader/configloader.py
@@ -11,7 +11,7 @@
     BaseDataFlowFacilitatorObjectContext,
     BaseDataFlowFacilitatorObject,
 )
-from dffml.util.data import explore_directories, nested_apply
+from ..util.data import explore_directories, nested_apply
 
 
 class BaseConfigLoaderContext(BaseDataFlowFacilitatorObjectContext):
diff --git a/dffml/db/base.py b/dffml/db/base.py
@@ -4,8 +4,8 @@
 import collections
 from typing import Any, List, Optional, Dict, Tuple, Union, AsyncIterator
 
-from dffml.df.base import BaseDataFlowObject, BaseDataFlowObjectContext
-from dffml.util.entrypoint import base_entry_point
+from ..df.base import BaseDataFlowObject, BaseDataFlowObjectContext
+from ..util.entrypoint import base_entry_point
 
 
 Condition = collections.namedtuple(
diff --git a/dffml/db/sql.py b/dffml/db/sql.py
@@ -3,7 +3,7 @@
 """
 from typing import Dict, Any, List, Tuple, Optional
 
-from dffml.db.base import BaseDatabaseContext, Conditions
+from .base import BaseDatabaseContext, Conditions
 
 
 class SQLDatabaseContext(BaseDatabaseContext):
diff --git a/dffml/model/slr.py b/dffml/model/slr.py
@@ -2,18 +2,16 @@
 import statistics
 from typing import AsyncIterator, Tuple, Any, Type, List
 
-from dffml import (
-    config,
-    field,
-    entrypoint,
+from ..base import config, field
+from ..util.entrypoint import entrypoint
+from .model import (
     SimpleModel,
     ModelNotTrained,
-    Accuracy,
-    Feature,
-    Features,
-    Sources,
-    Record,
 )
+from .accuracy import Accuracy
+from ..feature.feature import Feature, Features
+from ..source.source import Sources
+from ..record import Record
 
 
 def matrix_subtract(one, two):
diff --git a/dffml/operation/dataflow.py b/dffml/operation/dataflow.py
@@ -1,8 +1,8 @@
 from typing import Dict, Any
 
-from dffml.base import config
-from dffml.df.base import op, OperationImplementationContext
-from dffml.df.types import DataFlow, Input, Definition
+from ..base import config
+from ..df.base import op, OperationImplementationContext
+from ..df.types import DataFlow, Input, Definition
 
 
 class InvalidCustomRunDataFlowContext(Exception):
diff --git a/dffml/operation/io.py b/dffml/operation/io.py
@@ -2,8 +2,8 @@
 import concurrent.futures
 from typing import Dict, Any
 
-from dffml.df.types import Operation, Definition
-from dffml.df.base import (
+from ..df.types import Operation, Definition
+from ..df.base import (
     op,
     OperationImplementationContext,
     OperationImplementation,
diff --git a/dffml/operation/preprocess.py b/dffml/operation/preprocess.py
@@ -1,6 +1,7 @@
 import ast
-from dffml.df.types import Definition
-from dffml.df.base import op
+
+from ..df.types import Definition
+from ..df.base import op
 
 
 # Definitions
diff --git a/dffml/source/db.py b/dffml/source/db.py
@@ -1,11 +1,11 @@
 import collections
 from typing import Type, AsyncIterator, List
 
-from dffml.base import config, BaseConfig
-from dffml.db.base import BaseDatabase, Condition
-from dffml.record import Record
-from dffml.source.source import BaseSource, BaseSourceContext
-from dffml.util.entrypoint import entrypoint
+from ..base import config, BaseConfig
+from ..db.base import BaseDatabase, Condition
+from ..record import Record
+from ..source.source import BaseSource, BaseSourceContext
+from ..util.entrypoint import entrypoint
 
 
 @config
diff --git a/dffml/util/asynctestcase.py b/dffml/util/asynctestcase.py
@@ -27,7 +27,7 @@
 
 from typing import Optional
 
-from dffml.util.packaging import is_develop
+from .packaging import is_develop
 
 
 class AsyncTestCase(unittest.TestCase):
diff --git a/dffml/util/config/numpy.py b/dffml/util/config/numpy.py
@@ -8,7 +8,7 @@
 import dataclasses
 from typing import Dict, Optional, Tuple, Type, Any, Callable
 
-from dffml.base import make_config, field
+from ...base import make_config, field
 
 from .exceptions import ParameterNotInDocString
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`BaseDataFlowFacilitatorObjectContext,`
`12`	`12`	`BaseDataFlowFacilitatorObject,`
`13`	`13`	`)`
`14`		`-from dffml.util.data import explore_directories, nested_apply`
	`14`	`+from ..util.data import explore_directories, nested_apply`
`15`	`15`
`16`	`16`
`17`	`17`	`class BaseConfigLoaderContext(BaseDataFlowFacilitatorObjectContext):`