From ab90617cbe32384e03f77c941d2c2d6712d33c40 Mon Sep 17 00:00:00 2001
From: Stefan van der Walt <stefan@sun.ac.za>
Date: Wed, 4 Nov 2009 07:52:51 +0200
Subject: [PATCH] Rename analysis -> graph.

---
 scikits/image/{analysis => graph}/__init__.py         | 0
 scikits/image/{analysis => graph}/setup.py            | 4 ++--
 scikits/image/{analysis => graph}/spath.c             | 0
 scikits/image/{analysis => graph}/spath.pyx           | 0
 scikits/image/{analysis => graph}/tests/test_spath.py | 2 +-
 scikits/image/setup.py                                | 2 +-
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename scikits/image/{analysis => graph}/__init__.py (100%)
 rename scikits/image/{analysis => graph}/setup.py (88%)
 rename scikits/image/{analysis => graph}/spath.c (100%)
 rename scikits/image/{analysis => graph}/spath.pyx (100%)
 rename scikits/image/{analysis => graph}/tests/test_spath.py (95%)

diff --git a/scikits/image/analysis/__init__.py b/scikits/image/graph/__init__.py
similarity index 100%
rename from scikits/image/analysis/__init__.py
rename to scikits/image/graph/__init__.py
diff --git a/scikits/image/analysis/setup.py b/scikits/image/graph/setup.py
similarity index 88%
rename from scikits/image/analysis/setup.py
rename to scikits/image/graph/setup.py
index f658720f..7ff77e6f 100644
--- a/scikits/image/analysis/setup.py
+++ b/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())
diff --git a/scikits/image/analysis/spath.c b/scikits/image/graph/spath.c
similarity index 100%
rename from scikits/image/analysis/spath.c
rename to scikits/image/graph/spath.c
diff --git a/scikits/image/analysis/spath.pyx b/scikits/image/graph/spath.pyx
similarity index 100%
rename from scikits/image/analysis/spath.pyx
rename to scikits/image/graph/spath.pyx
diff --git a/scikits/image/analysis/tests/test_spath.py b/scikits/image/graph/tests/test_spath.py
similarity index 95%
rename from scikits/image/analysis/tests/test_spath.py
rename to scikits/image/graph/tests/test_spath.py
index 1d91bba6..e126a424 100644
--- a/scikits/image/analysis/tests/test_spath.py
+++ b/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):
diff --git a/scikits/image/setup.py b/scikits/image/setup.py
index 7f27c765..1f30754d 100644
--- a/scikits/image/setup.py
+++ b/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':