Merge pull request #1365 from jni/future

Add skimage.future package

doc/examples/plot_ncut.py

@@ -12,7 +12,8 @@ References
        Pattern Analysis and Machine Intelligence,
        IEEE Transactions on, vol. 22, no. 8, pp. 888-905, August 2000.
 """
-from skimage import graph, data, io, segmentation, color
+from skimage import data, io, segmentation, color
+from skimage.future import graph
 from matplotlib import pyplot as plt
 
 

doc/examples/plot_rag.py

@@ -14,7 +14,7 @@ The example below also shows how to use a custom function to select the larger
 weight instead.
 
 """
-from skimage.graph import rag
+from skimage.future.graph import rag
 import networkx as nx
 from matplotlib import pyplot as plt
 import numpy as np

doc/examples/plot_rag_draw.py

@@ -6,7 +6,8 @@ Drawing Region Adjacency Graphs (RAGs)
 This example constructs a Region Adjacency Graph (RAG) and draws it with
 the `rag_draw` method.
 """
-from skimage import graph, data, segmentation
+from skimage import data, segmentation
+from skimage.future import graph
 from matplotlib import pyplot as plt, colors
 
 

doc/examples/plot_rag_mean_color.py

@@ -9,7 +9,8 @@ difference in mean color. We then join regions with similar mean color.
 
 """
 
-from skimage import graph, data, io, segmentation, color
+from skimage import data, io, segmentation, color
+from skimage.future import graph
 from matplotlib import pyplot as plt
 
 

doc/examples/plot_rag_merge.py

@@ -10,7 +10,8 @@ until no highly similar region pairs remain.
 
 """
 
-from skimage import graph, data, io, segmentation, color
+from skimage import data, io, segmentation, color
+from skimage.future import graph
 import numpy as np