[Scipy-svn] r3928 - in trunk/scipy/ndimage: . src src/register

[scipy-svn at scipy.org]

Author: chris.burns
Date: 2008-02-12 18:00:26 -0600 (Tue, 12 Feb 2008)
New Revision: 3928

Added:
   trunk/scipy/ndimage/src/register/
Removed:
   trunk/scipy/ndimage/register/
   trunk/scipy/ndimage/src/register/__init__.py
   trunk/scipy/ndimage/src/register/setup.py
Modified:
   trunk/scipy/ndimage/registration.py
   trunk/scipy/ndimage/setup.py
Log:
Reorg package structure for ndimage.register.

Modified: trunk/scipy/ndimage/registration.py
===================================================================
--- trunk/scipy/ndimage/registration.py	2008-02-12 23:37:43 UTC (rev 3927)
+++ trunk/scipy/ndimage/registration.py	2008-02-13 00:00:26 UTC (rev 3928)
@@ -1,7 +1,7 @@
 import math
 import os
 import numpy as N
-import scipy.ndimage.register as R
+import scipy.ndimage._register as R
 import scipy.special  as SP
 import scipy.ndimage  as NDI
 import scipy.optimize as OPT

Modified: trunk/scipy/ndimage/setup.py
===================================================================
--- trunk/scipy/ndimage/setup.py	2008-02-12 23:37:43 UTC (rev 3927)
+++ trunk/scipy/ndimage/setup.py	2008-02-13 00:00:26 UTC (rev 3928)
@@ -20,8 +20,12 @@
                          depends = ['src/segment/ndImage_Segmenter_structs.h']
     )
 
+    config.add_extension('_register',
+                         sources=['src/register/Register_EXT.c',
+                                  'src/register/Register_IMPL.c']
+    )
+
     config.add_data_dir('tests')
-    config.add_subpackage('register')
 
     return config
 

Copied: trunk/scipy/ndimage/src/register (from rev 3927, trunk/scipy/ndimage/register)

Deleted: trunk/scipy/ndimage/src/register/__init__.py
===================================================================
--- trunk/scipy/ndimage/register/__init__.py	2008-02-12 23:37:43 UTC (rev 3927)
+++ trunk/scipy/ndimage/src/register/__init__.py	2008-02-13 00:00:26 UTC (rev 3928)
@@ -1,5 +0,0 @@
-# Register package 
-# Author: Tom Waite, 2008
-
-from _register import *
-

Deleted: trunk/scipy/ndimage/src/register/setup.py
===================================================================
--- trunk/scipy/ndimage/register/setup.py	2008-02-12 23:37:43 UTC (rev 3927)
+++ trunk/scipy/ndimage/src/register/setup.py	2008-02-13 00:00:26 UTC (rev 3928)
@@ -1,20 +0,0 @@
-
-#!/usr/bin/env python
-
-def configuration(parent_package='',top_path=None):
-    from numpy.distutils.misc_util import Configuration
-
-    config = Configuration('register', parent_package, top_path)
-
-    config.add_extension('_register',
-                         sources=['Register_EXT.c',
-                                  'Register_IMPL.c']
-    )
-
-    return config
-
-if __name__ == '__main__':
-    from numpy.distutils.core import setup
-    setup(**configuration(top_path='').todict())
-
-