moved data_dir to within data/__init__.py (scikit-image#3161)

* moved data_dir to within `data/__init__.py` * "Fix" the circular dependency.
casperdcl · Jun 9, 2018 · 637db10 · 637db10
1 parent fede57a
commit 637db10
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/skimage/__init__.py b/skimage/__init__.py
@@ -56,14 +56,11 @@
 
 """
 
-import os.path as osp
 import imp
 import functools
 import warnings
 import sys
 
-pkg_dir = osp.abspath(osp.dirname(__file__))
-data_dir = osp.join(pkg_dir, 'data')
 
 __version__ = '0.15.dev0'
 
@@ -133,6 +130,7 @@ def _raise_build_error(e):
     except ImportError as e:
         _raise_build_error(e)
     from .util.dtype import *
+    from .data import data_dir
 
 
 def lookfor(what):
@@ -149,4 +147,4 @@ def lookfor(what):
     return np.lookfor(what, sys.modules[__name__])
 
 
-del warnings, functools, osp, imp, sys
+del warnings, functools, imp, sys
diff --git a/skimage/data/__init__.py b/skimage/data/__init__.py
@@ -12,13 +12,16 @@
 
 import numpy as _np
 
-from .. import data_dir
 from ..io import imread, use_plugin
 from .._shared._warnings import expected_warnings, warn
-from .. import img_as_bool
+from ..util.dtype import img_as_bool
 from ._binary_blobs import binary_blobs
 
-__all__ = ['load',
+import os.path as osp
+data_dir = osp.abspath(osp.dirname(__file__))
+
+__all__ = ['data_dir',
+           'load',
            'astronaut',
            'binary_blobs',
            'camera',