[Scipy-svn] r6715 - trunk/tools

[scipy-svn at scipy.org]

Author: ptvirtan
Date: 2010-09-11 19:48:43 -0500 (Sat, 11 Sep 2010)
New Revision: 6715

Modified:
   trunk/tools/py3tool.py
Log:
3K: scipy.optimize now builds and passes most tests.

Modified: trunk/tools/py3tool.py
===================================================================
--- trunk/tools/py3tool.py	2010-09-12 00:48:31 UTC (rev 6714)
+++ trunk/tools/py3tool.py	2010-09-12 00:48:43 UTC (rev 6715)
@@ -148,6 +148,10 @@
         os.path.join('lib', 'lapack', '__init__.py'),
         os.path.join('optimize', 'minpack.py'),
         os.path.join('optimize', 'zeros.py'),
+        os.path.join('optimize', 'lbfgsb.py'),
+        os.path.join('optimize', 'cobyla.py'),
+        os.path.join('optimize', 'slsqp.py'),
+        os.path.join('optimize', 'nnls.py'),
         os.path.join('special', '__init__.py'),
         os.path.join('special', 'basic.py'),
         os.path.join('special', 'orthogonal.py'),
@@ -163,7 +167,8 @@
                     '_flinalg', 'fblas', 'flapack', 'cblas', 'clapack',
                     'calc_lwork', '_cephes', 'specfun', 'orthogonal_eval',
                     'lambertw', 'ckdtree', '_distance_wrap',
-                    '_minpack', '_zeros']:
+                    '_minpack', '_zeros', '_lbfgsb', '_cobyla', '_slsqp',
+                    '_nnls']:
             text = re.sub(r'^(\s*)import %s' % mod,
                           r'\1from . import %s' % mod,
                           text, flags=re.M)