Rename analysis -> graph.

scikits/image/graph/setup.py

@@ -9,7 +9,7 @@ base_path = os.path.abspath(os.path.dirname(__file__))
 def configuration(parent_package='', top_path=None):
     from numpy.distutils.misc_util import Configuration, get_numpy_include_dirs
 
-    config = Configuration('analysis', parent_package, top_path)
+    config = Configuration('graph', parent_package, top_path)
     config.add_data_dir('tests')
 
     # This function tries to create C files from the given .pyx files.  If
@@ -25,7 +25,7 @@ if __name__ == '__main__':
     from numpy.distutils.core import setup
     setup(maintainer = 'scikits.image Developers',
           maintainer_email = 'scikits-image@googlegroups.com',
-          description = 'Image Analysis Tools',
+          description = 'Graph-based Image-processing Algorithms',
           url = 'http://stefanv.github.com/scikits.image/',
           license = 'Modified BSD',
           **(configuration(top_path='').todict())

scikits/image/graph/tests/test_spath.py

@@ -1,7 +1,7 @@
 import numpy as np
 from numpy.testing import *
 
-from scikits.image.analysis import shortest_path
+from scikits.image.graph import shortest_path
 
 class TestShortestPath:
     def test_basic(self):

scikits/image/setup.py

@@ -6,7 +6,7 @@ def configuration(parent_package='', top_path=None):
     config = Configuration('image', parent_package, top_path)
 
     config.add_subpackage('opencv')
-    config.add_subpackage('analysis')
+    config.add_subpackage('graph')
 
     def add_test_directories(arg, dirname, fnames):
         if dirname.split(os.path.sep)[-1] == 'tests':