[Scipy-svn] r4631 - trunk/scipy/stats/models
scipy-svn at scipy.org
scipy-svn at scipy.org
Fri Aug 8 17:43:21 EDT 2008
Author: chris.burns
Date: 2008-08-08 16:43:17 -0500 (Fri, 08 Aug 2008)
New Revision: 4631
Modified:
trunk/scipy/stats/models/setupscons.py
Log:
Fix setupscons.py with new extension code.
Modified: trunk/scipy/stats/models/setupscons.py
===================================================================
--- trunk/scipy/stats/models/setupscons.py 2008-08-08 21:35:24 UTC (rev 4630)
+++ trunk/scipy/stats/models/setupscons.py 2008-08-08 21:43:17 UTC (rev 4631)
@@ -1,27 +1,21 @@
-def configuration(parent_package='',top_path=None, package_name='models'):
+def configuration(parent_package='',top_path=None):
from numpy.distutils.misc_util import Configuration
- config = Configuration(package_name,parent_package,top_path)
+ config = Configuration('models',parent_package,top_path)
- config.add_subpackage('*')
+ config.add_subpackage('family')
+ config.add_subpackage('robust')
config.add_data_dir('tests')
- try:
- from scipy.stats.models.bspline_module import mod
- n, s, d = weave_ext(mod)
- config.add_extension(n, s, **d)
- except ImportError: pass
-
+ config.add_extension('_hbspline',
+ sources=['src/bspline_ext.c',
+ 'src/bspline_impl.c'],
+ )
return config
-def weave_ext(mod):
- d = mod.setup_extension().__dict__
- n = d['name']; del(d['name'])
- s = d['sources']; del(d['sources'])
- return n, s, d
-
if __name__ == '__main__':
from numpy.distutils.core import setup
- setup(**configuration(top_path='', package_name='scipy.stats.models').todict())
+ setup(**configuration(top_path='').todict())
+
More information about the Scipy-svn
mailing list