scikit-image · jarrodmillman · Oct 14, 2022 · Oct 12, 2022 · Oct 14, 2022 · Oct 14, 2022
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -8,7 +8,7 @@ recursive-include requirements *.txt
 include requirements/README.md
 include Makefile
 include skimage/restoration/unwrap_*_ljmu.c
-recursive-include skimage *.pyx *.pxd *.pxi *.py *.h *.ini *.npy *.txt *.in *.md
+recursive-include skimage *.pyx *.pxd *.pxi *.py *.pyi *.h *.ini *.npy *.txt *.in *.md
 recursive-include skimage/data *
 recursive-include skimage/*/tests/data *
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -5,6 +5,7 @@ requires = [
     "packaging",
     "Cython>=0.29.24,<3.0",
     "pythran",
+    "lazy_loader>=0.1",
 
     # We follow scipy for much of these pinnings
     # https://github.com/scipy/scipy/blob/master/pyproject.toml

diff --git a/requirements/default.txt b/requirements/default.txt
@@ -7,3 +7,4 @@ imageio>=2.4.1
 tifffile>=2019.7.26
 PyWavelets>=1.1.1
 packaging>=20.0
+lazy_loader>=0.1
diff --git a/setup.py b/setup.py
@@ -249,7 +249,7 @@ def configuration(parent_package='', top_path=None):
             exclude=['doc', 'doc.*', 'benchmarks']),
         package_data={
             # distribute Cython source files in the wheel
-            "": ["*.pyx", "*.pxd", "*.pxi", ""],
+            "": ["*.pyx", "*.pxd", "*.pxi", "*.pyi", ""],
             # tests dirs have an __init__.py so are automatically included
         },
         include_package_data=False,

diff --git a/skimage/__init__.py b/skimage/__init__.py
@@ -67,36 +67,11 @@
 
 __version__ = '0.20.0.dev0'
 
-submodules = [
-    'color',
-    'data',
-    'draw',
-    'exposure',
-    'feature',
-    'filters',
-    'future',
-    'graph',
-    'io',
-    'measure',
-    'metrics',
-    'morphology',
-    'registration',
-    'restoration',
-    'segmentation',
-    'transform',
-    'util',
-]
-
 from ._shared.version_requirements import ensure_python_version
 ensure_python_version((3, 7))
 
-from ._shared import lazy
-__getattr__, __lazy_dir__, _ = lazy.attach(
-    __name__,
-    submodules,
-    submod_attrs={'data': ['data_dir']}
-)
-
+import lazy_loader as lazy
+__getattr__, __lazy_dir__, _ = lazy.attach_stub(__name__, __file__)
 
 def __dir__():
     return __lazy_dir__() + ['__version__']
@@ -149,17 +124,23 @@ def _raise_build_error(e):
     except ImportError as e:
         _raise_build_error(e)
 
-    # All skimage root imports go here
-    from .util.dtype import (img_as_float32,
-                             img_as_float64,
-                             img_as_float,
-                             img_as_int,
-                             img_as_uint,
-                             img_as_ubyte,
-                             img_as_bool,
-                             dtype_limits)
+    # Legacy imports into the root namespace; not advertised in __all__
+    from .util.dtype import (
+        dtype_limits,
+        img_as_float32,
+        img_as_float64,
+        img_as_float,
+        img_as_int,
+        img_as_uint,
+        img_as_ubyte,
+        img_as_bool
+    )
+
     from .util.lookfor import lookfor
 
+    from .data import data_dir
+
+
 if 'dev' in __version__:
     # Append last commit date and hash to dev version information, if available
 

diff --git a/skimage/__init__.pyi b/skimage/__init__.pyi
@@ -0,0 +1,41 @@
+submodules = [
+    'color',
+    'data',
+    'draw',
+    'exposure',
+    'feature',
+    'filters',
+    'future',
+    'graph',
+    'io',
+    'measure',
+    'metrics',
+    'morphology',
+    'registration',
+    'restoration',
+    'segmentation',
+    'transform',
+    'util',
+]
+
+__all__ = submodules + ['__version__']
+
+from . import (
+    color,
+    data,
+    draw,
+    exposure,
+    feature,
+    filters,
+    future,
+    graph,
+    io,
+    measure,
+    metrics,
+    morphology,
+    registration,
+    restoration,
+    segmentation,
+    transform,
+    util,
+)
diff --git a/skimage/_shared/lazy.py b/skimage/_shared/lazy.py
diff --git a/skimage/data/__init__.py b/skimage/data/__init__.py
@@ -1,21 +1,3 @@
-from .._shared import lazy
+import lazy_loader as lazy
 
-__getattr__, __dir__, __all__ = lazy.attach(
-    __name__,
-    submodules={},
-    submod_attrs={
-        '_binary_blobs': ['binary_blobs'],
-        '_fetchers': ['create_image_fetcher', 'data_dir', 'download_all',
-                      'file_hash', 'image_fetcher', 'astronaut',
-                      'binary_blobs', 'brain', 'brick', 'camera', 'cat',
-                      'cell', 'cells3d', 'checkerboard', 'chelsea', 'clock',
-                      'coffee', 'coins', 'colorwheel', 'eagle', 'grass',
-                      'gravel', 'horse', 'hubble_deep_field', 'human_mitosis',
-                      'immunohistochemistry', 'kidney',
-                      'lbp_frontal_face_cascade_filename', 'lfw_subset',
-                      'lily', 'logo', 'microaneurysms', 'moon',
-                      'nickel_solidification', 'page', 'protein_transport',
-                      'retina', 'rocket', 'shepp_logan_phantom',
-                      'skin', 'stereo_motorcycle', 'text', 'vortex']
-    }
-)
+__getattr__, __dir__, __all__ = lazy.attach_stub(__name__, __file__)