[Scipy-svn] r6770 - in trunk: scipy/io tools
scipy-svn at scipy.org
scipy-svn at scipy.org
Sat Sep 11 21:03:23 EDT 2010
Author: ptvirtan
Date: 2010-09-11 20:03:23 -0500 (Sat, 11 Sep 2010)
New Revision: 6770
Modified:
trunk/scipy/io/setup.py
trunk/tools/py3tool.py
Log:
3K: io: enable matlab package build
Modified: trunk/scipy/io/setup.py
===================================================================
--- trunk/scipy/io/setup.py 2010-09-12 01:02:58 UTC (rev 6769)
+++ trunk/scipy/io/setup.py 2010-09-12 01:03:23 UTC (rev 6770)
@@ -6,7 +6,7 @@
config.add_data_dir('tests')
config.add_data_dir('docs')
- #config.add_subpackage('matlab')
+ config.add_subpackage('matlab')
config.add_subpackage('arff')
return config
Modified: trunk/tools/py3tool.py
===================================================================
--- trunk/tools/py3tool.py 2010-09-12 01:02:58 UTC (rev 6769)
+++ trunk/tools/py3tool.py 2010-09-12 01:03:23 UTC (rev 6770)
@@ -153,6 +153,10 @@
os.path.join('interpolate', 'ndgriddata.py'),
os.path.join('io', 'array_import.py'),
os.path.join('io', '__init__.py'),
+ os.path.join('io', 'matlab', 'miobase.py'),
+ os.path.join('io', 'matlab', 'mio4.py'),
+ os.path.join('io', 'matlab', 'mio5.py'),
+ os.path.join('io', 'matlab', 'mio5_params.py'),
os.path.join('linalg', 'basic.py'),
os.path.join('linalg', 'decomp.py'),
os.path.join('linalg', 'lapack.py'),
@@ -211,7 +215,8 @@
'_nd_image',
'numpyio',
'_superlu', '_arpack', '_iterative', '_umfpack',
- 'interpnd'
+ 'interpnd',
+ 'mio_utils', 'mio5_utils', 'streams'
]:
text = re.sub(r'^(\s*)import %s' % mod,
r'\1from . import %s' % mod,
More information about the Scipy-svn
mailing list