summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorwen <wen>2015-04-17 00:49:50 +0000
committerwen <wen>2015-04-17 00:49:50 +0000
commit1184aeda462b1da5f56931ed69b0d22fe84eba5c (patch)
tree8fe4e4c8fd9b09db354dece38cfd90de3d613d7c /math
parent4f10a19e9c8274c4150b5d479c7a534b56ba27b0 (diff)
downloadpkgsrc-1184aeda462b1da5f56931ed69b0d22fe84eba5c.tar.gz
Update to 0.15.1
Upstream changes: SciPy 0.15.1 is a bug-fix release with no new features compared to 0.15.0. Issues fixed - ------------ * `#4413 <https://github.com/scipy/scipy/pull/4413>`__: BUG: Tests too strict, f2py doesn't have to overwrite this array * `#4417 <https://github.com/scipy/scipy/pull/4417>`__: BLD: avoid using NPY_API_VERSION to check not using deprecated... * `#4418 <https://github.com/scipy/scipy/pull/4418>`__: Restore and deprecate scipy.linalg.calc_work SciPy 0.15.0 Release Notes ========================== .. contents:: SciPy 0.15.0 is the culmination of 6 months of hard work. It contains several new features, numerous bug-fixes, improved test coverage and better documentation. There have been a number of deprecations and API changes in this release, which are documented below. All users are encouraged to upgrade to this release, as there are a large number of bug-fixes and optimizations. Moreover, our development attention will now shift to bug-fix releases on the 0.16.x branch, and on adding new features on the master branch. This release requires Python 2.6, 2.7 or 3.2-3.4 and NumPy 1.5.1 or greater. New features ============ Linear Programming Interface - ---------------------------- The new function `scipy.optimize.linprog` provides a generic linear programming similar to the way `scipy.optimize.minimize` provides a generic interface to nonlinear programming optimizers. Currently the only method supported is *simplex* which provides a two-phase, dense-matrix-based simplex algorithm. Callbacks functions are supported, allowing the user to monitor the progress of the algorithm. Differential evolution, a global optimizer - ------------------------------------------ A new `scipy.optimize.differential_evolution` function has been added to the ``optimize`` module. Differential Evolution is an algorithm used for finding the global minimum of multivariate functions. It is stochastic in nature (does not use gradient methods), and can search large areas of candidate space, but often requires larger numbers of function evaluations than conventional gradient based techniques. ``scipy.signal`` improvements - ----------------------------- The function `scipy.signal.max_len_seq` was added, which computes a Maximum Length Sequence (MLS) signal. ``scipy.integrate`` improvements - -------------------------------- It is now possible to use `scipy.integrate` routines to integrate multivariate ctypes functions, thus avoiding callbacks to Python and providing better performance. ``scipy.linalg`` improvements - ----------------------------- The function `scipy.linalg.orthogonal_procrustes` for solving the procrustes linear algebra problem was added. BLAS level 2 functions ``her``, ``syr``, ``her2`` and ``syr2`` are now wrapped in ``scipy.linalg``. ``scipy.sparse`` improvements - ----------------------------- `scipy.sparse.linalg.svds` can now take a ``LinearOperator`` as its main input. ``scipy.special`` improvements - ------------------------------ Values of ellipsoidal harmonic (i.e. Lame) functions and associated normalization constants can be now computed using ``ellip_harm``, ``ellip_harm_2``, and ``ellip_normal``. New convenience functions ``entr``, ``rel_entr`` ``kl_div``, ``huber``, and ``pseudo_huber`` were added. ``scipy.sparse.csgraph`` improvements - ------------------------------------- Routines ``reverse_cuthill_mckee`` and ``maximum_bipartite_matching`` for computing reorderings of sparse graphs were added. ``scipy.stats`` improvements - ---------------------------- Added a Dirichlet multivariate distribution, `scipy.stats.dirichlet`. The new function `scipy.stats.median_test` computes Mood's median test. The new function `scipy.stats.combine_pvalues` implements Fisher's and Stouffer's methods for combining p-values. `scipy.stats.describe` returns a namedtuple rather than a tuple, allowing users to access results by index or by name. Deprecated features =================== The `scipy.weave` module is deprecated. It was the only module never ported to Python 3.x, and is not recommended to be used for new code - use Cython instead. In order to support existing code, ``scipy.weave`` has been packaged separately: https://github.com/scipy/weave. It is a pure Python package, and can easily be installed with ``pip install weave``. `scipy.special.bessel_diff_formula` is deprecated. It is a private function, and therefore will be removed from the public API in a following release. ``scipy.stats.nanmean``, ``nanmedian`` and ``nanstd`` functions are deprecated in favor of their numpy equivalents. Backwards incompatible changes ============================== scipy.ndimage - ------------- The functions `scipy.ndimage.minimum_positions`, `scipy.ndimage.maximum_positions`` and `scipy.ndimage.extrema` return positions as ints instead of floats. scipy.integrate - --------------- The format of banded Jacobians in `scipy.integrate.ode` solvers is changed. Note that the previous documentation of this feature was erroneous. SciPy 0.14.1 Release Notes ========================== SciPy 0.14.1 is a bug-fix release with no new features compared to 0.14.0. Issues closed - ------------- - - `#3630 <https://github.com/scipy/scipy/issues/3630>`__: NetCDF reading results in a segfault - - `#3631 <https://github.com/scipy/scipy/issues/3631>`__: SuperLU object not working as expected for complex matrices - - `#3733 <https://github.com/scipy/scipy/issues/3733>`__: segfault from map_coordinates - - `#3780 <https://github.com/scipy/scipy/issues/3780>`__: Segfault when using CSR/CSC matrix and uint32/uint64 - - `#3781 <https://github.com/scipy/scipy/pull/3781>`__: BUG: sparse: fix omitted types in sparsetools typemaps - - `#3802 <https://github.com/scipy/scipy/issues/3802>`__: 0.14.0 API breakage: _gen generators are missing from scipy.stats.distributions API - - `#3805 <https://github.com/scipy/scipy/issues/3805>`__: ndimage test failures with numpy 1.10 - - `#3812 <https://github.com/scipy/scipy/issues/3812>`__: == sometimes wrong on csr_matrix - - `#3853 <https://github.com/scipy/scipy/issues/3853>`__: Many scipy.sparse test errors/failures with numpy 1.9.0b2 - - `#4084 <https://github.com/scipy/scipy/pull/4084>`__: fix exception declarations for Cython 0.21.1 compatibility - - `#4093 <https://github.com/scipy/scipy/pull/4093>`__: BUG: fitpack: avoid a memory error in splev(x, tck, der=k) - - `#4104 <https://github.com/scipy/scipy/pull/4104>`__: BUG: Workaround SGEMV segfault in Accelerate (maintenance 0.14.x) - - `#4143 <https://github.com/scipy/scipy/pull/4143>`__: BUG: fix ndimage functions for large data - - `#4149 <https://github.com/scipy/scipy/issues/4149>`__: Bug in expm for integer arrays - - `#4154 <https://github.com/scipy/scipy/issues/4154>`__: Backport gh-4041 for 0.14.1 (Ensure that the 'size' argument of PIL's 'resize' method is a tuple) - - `#4163 <https://github.com/scipy/scipy/issues/4163>`__: Backport #4142 (ZeroDivisionError in scipy.sparse.linalg.lsqr) - - `#4164 <https://github.com/scipy/scipy/issues/4164>`__: Backport gh-4153 (remove use of deprecated numpy API in lib/lapack/ f2py wrapper) - - `#4180 <https://github.com/scipy/scipy/pull/4180>`__: backport pil resize support tuple fix - - `#4168 <https://github.com/scipy/scipy/issues/4168>`__: Lots of arpack test failures on windows 32 bits with numpy 1.9.1 - - `#4203 <https://github.com/scipy/scipy/issues/4203>`__: Matrix multiplication in 0.14.x is more than 10x slower compared... - - `#4218 <https://github.com/scipy/scipy/pull/4218>`__: attempt to make ndimage interpolation compatible with numpy relaxed... - - `#4225 <https://github.com/scipy/scipy/pull/4225>`__: BUG: off-by-one error in PPoly shape checks - - `#4248 <https://github.com/scipy/scipy/pull/4248>`__: BUG: optimize: fix issue with incorrect use of closure for slsqp. SciPy 0.14.0 Release Notes ========================== .. contents:: SciPy 0.14.0 is the culmination of 8 months of hard work. It contains many new features, numerous bug-fixes, improved test coverage and better documentation. There have been a number of deprecations and API changes in this release, which are documented below. All users are encouraged to upgrade to this release, as there are a large number of bug-fixes and optimizations. Moreover, our development attention will now shift to bug-fix releases on the 0.14.x branch, and on adding new features on the master branch. This release requires Python 2.6, 2.7 or 3.2-3.4 and NumPy 1.5.1 or greater. New features ============ ``scipy.interpolate`` improvements ---------------------------------- A new wrapper function `scipy.interpolate.interpn` for interpolation on regular grids has been added. `interpn` supports linear and nearest-neighbor interpolation in arbitrary dimensions and spline interpolation in two dimensions. Faster implementations of piecewise polynomials in power and Bernstein polynomial bases have been added as `scipy.interpolate.PPoly` and `scipy.interpolate.BPoly`. New users should use these in favor of `scipy.interpolate.PiecewisePolynomial`. `scipy.interpolate.interp1d` now accepts non-monotonic inputs and sorts them. If performance is critical, sorting can be turned off by using the new ``assume_sorted`` keyword. Functionality for evaluation of bivariate spline derivatives in ``scipy.interpolate`` has been added. The new class `scipy.interpolate.Akima1DInterpolator` implements the piecewise cubic polynomial interpolation scheme devised by H. Akima. Functionality for fast interpolation on regular, unevenly spaced grids in arbitrary dimensions has been added as `scipy.interpolate.RegularGridInterpolator` . ``scipy.linalg`` improvements ----------------------------- The new function `scipy.linalg.dft` computes the matrix of the discrete Fourier transform. A condition number estimation function for matrix exponential, `scipy.linalg.expm_cond`, has been added. ``scipy.optimize`` improvements ------------------------------- A set of benchmarks for optimize, which can be run with ``optimize.bench()``, has been added. `scipy.optimize.curve_fit` now has more controllable error estimation via the ``absolute_sigma`` keyword. Support for passing custom minimization methods to ``optimize.minimize()`` and ``optimize.minimize_scalar()`` has been added, currently useful especially for combining ``optimize.basinhopping()`` with custom local optimizer routines. ``scipy.stats`` improvements ---------------------------- A new class `scipy.stats.multivariate_normal` with functionality for multivariate normal random variables has been added. A lot of work on the ``scipy.stats`` distribution framework has been done. Moment calculations (skew and kurtosis mainly) are fixed and verified, all examples are now runnable, and many small accuracy and performance improvements for individual distributions were merged. The new function `scipy.stats.anderson_ksamp` computes the k-sample Anderson-Darling test for the null hypothesis that k samples come from the same parent population. ``scipy.signal`` improvements ----------------------------- ``scipy.signal.iirfilter`` and related functions to design Butterworth, Chebyshev, elliptical and Bessel IIR filters now all use pole-zero ("zpk") format internally instead of using transformations to numerator/denominator format. The accuracy of the produced filters, especially high-order ones, is improved significantly as a result. The new function `scipy.signal.vectorstrength` computes the vector strength, a measure of phase synchrony, of a set of events. ``scipy.special`` improvements ------------------------------ The functions `scipy.special.boxcox` and `scipy.special.boxcox1p`, which compute the Box-Cox transformation, have been added. ``scipy.sparse`` improvements ----------------------------- - Significant performance improvement in CSR, CSC, and DOK indexing speed. - When using Numpy >= 1.9 (to be released in MM 2014), sparse matrices function correctly when given to arguments of ``np.dot``, ``np.multiply`` and other ufuncs. With earlier Numpy and Scipy versions, the results of such operations are undefined and usually unexpected. - Sparse matrices are no longer limited to ``2^31`` nonzero elements. They automatically switch to using 64-bit index data type for matrices containing more elements. User code written assuming the sparse matrices use int32 as the index data type will continue to work, except for such large matrices. Code dealing with larger matrices needs to accept either int32 or int64 indices. Deprecated features =================== ``anneal`` ---------- The global minimization function `scipy.optimize.anneal` is deprecated. All users should use the `scipy.optimize.basinhopping` function instead. ``scipy.stats`` --------------- ``randwcdf`` and ``randwppf`` functions are deprecated. All users should use distribution-specific ``rvs`` methods instead. Probability calculation aliases ``zprob``, ``fprob`` and ``ksprob`` are deprecated. Use instead the ``sf`` methods of the corresponding distributions or the ``special`` functions directly. ``scipy.interpolate`` --------------------- ``PiecewisePolynomial`` class is deprecated. Backwards incompatible changes ============================== scipy.special.lpmn ------------------ ``lpmn`` no longer accepts complex-valued arguments. A new function ``clpmn`` with uniform complex analytic behavior has been added, and it should be used instead. scipy.sparse.linalg ------------------- Eigenvectors in the case of generalized eigenvalue problem are normalized to unit vectors in 2-norm, rather than following the LAPACK normalization convention. The deprecated UMFPACK wrapper in ``scipy.sparse.linalg`` has been removed due to license and install issues. If available, ``scikits.umfpack`` is still used transparently in the ``spsolve`` and ``factorized`` functions. Otherwise, SuperLU is used instead in these functions. scipy.stats ----------- The deprecated functions ``glm``, ``oneway`` and ``cmedian`` have been removed from ``scipy.stats``. ``stats.scoreatpercentile`` now returns an array instead of a list of percentiles. scipy.interpolate ----------------- The API for computing derivatives of a monotone piecewise interpolation has changed: if `p` is a ``PchipInterpolator`` object, `p.derivative(der)` returns a callable object representing the derivative of `p`. For in-place derivatives use the second argument of the `__call__` method: `p(0.1, der=2)` evaluates the second derivative of `p` at `x=0.1`. The method `p.derivatives` has been removed. SciPy 0.13.3 Release Notes SciPy 0.13.3 is a bug-fix release with no new features compared to 0.13.2. Both the weave and the ndimage.label bugs were severe regressions in 0.13.0, hence this release. Issues fixed 3148: fix a memory leak in ndimage.label. 3216: fix weave issue with too long file names for MSVC. Other changes Update Sphinx theme used for html docs so >>> in examples can be toggled. SciPy 0.13.2 Release Notes SciPy 0.13.2 is a bug-fix release with no new features compared to 0.13.1. Issues fixed 3096: require Cython 0.19, earlier versions have memory leaks in fused types 3079: ndimage.label fix swapped 64-bitness test 3108: optimize.fmin_slsqp constraint violation SciPy 0.13.1 Release Notes SciPy 0.13.1 is a bug-fix release with no new features compared to 0.13.0. The only changes are several fixes in ndimage, one of which was a serious regression in ndimage.label (Github issue 3025), which gave incorrect results in 0.13.0. Issues fixed 3025: ndimage.label returns incorrect results in scipy 0.13.0 1992: ndimage.label return type changed from int32 to uint32 1992: ndimage.find_objects doesn't work with int32 input in some cases SciPy 0.13.0 Release Notes ========================== .. contents:: SciPy 0.13.0 is the culmination of 7 months of hard work. It contains many new features, numerous bug-fixes, improved test coverage and better documentation. There have been a number of deprecations and API changes in this release, which are documented below. All users are encouraged to upgrade to this release, as there are a large number of bug-fixes and optimizations. Moreover, our development attention will now shift to bug-fix releases on the 0.13.x branch, and on adding new features on the master branch. This release requires Python 2.6, 2.7 or 3.1-3.3 and NumPy 1.5.1 or greater. Highlights of this release are: - support for fancy indexing and boolean comparisons with sparse matrices - interpolative decompositions and matrix functions in the linalg module - two new trust-region solvers for unconstrained minimization New features ============ ``scipy.integrate`` improvements -------------------------------- N-dimensional numerical integration ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ A new function `scipy.integrate.nquad`, which provides N-dimensional integration functionality with a more flexible interface than ``dblquad`` and ``tplquad``, has been added. ``dopri*`` improvements ^^^^^^^^^^^^^^^^^^^^^^^ The intermediate results from the ``dopri`` family of ODE solvers can now be accessed by a *solout* callback function. ``scipy.linalg`` improvements ----------------------------- Interpolative decompositions ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Scipy now includes a new module `scipy.linalg.interpolative` containing routines for computing interpolative matrix decompositions (ID). This feature is based on the ID software package by P.G. Martinsson, V. Rokhlin, Y. Shkolnisky, and M. Tygert, previously adapted for Python in the PymatrixId package by K.L. Ho. Polar decomposition ^^^^^^^^^^^^^^^^^^^ A new function `scipy.linalg.polar`, to compute the polar decomposition of a matrix, was added. BLAS level 3 functions ^^^^^^^^^^^^^^^^^^^^^^ The BLAS functions ``symm``, ``syrk``, ``syr2k``, ``hemm``, ``herk`` and ``her2k`` are now wrapped in `scipy.linalg`. Matrix functions ^^^^^^^^^^^^^^^^ Several matrix function algorithms have been implemented or updated following detailed descriptions in recent papers of Nick Higham and his co-authors. These include the matrix square root (``sqrtm``), the matrix logarithm (``logm``), the matrix exponential (``expm``) and its Frechet derivative (``expm_frechet``), and fractional matrix powers (``fractional_matrix_power``). ``scipy.optimize`` improvements ------------------------------- Trust-region unconstrained minimization algorithms ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The ``minimize`` function gained two trust-region solvers for unconstrained minimization: ``dogleg`` and ``trust-ncg``. ``scipy.sparse`` improvements ----------------------------- Boolean comparisons and sparse matrices ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ All sparse matrix types now support boolean data, and boolean operations. Two sparse matrices `A` and `B` can be compared in all the expected ways `A < B`, `A >= B`, `A != B`, producing similar results as dense Numpy arrays. Comparisons with dense matrices and scalars are also supported. CSR and CSC fancy indexing ^^^^^^^^^^^^^^^^^^^^^^^^^^ Compressed sparse row and column sparse matrix types now support fancy indexing with boolean matrices, slices, and lists. So where A is a (CSC or CSR) sparse matrix, you can do things like:: >>> A[A > 0.5] = 1 # since Boolean sparse matrices work >>> A[:2, :3] = 2 >>> A[[1,2], 2] = 3 ``scipy.sparse.linalg`` improvements ------------------------------------ The new function ``onenormest`` provides a lower bound of the 1-norm of a linear operator and has been implemented according to Higham and Tisseur (2000). This function is not only useful for sparse matrices, but can also be used to estimate the norm of products or powers of dense matrices without explictly building the intermediate matrix. The multiplicative action of the matrix exponential of a linear operator (``expm_multiply``) has been implemented following the description in Al-Mohy and Higham (2011). Abstract linear operators (`scipy.sparse.linalg.LinearOperator`) can now be multiplied, added to each other, and exponentiated, producing new linear operators. This enables easier construction of composite linear operations. ``scipy.spatial`` improvements ------------------------------ The vertices of a `ConvexHull` can now be accessed via the `vertices` attribute, which gives proper orientation in 2-D. ``scipy.signal`` improvements ----------------------------- The cosine window function `scipy.signal.cosine` was added. ``scipy.special`` improvements ------------------------------ New functions `scipy.special.xlogy` and `scipy.special.xlog1py` were added. These functions can simplify and speed up code that has to calculate ``x * log(y)`` and give 0 when ``x == 0``. ``scipy.io`` improvements ------------------------- Unformatted Fortran file reader ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The new class `scipy.io.FortranFile` facilitates reading unformatted sequential files written by Fortran code. ``scipy.io.wavfile`` enhancements ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `scipy.io.wavfile.write` now accepts a file buffer. Previously it only accepted a filename. `scipy.io.wavfile.read` and `scipy.io.wavfile.write` can now handle floating point WAV files. ``scipy.interpolate`` improvements ---------------------------------- B-spline derivatives and antiderivatives ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `scipy.interpolate.splder` and `scipy.interpolate.splantider` functions for computing B-splines that represent derivatives and antiderivatives of B-splines were added. These functions are also available in the class-based FITPACK interface as ``UnivariateSpline.derivative`` and ``UnivariateSpline.antiderivative``. ``scipy.stats`` improvements ---------------------------- Distributions now allow using keyword parameters in addition to positional parameters in all methods. The function `scipy.stats.power_divergence` has been added for the Cressie-Read power divergence statistic and goodness of fit test. Included in this family of statistics is the "G-test" (http://en.wikipedia.org/wiki/G-test). `scipy.stats.mood` now accepts multidimensional input. An option was added to `scipy.stats.wilcoxon` for continuity correction. `scipy.stats.chisquare` now has an `axis` argument. `scipy.stats.mstats.chisquare` now has `axis` and `ddof` arguments. Deprecated features =================== ``expm2`` and ``expm3`` ----------------------- The matrix exponential functions `scipy.linalg.expm2` and `scipy.linalg.expm3` are deprecated. All users should use the numerically more robust `scipy.linalg.expm` function instead. ``scipy.stats`` functions ------------------------- `scipy.stats.oneway` is deprecated; `scipy.stats.f_oneway` should be used instead. `scipy.stats.glm` is deprecated. `scipy.stats.ttest_ind` is an equivalent function; more full-featured general (and generalized) linear model implementations can be found in statsmodels. `scipy.stats.cmedian` is deprecated; ``numpy.median`` should be used instead. Backwards incompatible changes ============================== LIL matrix assignment --------------------- Assigning values to LIL matrices with two index arrays now works similarly as assigning into ndarrays:: >>> x = lil_matrix((3, 3)) >>> x[[0,1,2],[0,1,2]]=[0,1,2] >>> x.todense() matrix([[ 0., 0., 0.], [ 0., 1., 0.], [ 0., 0., 2.]]) rather than giving the result:: >>> x.todense() matrix([[ 0., 1., 2.], [ 0., 1., 2.], [ 0., 1., 2.]]) Users relying on the previous behavior will need to revisit their code. The previous behavior is obtained by ``x[numpy.ix_([0,1,2],[0,1,2])] = ...`. Deprecated ``radon`` function removed ------------------------------------- The ``misc.radon`` function, which was deprecated in scipy 0.11.0, has been removed. Users can find a more full-featured ``radon`` function in scikit-image. Removed deprecated keywords ``xa`` and ``xb`` from ``stats.distributions`` -------------------------------------------------------------------------- The keywords ``xa`` and ``xb``, which were deprecated since 0.11.0, have been removed from the distributions in ``scipy.stats``. Changes to MATLAB file readers / writers ---------------------------------------- The major change is that 1D arrays in numpy now become row vectors (shape 1, N) when saved to a MATLAB 5 format file. Previously 1D arrays saved as column vectors (N, 1). This is to harmonize the behavior of writing MATLAB 4 and 5 formats, and adapt to the defaults of numpy and MATLAB - for example ``np.atleast_2d`` returns 1D arrays as row vectors. Trying to save arrays of greater than 2 dimensions in MATLAB 4 format now raises an error instead of silently reshaping the array as 2D. ``scipy.io.loadmat('afile')`` used to look for `afile` on the Python system path (``sys.path``); now ``loadmat`` only looks in the current directory for a relative path filename. Other changes ============= Security fix: ``scipy.weave`` previously used temporary directories in an insecure manner under certain circumstances. Cython is now required to build *unreleased* versions of scipy. The C files generated from Cython sources are not included in the git repo anymore. They are however still shipped in source releases. The code base received a fairly large PEP8 cleanup. A ``tox pep8`` command has been added; new code should pass this test command. Scipy cannot be compiled with gfortran 4.1 anymore (at least on RH5), likely due to that compiler version not supporting entry constructs well.
Diffstat (limited to 'math')
-rw-r--r--math/py-scipy/Makefile41
-rw-r--r--math/py-scipy/PLIST372
-rw-r--r--math/py-scipy/distinfo8
3 files changed, 186 insertions, 235 deletions
diff --git a/math/py-scipy/Makefile b/math/py-scipy/Makefile
index 3746d5461b5..13f47ae8ecc 100644
--- a/math/py-scipy/Makefile
+++ b/math/py-scipy/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2015/01/27 06:36:27 dbj Exp $
+# $NetBSD: Makefile,v 1.17 2015/04/17 00:49:50 wen Exp $
-DISTNAME= scipy-0.12.1
-PKGNAME= ${PYPKGPREFIX}-scipy-0.12.1
-PKGREVISION= 1
+DISTNAME= scipy-0.15.1
+PKGNAME= ${PYPKGPREFIX}-scipy-0.15.1
CATEGORIES= math python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scipy/}
@@ -33,95 +32,63 @@ CPPFLAGS+= -D__STDC_FORMAT_MACROS
FFLAGS+= -fPIC
REPLACE_PYTHON+= scipy/cluster/setup.py
-REPLACE_PYTHON+= scipy/cluster/setupscons.py
REPLACE_PYTHON+= scipy/cluster/tests/test_hierarchy.py
REPLACE_PYTHON+= scipy/cluster/tests/test_vq.py
REPLACE_PYTHON+= scipy/fftpack/setup.py
-REPLACE_PYTHON+= scipy/fftpack/setupscons.py
REPLACE_PYTHON+= scipy/fftpack/tests/test_basic.py
REPLACE_PYTHON+= scipy/fftpack/tests/test_helper.py
REPLACE_PYTHON+= scipy/fftpack/tests/test_pseudo_diffs.py
REPLACE_PYTHON+= scipy/fftpack/tests/test_real_transforms.py
REPLACE_PYTHON+= scipy/integrate/setup.py
-REPLACE_PYTHON+= scipy/integrate/setupscons.py
REPLACE_PYTHON+= scipy/interpolate/fitpack.py
REPLACE_PYTHON+= scipy/interpolate/setup.py
-REPLACE_PYTHON+= scipy/interpolate/setupscons.py
REPLACE_PYTHON+= scipy/interpolate/tests/test_fitpack.py
REPLACE_PYTHON+= scipy/interpolate/tests/test_fitpack2.py
REPLACE_PYTHON+= scipy/interpolate/tests/test_rbf.py
REPLACE_PYTHON+= scipy/io/arff/arffread.py
REPLACE_PYTHON+= scipy/io/arff/setup.py
REPLACE_PYTHON+= scipy/io/arff/tests/test_arffread.py
-REPLACE_PYTHON+= scipy/io/arff/utils.py
REPLACE_PYTHON+= scipy/io/harwell_boeing/setup.py
-REPLACE_PYTHON+= scipy/io/harwell_boeing/setupscons.py
REPLACE_PYTHON+= scipy/io/matlab/setup.py
-REPLACE_PYTHON+= scipy/io/matlab/setupscons.py
REPLACE_PYTHON+= scipy/io/matlab/tests/test_mio.py
REPLACE_PYTHON+= scipy/io/matlab/tests/test_mio_funcs.py
REPLACE_PYTHON+= scipy/io/setup.py
-REPLACE_PYTHON+= scipy/io/setupscons.py
REPLACE_PYTHON+= scipy/io/tests/test_mmio.py
REPLACE_PYTHON+= scipy/lib/blas/setup.py
-REPLACE_PYTHON+= scipy/lib/blas/setupscons.py
REPLACE_PYTHON+= scipy/lib/blas/tests/test_blas.py
REPLACE_PYTHON+= scipy/lib/lapack/setup.py
-REPLACE_PYTHON+= scipy/lib/lapack/setupscons.py
REPLACE_PYTHON+= scipy/lib/lapack/tests/test_lapack.py
REPLACE_PYTHON+= scipy/lib/setup.py
-REPLACE_PYTHON+= scipy/lib/setupscons.py
REPLACE_PYTHON+= scipy/linalg/setup.py
-REPLACE_PYTHON+= scipy/linalg/setupscons.py
REPLACE_PYTHON+= scipy/linalg/tests/test_basic.py
REPLACE_PYTHON+= scipy/linalg/tests/test_blas.py
REPLACE_PYTHON+= scipy/linalg/tests/test_decomp.py
REPLACE_PYTHON+= scipy/linalg/tests/test_lapack.py
REPLACE_PYTHON+= scipy/linalg/tests/test_matfuncs.py
REPLACE_PYTHON+= scipy/odr/setup.py
-REPLACE_PYTHON+= scipy/odr/setupscons.py
REPLACE_PYTHON+= scipy/optimize/setup.py
-REPLACE_PYTHON+= scipy/optimize/setupscons.py
REPLACE_PYTHON+= scipy/optimize/tests/test_zeros.py
REPLACE_PYTHON+= scipy/signal/setup.py
-REPLACE_PYTHON+= scipy/signal/setupscons.py
-REPLACE_PYTHON+= scipy/sparse/csgraph/setupscons.py
+REPLACE_PYTHON+= scipy/sparse/generate_sparsetools.py
REPLACE_PYTHON+= scipy/sparse/linalg/dsolve/setup.py
-REPLACE_PYTHON+= scipy/sparse/linalg/dsolve/setupscons.py
-REPLACE_PYTHON+= scipy/sparse/linalg/dsolve/umfpack/setup.py
-REPLACE_PYTHON+= scipy/sparse/linalg/dsolve/umfpack/setupscons.py
-REPLACE_PYTHON+= scipy/sparse/linalg/dsolve/umfpack/tests/test_umfpack.py
-REPLACE_PYTHON+= scipy/sparse/linalg/dsolve/umfpack/tests/try_umfpack.py
REPLACE_PYTHON+= scipy/sparse/linalg/eigen/arpack/setup.py
-REPLACE_PYTHON+= scipy/sparse/linalg/eigen/arpack/setupscons.py
REPLACE_PYTHON+= scipy/sparse/linalg/eigen/arpack/tests/test_arpack.py
REPLACE_PYTHON+= scipy/sparse/linalg/eigen/lobpcg/setup.py
-REPLACE_PYTHON+= scipy/sparse/linalg/eigen/lobpcg/setupscons.py
REPLACE_PYTHON+= scipy/sparse/linalg/eigen/lobpcg/tests/test_lobpcg.py
REPLACE_PYTHON+= scipy/sparse/linalg/eigen/setup.py
-REPLACE_PYTHON+= scipy/sparse/linalg/eigen/setupscons.py
REPLACE_PYTHON+= scipy/sparse/linalg/isolve/setup.py
-REPLACE_PYTHON+= scipy/sparse/linalg/isolve/setupscons.py
REPLACE_PYTHON+= scipy/sparse/linalg/isolve/tests/test_iterative.py
REPLACE_PYTHON+= scipy/sparse/linalg/isolve/tests/test_lgmres.py
REPLACE_PYTHON+= scipy/sparse/linalg/setup.py
-REPLACE_PYTHON+= scipy/sparse/linalg/setupscons.py
REPLACE_PYTHON+= scipy/sparse/linalg/tests/test_matfuncs.py
REPLACE_PYTHON+= scipy/sparse/setup.py
-REPLACE_PYTHON+= scipy/sparse/setupscons.py
-REPLACE_PYTHON+= scipy/sparse/sparsetools/setup.py
-REPLACE_PYTHON+= scipy/sparse/sparsetools/setupscons.py
REPLACE_PYTHON+= scipy/spatial/setup.py
-REPLACE_PYTHON+= scipy/spatial/setupscons.py
REPLACE_PYTHON+= scipy/spatial/tests/test_distance.py
REPLACE_PYTHON+= scipy/special/generate_ufuncs.py
REPLACE_PYTHON+= scipy/special/setup.py
-REPLACE_PYTHON+= scipy/special/setupscons.py
REPLACE_PYTHON+= scipy/special/spfun_stats.py
REPLACE_PYTHON+= scipy/stats/setup.py
-REPLACE_PYTHON+= scipy/stats/setupscons.py
REPLACE_PYTHON+= scipy/weave/setup.py
-REPLACE_PYTHON+= scipy/weave/setupscons.py
.include "../../lang/python/application.mk"
.include "../../lang/python/distutils.mk"
diff --git a/math/py-scipy/PLIST b/math/py-scipy/PLIST
index cd0c908ba8f..c0abb498713 100644
--- a/math/py-scipy/PLIST
+++ b/math/py-scipy/PLIST
@@ -1,13 +1,10 @@
-@comment $NetBSD: PLIST,v 1.6 2014/02/12 12:53:56 obache Exp $
+@comment $NetBSD: PLIST,v 1.7 2015/04/17 00:49:50 wen Exp $
${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/scipy/BENTO_BUILD.txt
${PYSITELIB}/scipy/HACKING.rst.txt
-${PYSITELIB}/scipy/INSTALL.txt
-${PYSITELIB}/scipy/LATEST.txt
+${PYSITELIB}/scipy/INSTALL.rst.txt
${PYSITELIB}/scipy/LICENSE.txt
-${PYSITELIB}/scipy/README.txt
${PYSITELIB}/scipy/THANKS.txt
-${PYSITELIB}/scipy/TOCHANGE.txt
${PYSITELIB}/scipy/__config__.py
${PYSITELIB}/scipy/__config__.pyc
${PYSITELIB}/scipy/__config__.pyo
@@ -23,7 +20,7 @@ ${PYSITELIB}/scipy/_build_utils/_fortran.pyo
${PYSITELIB}/scipy/cluster/__init__.py
${PYSITELIB}/scipy/cluster/__init__.pyc
${PYSITELIB}/scipy/cluster/__init__.pyo
-${PYSITELIB}/scipy/cluster/_hierarchy_wrap.so
+${PYSITELIB}/scipy/cluster/_hierarchy.so
${PYSITELIB}/scipy/cluster/_vq.so
${PYSITELIB}/scipy/cluster/hierarchy.py
${PYSITELIB}/scipy/cluster/hierarchy.pyc
@@ -31,48 +28,8 @@ ${PYSITELIB}/scipy/cluster/hierarchy.pyo
${PYSITELIB}/scipy/cluster/setup.py
${PYSITELIB}/scipy/cluster/setup.pyc
${PYSITELIB}/scipy/cluster/setup.pyo
-${PYSITELIB}/scipy/cluster/setupscons.py
-${PYSITELIB}/scipy/cluster/setupscons.pyc
-${PYSITELIB}/scipy/cluster/setupscons.pyo
-${PYSITELIB}/scipy/cluster/tests/Q-X.txt
${PYSITELIB}/scipy/cluster/tests/data.txt
-${PYSITELIB}/scipy/cluster/tests/fclusterdata-maxclusts-2.txt
-${PYSITELIB}/scipy/cluster/tests/fclusterdata-maxclusts-3.txt
-${PYSITELIB}/scipy/cluster/tests/fclusterdata-maxclusts-4.txt
-${PYSITELIB}/scipy/cluster/tests/inconsistent-Q-single-1.txt
-${PYSITELIB}/scipy/cluster/tests/inconsistent-Q-single-2.txt
-${PYSITELIB}/scipy/cluster/tests/inconsistent-Q-single-3.txt
-${PYSITELIB}/scipy/cluster/tests/inconsistent-Q-single-4.txt
-${PYSITELIB}/scipy/cluster/tests/inconsistent-Q-single-5.txt
-${PYSITELIB}/scipy/cluster/tests/inconsistent-Q-single-6.txt
-${PYSITELIB}/scipy/cluster/tests/inconsistent-complete-tdist-depth-1.txt
-${PYSITELIB}/scipy/cluster/tests/inconsistent-complete-tdist-depth-2.txt
-${PYSITELIB}/scipy/cluster/tests/inconsistent-complete-tdist-depth-3.txt
-${PYSITELIB}/scipy/cluster/tests/inconsistent-complete-tdist-depth-4.txt
-${PYSITELIB}/scipy/cluster/tests/inconsistent-single-tdist-depth-0.txt
-${PYSITELIB}/scipy/cluster/tests/inconsistent-single-tdist-depth-1.txt
-${PYSITELIB}/scipy/cluster/tests/inconsistent-single-tdist-depth-2.txt
-${PYSITELIB}/scipy/cluster/tests/inconsistent-single-tdist-depth-3.txt
-${PYSITELIB}/scipy/cluster/tests/inconsistent-single-tdist-depth-4.txt
-${PYSITELIB}/scipy/cluster/tests/inconsistent-single-tdist-depth-5.txt
-${PYSITELIB}/scipy/cluster/tests/inconsistent-single-tdist.txt
-${PYSITELIB}/scipy/cluster/tests/inconsistent-weighted-tdist-depth-1.txt
-${PYSITELIB}/scipy/cluster/tests/inconsistent-weighted-tdist-depth-2.txt
-${PYSITELIB}/scipy/cluster/tests/inconsistent-weighted-tdist-depth-3.txt
-${PYSITELIB}/scipy/cluster/tests/inconsistent-weighted-tdist-depth-4.txt
-${PYSITELIB}/scipy/cluster/tests/iris.txt
-${PYSITELIB}/scipy/cluster/tests/linkage-Q-average.txt
-${PYSITELIB}/scipy/cluster/tests/linkage-Q-centroid.txt
-${PYSITELIB}/scipy/cluster/tests/linkage-Q-complete.txt
-${PYSITELIB}/scipy/cluster/tests/linkage-Q-median.txt
-${PYSITELIB}/scipy/cluster/tests/linkage-Q-single.txt
-${PYSITELIB}/scipy/cluster/tests/linkage-Q-ward.txt
-${PYSITELIB}/scipy/cluster/tests/linkage-Q-weighted.txt
-${PYSITELIB}/scipy/cluster/tests/linkage-X.txt
-${PYSITELIB}/scipy/cluster/tests/linkage-average-tdist.txt
-${PYSITELIB}/scipy/cluster/tests/linkage-complete-tdist.txt
-${PYSITELIB}/scipy/cluster/tests/linkage-single-tdist.txt
-${PYSITELIB}/scipy/cluster/tests/linkage-weighted-tdist.txt
+${PYSITELIB}/scipy/cluster/tests/hierarchy_test_data.py
${PYSITELIB}/scipy/cluster/tests/test_hierarchy.py
${PYSITELIB}/scipy/cluster/tests/test_vq.py
${PYSITELIB}/scipy/cluster/tests/vq_test.py
@@ -118,9 +75,6 @@ ${PYSITELIB}/scipy/fftpack/realtransforms.pyo
${PYSITELIB}/scipy/fftpack/setup.py
${PYSITELIB}/scipy/fftpack/setup.pyc
${PYSITELIB}/scipy/fftpack/setup.pyo
-${PYSITELIB}/scipy/fftpack/setupscons.py
-${PYSITELIB}/scipy/fftpack/setupscons.pyc
-${PYSITELIB}/scipy/fftpack/setupscons.pyo
${PYSITELIB}/scipy/fftpack/tests/Makefile
${PYSITELIB}/scipy/fftpack/tests/fftw_dct.c
${PYSITELIB}/scipy/fftpack/tests/fftw_double_ref.npz
@@ -142,6 +96,7 @@ ${PYSITELIB}/scipy/integrate/_ode.pyc
${PYSITELIB}/scipy/integrate/_ode.pyo
${PYSITELIB}/scipy/integrate/_odepack.so
${PYSITELIB}/scipy/integrate/_quadpack.so
+${PYSITELIB}/scipy/integrate/_test_multivariate.so
${PYSITELIB}/scipy/integrate/lsoda.so
${PYSITELIB}/scipy/integrate/odepack.py
${PYSITELIB}/scipy/integrate/odepack.pyc
@@ -155,9 +110,8 @@ ${PYSITELIB}/scipy/integrate/quadrature.pyo
${PYSITELIB}/scipy/integrate/setup.py
${PYSITELIB}/scipy/integrate/setup.pyc
${PYSITELIB}/scipy/integrate/setup.pyo
-${PYSITELIB}/scipy/integrate/setupscons.py
-${PYSITELIB}/scipy/integrate/setupscons.pyc
-${PYSITELIB}/scipy/integrate/setupscons.pyo
+${PYSITELIB}/scipy/integrate/tests/_test_multivariate.c
+${PYSITELIB}/scipy/integrate/tests/test_banded_ode_solvers.py
${PYSITELIB}/scipy/integrate/tests/test_integrate.py
${PYSITELIB}/scipy/integrate/tests/test_quadpack.py
${PYSITELIB}/scipy/integrate/tests/test_quadrature.py
@@ -167,6 +121,10 @@ ${PYSITELIB}/scipy/interpolate/__init__.pyc
${PYSITELIB}/scipy/interpolate/__init__.pyo
${PYSITELIB}/scipy/interpolate/_fitpack.so
${PYSITELIB}/scipy/interpolate/_interpolate.so
+${PYSITELIB}/scipy/interpolate/_monotone.py
+${PYSITELIB}/scipy/interpolate/_monotone.pyc
+${PYSITELIB}/scipy/interpolate/_monotone.pyo
+${PYSITELIB}/scipy/interpolate/_ppoly.so
${PYSITELIB}/scipy/interpolate/dfitpack.so
${PYSITELIB}/scipy/interpolate/fitpack.py
${PYSITELIB}/scipy/interpolate/fitpack.pyc
@@ -196,9 +154,8 @@ ${PYSITELIB}/scipy/interpolate/rbf.pyo
${PYSITELIB}/scipy/interpolate/setup.py
${PYSITELIB}/scipy/interpolate/setup.pyc
${PYSITELIB}/scipy/interpolate/setup.pyo
-${PYSITELIB}/scipy/interpolate/setupscons.py
-${PYSITELIB}/scipy/interpolate/setupscons.pyc
-${PYSITELIB}/scipy/interpolate/setupscons.pyo
+${PYSITELIB}/scipy/interpolate/tests/data/bug-1310.npz
+${PYSITELIB}/scipy/interpolate/tests/data/estimate_gradients_hang.npy
${PYSITELIB}/scipy/interpolate/tests/test_fitpack.py
${PYSITELIB}/scipy/interpolate/tests/test_fitpack2.py
${PYSITELIB}/scipy/interpolate/tests/test_interpnd.py
@@ -211,15 +168,15 @@ ${PYSITELIB}/scipy/interpolate/tests/test_regression.py
${PYSITELIB}/scipy/io/__init__.py
${PYSITELIB}/scipy/io/__init__.pyc
${PYSITELIB}/scipy/io/__init__.pyo
+${PYSITELIB}/scipy/io/_fortran.py
+${PYSITELIB}/scipy/io/_fortran.pyc
+${PYSITELIB}/scipy/io/_fortran.pyo
${PYSITELIB}/scipy/io/arff/__init__.py
${PYSITELIB}/scipy/io/arff/__init__.pyc
${PYSITELIB}/scipy/io/arff/__init__.pyo
${PYSITELIB}/scipy/io/arff/arffread.py
${PYSITELIB}/scipy/io/arff/arffread.pyc
${PYSITELIB}/scipy/io/arff/arffread.pyo
-${PYSITELIB}/scipy/io/arff/myfunctools.py
-${PYSITELIB}/scipy/io/arff/myfunctools.pyc
-${PYSITELIB}/scipy/io/arff/myfunctools.pyo
${PYSITELIB}/scipy/io/arff/setup.py
${PYSITELIB}/scipy/io/arff/setup.pyc
${PYSITELIB}/scipy/io/arff/setup.pyo
@@ -230,10 +187,10 @@ ${PYSITELIB}/scipy/io/arff/tests/data/test2.arff
${PYSITELIB}/scipy/io/arff/tests/data/test3.arff
${PYSITELIB}/scipy/io/arff/tests/data/test4.arff
${PYSITELIB}/scipy/io/arff/tests/data/test5.arff
+${PYSITELIB}/scipy/io/arff/tests/data/test6.arff
+${PYSITELIB}/scipy/io/arff/tests/data/test7.arff
+${PYSITELIB}/scipy/io/arff/tests/data/test8.arff
${PYSITELIB}/scipy/io/arff/tests/test_arffread.py
-${PYSITELIB}/scipy/io/arff/utils.py
-${PYSITELIB}/scipy/io/arff/utils.pyc
-${PYSITELIB}/scipy/io/arff/utils.pyo
${PYSITELIB}/scipy/io/harwell_boeing/__init__.py
${PYSITELIB}/scipy/io/harwell_boeing/__init__.pyc
${PYSITELIB}/scipy/io/harwell_boeing/__init__.pyo
@@ -246,9 +203,6 @@ ${PYSITELIB}/scipy/io/harwell_boeing/hb.pyo
${PYSITELIB}/scipy/io/harwell_boeing/setup.py
${PYSITELIB}/scipy/io/harwell_boeing/setup.pyc
${PYSITELIB}/scipy/io/harwell_boeing/setup.pyo
-${PYSITELIB}/scipy/io/harwell_boeing/setupscons.py
-${PYSITELIB}/scipy/io/harwell_boeing/setupscons.pyc
-${PYSITELIB}/scipy/io/harwell_boeing/setupscons.pyo
${PYSITELIB}/scipy/io/harwell_boeing/tests/test_fortran_format.py
${PYSITELIB}/scipy/io/harwell_boeing/tests/test_hb.py
${PYSITELIB}/scipy/io/idl.py
@@ -257,6 +211,7 @@ ${PYSITELIB}/scipy/io/idl.pyo
${PYSITELIB}/scipy/io/matlab/__init__.py
${PYSITELIB}/scipy/io/matlab/__init__.pyc
${PYSITELIB}/scipy/io/matlab/__init__.pyo
+${PYSITELIB}/scipy/io/matlab/benchmarks/bench_memusage.py
${PYSITELIB}/scipy/io/matlab/benchmarks/bench_structarr.py
${PYSITELIB}/scipy/io/matlab/byteordercodes.py
${PYSITELIB}/scipy/io/matlab/byteordercodes.pyc
@@ -281,12 +236,13 @@ ${PYSITELIB}/scipy/io/matlab/miobase.pyo
${PYSITELIB}/scipy/io/matlab/setup.py
${PYSITELIB}/scipy/io/matlab/setup.pyc
${PYSITELIB}/scipy/io/matlab/setup.pyo
-${PYSITELIB}/scipy/io/matlab/setupscons.py
-${PYSITELIB}/scipy/io/matlab/setupscons.pyc
-${PYSITELIB}/scipy/io/matlab/setupscons.pyo
${PYSITELIB}/scipy/io/matlab/streams.so
${PYSITELIB}/scipy/io/matlab/tests/afunc.m
+${PYSITELIB}/scipy/io/matlab/tests/data/big_endian.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/corrupted_zlib_checksum.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/corrupted_zlib_data.mat
${PYSITELIB}/scipy/io/matlab/tests/data/japanese_utf8.txt
+${PYSITELIB}/scipy/io/matlab/tests/data/little_endian.mat
${PYSITELIB}/scipy/io/matlab/tests/data/nasty_duplicate_fieldnames.mat
${PYSITELIB}/scipy/io/matlab/tests/data/one_by_zero_char.mat
${PYSITELIB}/scipy/io/matlab/tests/data/parabola.mat
@@ -300,6 +256,7 @@ ${PYSITELIB}/scipy/io/matlab/tests/data/test3dmatrix_7.4_GLNX86.mat
${PYSITELIB}/scipy/io/matlab/tests/data/test_empty_struct.mat
${PYSITELIB}/scipy/io/matlab/tests/data/test_mat4_le_floats.mat
${PYSITELIB}/scipy/io/matlab/tests/data/test_skip_variable.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/testbool_8_WIN64.mat
${PYSITELIB}/scipy/io/matlab/tests/data/testcell_6.1_SOL2.mat
${PYSITELIB}/scipy/io/matlab/tests/data/testcell_6.5.1_GLNX86.mat
${PYSITELIB}/scipy/io/matlab/tests/data/testcell_7.1_GLNX86.mat
@@ -391,6 +348,7 @@ ${PYSITELIB}/scipy/io/matlab/tests/test_mio.py
${PYSITELIB}/scipy/io/matlab/tests/test_mio5_utils.py
${PYSITELIB}/scipy/io/matlab/tests/test_mio_funcs.py
${PYSITELIB}/scipy/io/matlab/tests/test_mio_utils.py
+${PYSITELIB}/scipy/io/matlab/tests/test_miobase.py
${PYSITELIB}/scipy/io/matlab/tests/test_pathological.py
${PYSITELIB}/scipy/io/matlab/tests/test_streams.py
${PYSITELIB}/scipy/io/mmio.py
@@ -402,9 +360,6 @@ ${PYSITELIB}/scipy/io/netcdf.pyo
${PYSITELIB}/scipy/io/setup.py
${PYSITELIB}/scipy/io/setup.pyc
${PYSITELIB}/scipy/io/setup.pyo
-${PYSITELIB}/scipy/io/setupscons.py
-${PYSITELIB}/scipy/io/setupscons.pyc
-${PYSITELIB}/scipy/io/setupscons.pyo
${PYSITELIB}/scipy/io/tests/data/array_float32_1d.sav
${PYSITELIB}/scipy/io/tests/data/array_float32_2d.sav
${PYSITELIB}/scipy/io/tests/data/array_float32_3d.sav
@@ -422,7 +377,22 @@ ${PYSITELIB}/scipy/io/tests/data/array_float32_pointer_6d.sav
${PYSITELIB}/scipy/io/tests/data/array_float32_pointer_7d.sav
${PYSITELIB}/scipy/io/tests/data/array_float32_pointer_8d.sav
${PYSITELIB}/scipy/io/tests/data/example_1.nc
+${PYSITELIB}/scipy/io/tests/data/fortran-mixed.dat
+${PYSITELIB}/scipy/io/tests/data/fortran-sf8-10x1x11.dat
+${PYSITELIB}/scipy/io/tests/data/fortran-sf8-1x1x1.dat
+${PYSITELIB}/scipy/io/tests/data/fortran-sf8-22x10x15.dat
+${PYSITELIB}/scipy/io/tests/data/fortran-sf8-5x1x1.dat
+${PYSITELIB}/scipy/io/tests/data/fortran-sf8-5x3x1.dat
+${PYSITELIB}/scipy/io/tests/data/fortran-sf8-7x1x1.dat
+${PYSITELIB}/scipy/io/tests/data/fortran-si4-10x1x11.dat
+${PYSITELIB}/scipy/io/tests/data/fortran-si4-1x1x1.dat
+${PYSITELIB}/scipy/io/tests/data/fortran-si4-22x10x15.dat
+${PYSITELIB}/scipy/io/tests/data/fortran-si4-5x1x1.dat
+${PYSITELIB}/scipy/io/tests/data/fortran-si4-5x3x1.dat
+${PYSITELIB}/scipy/io/tests/data/fortran-si4-7x1x1.dat
+${PYSITELIB}/scipy/io/tests/data/null_pointer.sav
${PYSITELIB}/scipy/io/tests/data/scalar_byte.sav
+${PYSITELIB}/scipy/io/tests/data/scalar_byte_descr.sav
${PYSITELIB}/scipy/io/tests/data/scalar_complex32.sav
${PYSITELIB}/scipy/io/tests/data/scalar_complex64.sav
${PYSITELIB}/scipy/io/tests/data/scalar_float32.sav
@@ -451,6 +421,7 @@ ${PYSITELIB}/scipy/io/tests/data/struct_scalars_replicated_3d.sav
${PYSITELIB}/scipy/io/tests/data/test-44100-le-1ch-4bytes.wav
${PYSITELIB}/scipy/io/tests/data/test-8000-le-2ch-1byteu.wav
${PYSITELIB}/scipy/io/tests/data/various_compressed.sav
+${PYSITELIB}/scipy/io/tests/test_fortran.py
${PYSITELIB}/scipy/io/tests/test_idl.py
${PYSITELIB}/scipy/io/tests/test_mmio.py
${PYSITELIB}/scipy/io/tests/test_netcdf.py
@@ -461,9 +432,21 @@ ${PYSITELIB}/scipy/io/wavfile.pyo
${PYSITELIB}/scipy/lib/__init__.py
${PYSITELIB}/scipy/lib/__init__.pyc
${PYSITELIB}/scipy/lib/__init__.pyo
+${PYSITELIB}/scipy/lib/_gcutils.py
+${PYSITELIB}/scipy/lib/_gcutils.pyc
+${PYSITELIB}/scipy/lib/_gcutils.pyo
+${PYSITELIB}/scipy/lib/_numpy_compat.py
+${PYSITELIB}/scipy/lib/_numpy_compat.pyc
+${PYSITELIB}/scipy/lib/_numpy_compat.pyo
+${PYSITELIB}/scipy/lib/_tmpdirs.py
+${PYSITELIB}/scipy/lib/_tmpdirs.pyc
+${PYSITELIB}/scipy/lib/_tmpdirs.pyo
${PYSITELIB}/scipy/lib/_util.py
${PYSITELIB}/scipy/lib/_util.pyc
${PYSITELIB}/scipy/lib/_util.pyo
+${PYSITELIB}/scipy/lib/_version.py
+${PYSITELIB}/scipy/lib/_version.pyc
+${PYSITELIB}/scipy/lib/_version.pyo
${PYSITELIB}/scipy/lib/blas/__init__.py
${PYSITELIB}/scipy/lib/blas/__init__.pyc
${PYSITELIB}/scipy/lib/blas/__init__.pyo
@@ -475,9 +458,6 @@ ${PYSITELIB}/scipy/lib/blas/scons_support.pyo
${PYSITELIB}/scipy/lib/blas/setup.py
${PYSITELIB}/scipy/lib/blas/setup.pyc
${PYSITELIB}/scipy/lib/blas/setup.pyo
-${PYSITELIB}/scipy/lib/blas/setupscons.py
-${PYSITELIB}/scipy/lib/blas/setupscons.pyc
-${PYSITELIB}/scipy/lib/blas/setupscons.pyo
${PYSITELIB}/scipy/lib/blas/tests/test_blas.py
${PYSITELIB}/scipy/lib/blas/tests/test_fblas.py
${PYSITELIB}/scipy/lib/decorator.py
@@ -495,9 +475,6 @@ ${PYSITELIB}/scipy/lib/lapack/scons_support.pyo
${PYSITELIB}/scipy/lib/lapack/setup.py
${PYSITELIB}/scipy/lib/lapack/setup.pyc
${PYSITELIB}/scipy/lib/lapack/setup.pyo
-${PYSITELIB}/scipy/lib/lapack/setupscons.py
-${PYSITELIB}/scipy/lib/lapack/setupscons.pyc
-${PYSITELIB}/scipy/lib/lapack/setupscons.pyo
${PYSITELIB}/scipy/lib/lapack/tests/common.py
${PYSITELIB}/scipy/lib/lapack/tests/test_esv.py
${PYSITELIB}/scipy/lib/lapack/tests/test_gesv.py
@@ -505,21 +482,42 @@ ${PYSITELIB}/scipy/lib/lapack/tests/test_lapack.py
${PYSITELIB}/scipy/lib/setup.py
${PYSITELIB}/scipy/lib/setup.pyc
${PYSITELIB}/scipy/lib/setup.pyo
-${PYSITELIB}/scipy/lib/setupscons.py
-${PYSITELIB}/scipy/lib/setupscons.pyc
-${PYSITELIB}/scipy/lib/setupscons.pyo
${PYSITELIB}/scipy/lib/six.py
${PYSITELIB}/scipy/lib/six.pyc
${PYSITELIB}/scipy/lib/six.pyo
+${PYSITELIB}/scipy/lib/tests/test__gcutils.py
+${PYSITELIB}/scipy/lib/tests/test__util.py
+${PYSITELIB}/scipy/lib/tests/test__version.py
+${PYSITELIB}/scipy/lib/tests/test_tmpdirs.py
${PYSITELIB}/scipy/linalg/__init__.py
${PYSITELIB}/scipy/linalg/__init__.pyc
${PYSITELIB}/scipy/linalg/__init__.pyo
+${PYSITELIB}/scipy/linalg/_calc_lwork.so
+${PYSITELIB}/scipy/linalg/_decomp_polar.py
+${PYSITELIB}/scipy/linalg/_decomp_polar.pyc
+${PYSITELIB}/scipy/linalg/_decomp_polar.pyo
${PYSITELIB}/scipy/linalg/_decomp_qz.py
${PYSITELIB}/scipy/linalg/_decomp_qz.pyc
${PYSITELIB}/scipy/linalg/_decomp_qz.pyo
+${PYSITELIB}/scipy/linalg/_expm_frechet.py
+${PYSITELIB}/scipy/linalg/_expm_frechet.pyc
+${PYSITELIB}/scipy/linalg/_expm_frechet.pyo
${PYSITELIB}/scipy/linalg/_fblas.so
${PYSITELIB}/scipy/linalg/_flapack.so
${PYSITELIB}/scipy/linalg/_flinalg.so
+${PYSITELIB}/scipy/linalg/_interpolative.so
+${PYSITELIB}/scipy/linalg/_interpolative_backend.py
+${PYSITELIB}/scipy/linalg/_interpolative_backend.pyc
+${PYSITELIB}/scipy/linalg/_interpolative_backend.pyo
+${PYSITELIB}/scipy/linalg/_matfuncs_inv_ssq.py
+${PYSITELIB}/scipy/linalg/_matfuncs_inv_ssq.pyc
+${PYSITELIB}/scipy/linalg/_matfuncs_inv_ssq.pyo
+${PYSITELIB}/scipy/linalg/_matfuncs_sqrtm.py
+${PYSITELIB}/scipy/linalg/_matfuncs_sqrtm.pyc
+${PYSITELIB}/scipy/linalg/_matfuncs_sqrtm.pyo
+${PYSITELIB}/scipy/linalg/_procrustes.py
+${PYSITELIB}/scipy/linalg/_procrustes.pyc
+${PYSITELIB}/scipy/linalg/_procrustes.pyo
${PYSITELIB}/scipy/linalg/_solvers.py
${PYSITELIB}/scipy/linalg/_solvers.pyc
${PYSITELIB}/scipy/linalg/_solvers.pyo
@@ -531,10 +529,13 @@ ${PYSITELIB}/scipy/linalg/basic.pyc
${PYSITELIB}/scipy/linalg/basic.pyo
${PYSITELIB}/scipy/linalg/benchmarks/bench_basic.py
${PYSITELIB}/scipy/linalg/benchmarks/bench_decom.py
+${PYSITELIB}/scipy/linalg/benchmarks/bench_sqrtm.py
${PYSITELIB}/scipy/linalg/blas.py
${PYSITELIB}/scipy/linalg/blas.pyc
${PYSITELIB}/scipy/linalg/blas.pyo
-${PYSITELIB}/scipy/linalg/calc_lwork.so
+${PYSITELIB}/scipy/linalg/calc_lwork.py
+${PYSITELIB}/scipy/linalg/calc_lwork.pyc
+${PYSITELIB}/scipy/linalg/calc_lwork.pyo
${PYSITELIB}/scipy/linalg/cblas.py
${PYSITELIB}/scipy/linalg/cblas.pyc
${PYSITELIB}/scipy/linalg/cblas.pyo
@@ -568,6 +569,9 @@ ${PYSITELIB}/scipy/linalg/flapack.pyo
${PYSITELIB}/scipy/linalg/flinalg.py
${PYSITELIB}/scipy/linalg/flinalg.pyc
${PYSITELIB}/scipy/linalg/flinalg.pyo
+${PYSITELIB}/scipy/linalg/interpolative.py
+${PYSITELIB}/scipy/linalg/interpolative.pyc
+${PYSITELIB}/scipy/linalg/interpolative.pyo
${PYSITELIB}/scipy/linalg/lapack.py
${PYSITELIB}/scipy/linalg/lapack.pyc
${PYSITELIB}/scipy/linalg/lapack.pyo
@@ -583,9 +587,6 @@ ${PYSITELIB}/scipy/linalg/misc.pyo
${PYSITELIB}/scipy/linalg/setup.py
${PYSITELIB}/scipy/linalg/setup.pyc
${PYSITELIB}/scipy/linalg/setup.pyo
-${PYSITELIB}/scipy/linalg/setupscons.py
-${PYSITELIB}/scipy/linalg/setupscons.pyc
-${PYSITELIB}/scipy/linalg/setupscons.pyo
${PYSITELIB}/scipy/linalg/special_matrices.py
${PYSITELIB}/scipy/linalg/special_matrices.pyc
${PYSITELIB}/scipy/linalg/special_matrices.pyo
@@ -594,9 +595,12 @@ ${PYSITELIB}/scipy/linalg/tests/test_blas.py
${PYSITELIB}/scipy/linalg/tests/test_build.py
${PYSITELIB}/scipy/linalg/tests/test_decomp.py
${PYSITELIB}/scipy/linalg/tests/test_decomp_cholesky.py
+${PYSITELIB}/scipy/linalg/tests/test_decomp_polar.py
${PYSITELIB}/scipy/linalg/tests/test_fblas.py
+${PYSITELIB}/scipy/linalg/tests/test_interpolative.py
${PYSITELIB}/scipy/linalg/tests/test_lapack.py
${PYSITELIB}/scipy/linalg/tests/test_matfuncs.py
+${PYSITELIB}/scipy/linalg/tests/test_procrustes.py
${PYSITELIB}/scipy/linalg/tests/test_solvers.py
${PYSITELIB}/scipy/linalg/tests/test_special_matrices.py
${PYSITELIB}/scipy/misc/__init__.py
@@ -617,9 +621,6 @@ ${PYSITELIB}/scipy/misc/pilutil.pyo
${PYSITELIB}/scipy/misc/setup.py
${PYSITELIB}/scipy/misc/setup.pyc
${PYSITELIB}/scipy/misc/setup.pyo
-${PYSITELIB}/scipy/misc/setupscons.py
-${PYSITELIB}/scipy/misc/setupscons.pyc
-${PYSITELIB}/scipy/misc/setupscons.pyo
${PYSITELIB}/scipy/misc/tests/data/icon.png
${PYSITELIB}/scipy/misc/tests/data/icon_mono.png
${PYSITELIB}/scipy/misc/tests/data/icon_mono_flat.png
@@ -630,6 +631,7 @@ ${PYSITELIB}/scipy/ndimage/__init__.py
${PYSITELIB}/scipy/ndimage/__init__.pyc
${PYSITELIB}/scipy/ndimage/__init__.pyo
${PYSITELIB}/scipy/ndimage/_nd_image.so
+${PYSITELIB}/scipy/ndimage/_ni_label.so
${PYSITELIB}/scipy/ndimage/_ni_support.py
${PYSITELIB}/scipy/ndimage/_ni_support.pyc
${PYSITELIB}/scipy/ndimage/_ni_support.pyo
@@ -654,9 +656,10 @@ ${PYSITELIB}/scipy/ndimage/morphology.pyo
${PYSITELIB}/scipy/ndimage/setup.py
${PYSITELIB}/scipy/ndimage/setup.pyc
${PYSITELIB}/scipy/ndimage/setup.pyo
-${PYSITELIB}/scipy/ndimage/setupscons.py
-${PYSITELIB}/scipy/ndimage/setupscons.pyc
-${PYSITELIB}/scipy/ndimage/setupscons.pyo
+${PYSITELIB}/scipy/ndimage/tests/data/README.txt
+${PYSITELIB}/scipy/ndimage/tests/data/label_inputs.txt
+${PYSITELIB}/scipy/ndimage/tests/data/label_results.txt
+${PYSITELIB}/scipy/ndimage/tests/data/label_strels.txt
${PYSITELIB}/scipy/ndimage/tests/dots.png
${PYSITELIB}/scipy/ndimage/tests/test_datatypes.py
${PYSITELIB}/scipy/ndimage/tests/test_filters.py
@@ -668,6 +671,9 @@ ${PYSITELIB}/scipy/odr/__init__.py
${PYSITELIB}/scipy/odr/__init__.pyc
${PYSITELIB}/scipy/odr/__init__.pyo
${PYSITELIB}/scipy/odr/__odrpack.so
+${PYSITELIB}/scipy/odr/add_newdocs.py
+${PYSITELIB}/scipy/odr/add_newdocs.pyc
+${PYSITELIB}/scipy/odr/add_newdocs.pyo
${PYSITELIB}/scipy/odr/models.py
${PYSITELIB}/scipy/odr/models.pyc
${PYSITELIB}/scipy/odr/models.pyo
@@ -677,9 +683,6 @@ ${PYSITELIB}/scipy/odr/odrpack.pyo
${PYSITELIB}/scipy/odr/setup.py
${PYSITELIB}/scipy/odr/setup.pyc
${PYSITELIB}/scipy/odr/setup.pyo
-${PYSITELIB}/scipy/odr/setupscons.py
-${PYSITELIB}/scipy/odr/setupscons.pyc
-${PYSITELIB}/scipy/odr/setupscons.pyo
${PYSITELIB}/scipy/odr/tests/test_odr.py
${PYSITELIB}/scipy/optimize/__init__.py
${PYSITELIB}/scipy/optimize/__init__.pyc
@@ -688,7 +691,13 @@ ${PYSITELIB}/scipy/optimize/_basinhopping.py
${PYSITELIB}/scipy/optimize/_basinhopping.pyc
${PYSITELIB}/scipy/optimize/_basinhopping.pyo
${PYSITELIB}/scipy/optimize/_cobyla.so
+${PYSITELIB}/scipy/optimize/_differentialevolution.py
+${PYSITELIB}/scipy/optimize/_differentialevolution.pyc
+${PYSITELIB}/scipy/optimize/_differentialevolution.pyo
${PYSITELIB}/scipy/optimize/_lbfgsb.so
+${PYSITELIB}/scipy/optimize/_linprog.py
+${PYSITELIB}/scipy/optimize/_linprog.pyc
+${PYSITELIB}/scipy/optimize/_linprog.pyo
${PYSITELIB}/scipy/optimize/_minimize.py
${PYSITELIB}/scipy/optimize/_minimize.pyc
${PYSITELIB}/scipy/optimize/_minimize.pyo
@@ -698,6 +707,15 @@ ${PYSITELIB}/scipy/optimize/_root.py
${PYSITELIB}/scipy/optimize/_root.pyc
${PYSITELIB}/scipy/optimize/_root.pyo
${PYSITELIB}/scipy/optimize/_slsqp.so
+${PYSITELIB}/scipy/optimize/_trustregion.py
+${PYSITELIB}/scipy/optimize/_trustregion.pyc
+${PYSITELIB}/scipy/optimize/_trustregion.pyo
+${PYSITELIB}/scipy/optimize/_trustregion_dogleg.py
+${PYSITELIB}/scipy/optimize/_trustregion_dogleg.pyc
+${PYSITELIB}/scipy/optimize/_trustregion_dogleg.pyo
+${PYSITELIB}/scipy/optimize/_trustregion_ncg.py
+${PYSITELIB}/scipy/optimize/_trustregion_ncg.pyc
+${PYSITELIB}/scipy/optimize/_trustregion_ncg.pyo
${PYSITELIB}/scipy/optimize/_tstutils.py
${PYSITELIB}/scipy/optimize/_tstutils.pyc
${PYSITELIB}/scipy/optimize/_tstutils.pyo
@@ -705,7 +723,10 @@ ${PYSITELIB}/scipy/optimize/_zeros.so
${PYSITELIB}/scipy/optimize/anneal.py
${PYSITELIB}/scipy/optimize/anneal.pyc
${PYSITELIB}/scipy/optimize/anneal.pyo
+${PYSITELIB}/scipy/optimize/benchmarks/bench_optimizers.py
${PYSITELIB}/scipy/optimize/benchmarks/bench_zeros.py
+${PYSITELIB}/scipy/optimize/benchmarks/benchmark_global_optimizers.py
+${PYSITELIB}/scipy/optimize/benchmarks/test_functions.py
${PYSITELIB}/scipy/optimize/cobyla.py
${PYSITELIB}/scipy/optimize/cobyla.pyc
${PYSITELIB}/scipy/optimize/cobyla.pyo
@@ -732,23 +753,24 @@ ${PYSITELIB}/scipy/optimize/optimize.pyo
${PYSITELIB}/scipy/optimize/setup.py
${PYSITELIB}/scipy/optimize/setup.pyc
${PYSITELIB}/scipy/optimize/setup.pyo
-${PYSITELIB}/scipy/optimize/setupscons.py
-${PYSITELIB}/scipy/optimize/setupscons.pyc
-${PYSITELIB}/scipy/optimize/setupscons.pyo
${PYSITELIB}/scipy/optimize/slsqp.py
${PYSITELIB}/scipy/optimize/slsqp.pyc
${PYSITELIB}/scipy/optimize/slsqp.pyo
${PYSITELIB}/scipy/optimize/tests/test__basinhopping.py
+${PYSITELIB}/scipy/optimize/tests/test__differential_evolution.py
${PYSITELIB}/scipy/optimize/tests/test__root.py
${PYSITELIB}/scipy/optimize/tests/test_anneal.py
${PYSITELIB}/scipy/optimize/tests/test_cobyla.py
${PYSITELIB}/scipy/optimize/tests/test_linesearch.py
+${PYSITELIB}/scipy/optimize/tests/test_linprog.py
${PYSITELIB}/scipy/optimize/tests/test_minpack.py
${PYSITELIB}/scipy/optimize/tests/test_nnls.py
${PYSITELIB}/scipy/optimize/tests/test_nonlin.py
${PYSITELIB}/scipy/optimize/tests/test_optimize.py
${PYSITELIB}/scipy/optimize/tests/test_regression.py
${PYSITELIB}/scipy/optimize/tests/test_slsqp.py
+${PYSITELIB}/scipy/optimize/tests/test_tnc.py
+${PYSITELIB}/scipy/optimize/tests/test_trustregion.py
${PYSITELIB}/scipy/optimize/tests/test_zeros.py
${PYSITELIB}/scipy/optimize/tnc.py
${PYSITELIB}/scipy/optimize/tnc.pyc
@@ -759,19 +781,21 @@ ${PYSITELIB}/scipy/optimize/zeros.pyo
${PYSITELIB}/scipy/setup.py
${PYSITELIB}/scipy/setup.pyc
${PYSITELIB}/scipy/setup.pyo
-${PYSITELIB}/scipy/setupscons.py
-${PYSITELIB}/scipy/setupscons.pyc
-${PYSITELIB}/scipy/setupscons.pyo
${PYSITELIB}/scipy/signal/__init__.py
${PYSITELIB}/scipy/signal/__init__.pyc
${PYSITELIB}/scipy/signal/__init__.pyo
${PYSITELIB}/scipy/signal/_arraytools.py
${PYSITELIB}/scipy/signal/_arraytools.pyc
${PYSITELIB}/scipy/signal/_arraytools.pyo
+${PYSITELIB}/scipy/signal/_max_len_seq.so
${PYSITELIB}/scipy/signal/_peak_finding.py
${PYSITELIB}/scipy/signal/_peak_finding.pyc
${PYSITELIB}/scipy/signal/_peak_finding.pyo
+${PYSITELIB}/scipy/signal/_savitzky_golay.py
+${PYSITELIB}/scipy/signal/_savitzky_golay.pyc
+${PYSITELIB}/scipy/signal/_savitzky_golay.pyo
${PYSITELIB}/scipy/signal/_spectral.so
+${PYSITELIB}/scipy/signal/benchmarks/bench_convolve2d.py
${PYSITELIB}/scipy/signal/bsplines.py
${PYSITELIB}/scipy/signal/bsplines.pyc
${PYSITELIB}/scipy/signal/bsplines.pyo
@@ -793,9 +817,6 @@ ${PYSITELIB}/scipy/signal/ltisys.pyo
${PYSITELIB}/scipy/signal/setup.py
${PYSITELIB}/scipy/signal/setup.pyc
${PYSITELIB}/scipy/signal/setup.pyo
-${PYSITELIB}/scipy/signal/setupscons.py
-${PYSITELIB}/scipy/signal/setupscons.pyc
-${PYSITELIB}/scipy/signal/setupscons.pyo
${PYSITELIB}/scipy/signal/signaltools.py
${PYSITELIB}/scipy/signal/signaltools.pyc
${PYSITELIB}/scipy/signal/signaltools.pyo
@@ -810,7 +831,9 @@ ${PYSITELIB}/scipy/signal/tests/test_dltisys.py
${PYSITELIB}/scipy/signal/tests/test_filter_design.py
${PYSITELIB}/scipy/signal/tests/test_fir_filter_design.py
${PYSITELIB}/scipy/signal/tests/test_ltisys.py
+${PYSITELIB}/scipy/signal/tests/test_max_len_seq.py
${PYSITELIB}/scipy/signal/tests/test_peak_finding.py
+${PYSITELIB}/scipy/signal/tests/test_savitzky_golay.py
${PYSITELIB}/scipy/signal/tests/test_signaltools.py
${PYSITELIB}/scipy/signal/tests/test_spectral.py
${PYSITELIB}/scipy/signal/tests/test_waveforms.py
@@ -828,6 +851,8 @@ ${PYSITELIB}/scipy/signal/windows.pyo
${PYSITELIB}/scipy/sparse/__init__.py
${PYSITELIB}/scipy/sparse/__init__.pyc
${PYSITELIB}/scipy/sparse/__init__.pyo
+${PYSITELIB}/scipy/sparse/_csparsetools.so
+${PYSITELIB}/scipy/sparse/_sparsetools.so
${PYSITELIB}/scipy/sparse/base.py
${PYSITELIB}/scipy/sparse/base.pyc
${PYSITELIB}/scipy/sparse/base.pyo
@@ -857,6 +882,7 @@ ${PYSITELIB}/scipy/sparse/csgraph/_laplacian.py
${PYSITELIB}/scipy/sparse/csgraph/_laplacian.pyc
${PYSITELIB}/scipy/sparse/csgraph/_laplacian.pyo
${PYSITELIB}/scipy/sparse/csgraph/_min_spanning_tree.so
+${PYSITELIB}/scipy/sparse/csgraph/_reordering.so
${PYSITELIB}/scipy/sparse/csgraph/_shortest_path.so
${PYSITELIB}/scipy/sparse/csgraph/_tools.so
${PYSITELIB}/scipy/sparse/csgraph/_traversal.so
@@ -866,13 +892,11 @@ ${PYSITELIB}/scipy/sparse/csgraph/_validation.pyo
${PYSITELIB}/scipy/sparse/csgraph/setup.py
${PYSITELIB}/scipy/sparse/csgraph/setup.pyc
${PYSITELIB}/scipy/sparse/csgraph/setup.pyo
-${PYSITELIB}/scipy/sparse/csgraph/setupscons.py
-${PYSITELIB}/scipy/sparse/csgraph/setupscons.pyc
-${PYSITELIB}/scipy/sparse/csgraph/setupscons.pyo
${PYSITELIB}/scipy/sparse/csgraph/tests/test_connected_components.py
${PYSITELIB}/scipy/sparse/csgraph/tests/test_conversions.py
${PYSITELIB}/scipy/sparse/csgraph/tests/test_graph_components.py
${PYSITELIB}/scipy/sparse/csgraph/tests/test_graph_laplacian.py
+${PYSITELIB}/scipy/sparse/csgraph/tests/test_reordering.py
${PYSITELIB}/scipy/sparse/csgraph/tests/test_shortest_path.py
${PYSITELIB}/scipy/sparse/csgraph/tests/test_spanning_tree.py
${PYSITELIB}/scipy/sparse/csgraph/tests/test_traversal.py
@@ -891,15 +915,30 @@ ${PYSITELIB}/scipy/sparse/dok.pyo
${PYSITELIB}/scipy/sparse/extract.py
${PYSITELIB}/scipy/sparse/extract.pyc
${PYSITELIB}/scipy/sparse/extract.pyo
+${PYSITELIB}/scipy/sparse/generate_sparsetools.py
+${PYSITELIB}/scipy/sparse/generate_sparsetools.pyc
+${PYSITELIB}/scipy/sparse/generate_sparsetools.pyo
${PYSITELIB}/scipy/sparse/lil.py
${PYSITELIB}/scipy/sparse/lil.pyc
${PYSITELIB}/scipy/sparse/lil.pyo
${PYSITELIB}/scipy/sparse/linalg/__init__.py
${PYSITELIB}/scipy/sparse/linalg/__init__.pyc
${PYSITELIB}/scipy/sparse/linalg/__init__.pyo
+${PYSITELIB}/scipy/sparse/linalg/_expm_multiply.py
+${PYSITELIB}/scipy/sparse/linalg/_expm_multiply.pyc
+${PYSITELIB}/scipy/sparse/linalg/_expm_multiply.pyo
+${PYSITELIB}/scipy/sparse/linalg/_onenormest.py
+${PYSITELIB}/scipy/sparse/linalg/_onenormest.pyc
+${PYSITELIB}/scipy/sparse/linalg/_onenormest.pyo
+${PYSITELIB}/scipy/sparse/linalg/benchmarks/bench_expm.py
+${PYSITELIB}/scipy/sparse/linalg/benchmarks/bench_expm_multiply.py
+${PYSITELIB}/scipy/sparse/linalg/benchmarks/bench_onenormest.py
${PYSITELIB}/scipy/sparse/linalg/dsolve/__init__.py
${PYSITELIB}/scipy/sparse/linalg/dsolve/__init__.pyc
${PYSITELIB}/scipy/sparse/linalg/dsolve/__init__.pyo
+${PYSITELIB}/scipy/sparse/linalg/dsolve/_add_newdocs.py
+${PYSITELIB}/scipy/sparse/linalg/dsolve/_add_newdocs.pyc
+${PYSITELIB}/scipy/sparse/linalg/dsolve/_add_newdocs.pyo
${PYSITELIB}/scipy/sparse/linalg/dsolve/_superlu.so
${PYSITELIB}/scipy/sparse/linalg/dsolve/linsolve.py
${PYSITELIB}/scipy/sparse/linalg/dsolve/linsolve.pyc
@@ -907,24 +946,7 @@ ${PYSITELIB}/scipy/sparse/linalg/dsolve/linsolve.pyo
${PYSITELIB}/scipy/sparse/linalg/dsolve/setup.py
${PYSITELIB}/scipy/sparse/linalg/dsolve/setup.pyc
${PYSITELIB}/scipy/sparse/linalg/dsolve/setup.pyo
-${PYSITELIB}/scipy/sparse/linalg/dsolve/setupscons.py
-${PYSITELIB}/scipy/sparse/linalg/dsolve/setupscons.pyc
-${PYSITELIB}/scipy/sparse/linalg/dsolve/setupscons.pyo
${PYSITELIB}/scipy/sparse/linalg/dsolve/tests/test_linsolve.py
-${PYSITELIB}/scipy/sparse/linalg/dsolve/umfpack/__init__.py
-${PYSITELIB}/scipy/sparse/linalg/dsolve/umfpack/__init__.pyc
-${PYSITELIB}/scipy/sparse/linalg/dsolve/umfpack/__init__.pyo
-${PYSITELIB}/scipy/sparse/linalg/dsolve/umfpack/setup.py
-${PYSITELIB}/scipy/sparse/linalg/dsolve/umfpack/setup.pyc
-${PYSITELIB}/scipy/sparse/linalg/dsolve/umfpack/setup.pyo
-${PYSITELIB}/scipy/sparse/linalg/dsolve/umfpack/setupscons.py
-${PYSITELIB}/scipy/sparse/linalg/dsolve/umfpack/setupscons.pyc
-${PYSITELIB}/scipy/sparse/linalg/dsolve/umfpack/setupscons.pyo
-${PYSITELIB}/scipy/sparse/linalg/dsolve/umfpack/tests/test_umfpack.py
-${PYSITELIB}/scipy/sparse/linalg/dsolve/umfpack/tests/try_umfpack.py
-${PYSITELIB}/scipy/sparse/linalg/dsolve/umfpack/umfpack.py
-${PYSITELIB}/scipy/sparse/linalg/dsolve/umfpack/umfpack.pyc
-${PYSITELIB}/scipy/sparse/linalg/dsolve/umfpack/umfpack.pyo
${PYSITELIB}/scipy/sparse/linalg/eigen/__init__.py
${PYSITELIB}/scipy/sparse/linalg/eigen/__init__.pyc
${PYSITELIB}/scipy/sparse/linalg/eigen/__init__.pyo
@@ -938,31 +960,21 @@ ${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/arpack.pyo
${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/setup.py
${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/setup.pyc
${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/setup.pyo
-${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/setupscons.py
-${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/setupscons.pyc
-${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/setupscons.pyo
${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/tests/test_arpack.py
${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/__init__.py
${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/__init__.pyc
${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/__init__.pyo
+${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/benchmarks/bench_lobpcg.py
${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/lobpcg.py
${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/lobpcg.pyc
${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/lobpcg.pyo
${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/setup.py
${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/setup.pyc
${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/setup.pyo
-${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/setupscons.py
-${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/setupscons.pyc
-${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/setupscons.pyo
-${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/tests/benchmark.py
-${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/tests/large_scale.py
${PYSITELIB}/scipy/sparse/linalg/eigen/lobpcg/tests/test_lobpcg.py
${PYSITELIB}/scipy/sparse/linalg/eigen/setup.py
${PYSITELIB}/scipy/sparse/linalg/eigen/setup.pyc
${PYSITELIB}/scipy/sparse/linalg/eigen/setup.pyo
-${PYSITELIB}/scipy/sparse/linalg/eigen/setupscons.py
-${PYSITELIB}/scipy/sparse/linalg/eigen/setupscons.pyc
-${PYSITELIB}/scipy/sparse/linalg/eigen/setupscons.pyo
${PYSITELIB}/scipy/sparse/linalg/interface.py
${PYSITELIB}/scipy/sparse/linalg/interface.pyc
${PYSITELIB}/scipy/sparse/linalg/interface.pyo
@@ -988,9 +1000,6 @@ ${PYSITELIB}/scipy/sparse/linalg/isolve/minres.pyo
${PYSITELIB}/scipy/sparse/linalg/isolve/setup.py
${PYSITELIB}/scipy/sparse/linalg/isolve/setup.pyc
${PYSITELIB}/scipy/sparse/linalg/isolve/setup.pyo
-${PYSITELIB}/scipy/sparse/linalg/isolve/setupscons.py
-${PYSITELIB}/scipy/sparse/linalg/isolve/setupscons.pyc
-${PYSITELIB}/scipy/sparse/linalg/isolve/setupscons.pyo
${PYSITELIB}/scipy/sparse/linalg/isolve/tests/demo_lgmres.py
${PYSITELIB}/scipy/sparse/linalg/isolve/tests/test_iterative.py
${PYSITELIB}/scipy/sparse/linalg/isolve/tests/test_lgmres.py
@@ -1006,50 +1015,16 @@ ${PYSITELIB}/scipy/sparse/linalg/matfuncs.pyo
${PYSITELIB}/scipy/sparse/linalg/setup.py
${PYSITELIB}/scipy/sparse/linalg/setup.pyc
${PYSITELIB}/scipy/sparse/linalg/setup.pyo
-${PYSITELIB}/scipy/sparse/linalg/setupscons.py
-${PYSITELIB}/scipy/sparse/linalg/setupscons.pyc
-${PYSITELIB}/scipy/sparse/linalg/setupscons.pyo
+${PYSITELIB}/scipy/sparse/linalg/tests/test_expm_multiply.py
${PYSITELIB}/scipy/sparse/linalg/tests/test_interface.py
${PYSITELIB}/scipy/sparse/linalg/tests/test_matfuncs.py
+${PYSITELIB}/scipy/sparse/linalg/tests/test_onenormest.py
${PYSITELIB}/scipy/sparse/setup.py
${PYSITELIB}/scipy/sparse/setup.pyc
${PYSITELIB}/scipy/sparse/setup.pyo
-${PYSITELIB}/scipy/sparse/setupscons.py
-${PYSITELIB}/scipy/sparse/setupscons.pyc
-${PYSITELIB}/scipy/sparse/setupscons.pyo
-${PYSITELIB}/scipy/sparse/sparsetools/__init__.py
-${PYSITELIB}/scipy/sparse/sparsetools/__init__.pyc
-${PYSITELIB}/scipy/sparse/sparsetools/__init__.pyo
-${PYSITELIB}/scipy/sparse/sparsetools/_bsr.so
-${PYSITELIB}/scipy/sparse/sparsetools/_coo.so
-${PYSITELIB}/scipy/sparse/sparsetools/_csc.so
-${PYSITELIB}/scipy/sparse/sparsetools/_csgraph.so
-${PYSITELIB}/scipy/sparse/sparsetools/_csr.so
-${PYSITELIB}/scipy/sparse/sparsetools/_dia.so
-${PYSITELIB}/scipy/sparse/sparsetools/bsr.py
-${PYSITELIB}/scipy/sparse/sparsetools/bsr.pyc
-${PYSITELIB}/scipy/sparse/sparsetools/bsr.pyo
-${PYSITELIB}/scipy/sparse/sparsetools/coo.py
-${PYSITELIB}/scipy/sparse/sparsetools/coo.pyc
-${PYSITELIB}/scipy/sparse/sparsetools/coo.pyo
-${PYSITELIB}/scipy/sparse/sparsetools/csc.py
-${PYSITELIB}/scipy/sparse/sparsetools/csc.pyc
-${PYSITELIB}/scipy/sparse/sparsetools/csc.pyo
-${PYSITELIB}/scipy/sparse/sparsetools/csgraph.py
-${PYSITELIB}/scipy/sparse/sparsetools/csgraph.pyc
-${PYSITELIB}/scipy/sparse/sparsetools/csgraph.pyo
-${PYSITELIB}/scipy/sparse/sparsetools/csr.py
-${PYSITELIB}/scipy/sparse/sparsetools/csr.pyc
-${PYSITELIB}/scipy/sparse/sparsetools/csr.pyo
-${PYSITELIB}/scipy/sparse/sparsetools/dia.py
-${PYSITELIB}/scipy/sparse/sparsetools/dia.pyc
-${PYSITELIB}/scipy/sparse/sparsetools/dia.pyo
-${PYSITELIB}/scipy/sparse/sparsetools/setup.py
-${PYSITELIB}/scipy/sparse/sparsetools/setup.pyc
-${PYSITELIB}/scipy/sparse/sparsetools/setup.pyo
-${PYSITELIB}/scipy/sparse/sparsetools/setupscons.py
-${PYSITELIB}/scipy/sparse/sparsetools/setupscons.pyc
-${PYSITELIB}/scipy/sparse/sparsetools/setupscons.pyo
+${PYSITELIB}/scipy/sparse/sparsetools.py
+${PYSITELIB}/scipy/sparse/sparsetools.pyc
+${PYSITELIB}/scipy/sparse/sparsetools.pyo
${PYSITELIB}/scipy/sparse/spfuncs.py
${PYSITELIB}/scipy/sparse/spfuncs.pyc
${PYSITELIB}/scipy/sparse/spfuncs.pyo
@@ -1061,6 +1036,7 @@ ${PYSITELIB}/scipy/sparse/tests/test_construct.py
${PYSITELIB}/scipy/sparse/tests/test_csc.py
${PYSITELIB}/scipy/sparse/tests/test_csr.py
${PYSITELIB}/scipy/sparse/tests/test_extract.py
+${PYSITELIB}/scipy/sparse/tests/test_sparsetools.py
${PYSITELIB}/scipy/sparse/tests/test_spfuncs.py
${PYSITELIB}/scipy/sparse/tests/test_sputils.py
${PYSITELIB}/scipy/spatial/__init__.py
@@ -1082,9 +1058,6 @@ ${PYSITELIB}/scipy/spatial/qhull.so
${PYSITELIB}/scipy/spatial/setup.py
${PYSITELIB}/scipy/spatial/setup.pyc
${PYSITELIB}/scipy/spatial/setup.pyo
-${PYSITELIB}/scipy/spatial/setupscons.py
-${PYSITELIB}/scipy/spatial/setupscons.pyc
-${PYSITELIB}/scipy/spatial/setupscons.pyo
${PYSITELIB}/scipy/spatial/tests/data/cdist-X1.txt
${PYSITELIB}/scipy/spatial/tests/data/cdist-X2.txt
${PYSITELIB}/scipy/spatial/tests/data/degenerate_pointset.npz
@@ -1117,6 +1090,10 @@ ${PYSITELIB}/scipy/spatial/tests/test_qhull.py
${PYSITELIB}/scipy/special/__init__.py
${PYSITELIB}/scipy/special/__init__.pyc
${PYSITELIB}/scipy/special/__init__.pyo
+${PYSITELIB}/scipy/special/_ellip_harm.py
+${PYSITELIB}/scipy/special/_ellip_harm.pyc
+${PYSITELIB}/scipy/special/_ellip_harm.pyo
+${PYSITELIB}/scipy/special/_ellip_harm_2.so
${PYSITELIB}/scipy/special/_testutils.py
${PYSITELIB}/scipy/special/_testutils.pyc
${PYSITELIB}/scipy/special/_testutils.pyo
@@ -1140,9 +1117,6 @@ ${PYSITELIB}/scipy/special/orthogonal.pyo
${PYSITELIB}/scipy/special/setup.py
${PYSITELIB}/scipy/special/setup.pyc
${PYSITELIB}/scipy/special/setup.pyo
-${PYSITELIB}/scipy/special/setupscons.py
-${PYSITELIB}/scipy/special/setupscons.pyc
-${PYSITELIB}/scipy/special/setupscons.pyo
${PYSITELIB}/scipy/special/specfun.so
${PYSITELIB}/scipy/special/spfun_stats.py
${PYSITELIB}/scipy/special/spfun_stats.pyc
@@ -1150,8 +1124,11 @@ ${PYSITELIB}/scipy/special/spfun_stats.pyo
${PYSITELIB}/scipy/special/tests/data/README
${PYSITELIB}/scipy/special/tests/data/boost.npz
${PYSITELIB}/scipy/special/tests/data/gsl.npz
+${PYSITELIB}/scipy/special/tests/data/local.npz
${PYSITELIB}/scipy/special/tests/test_basic.py
+${PYSITELIB}/scipy/special/tests/test_boxcox.py
${PYSITELIB}/scipy/special/tests/test_data.py
+${PYSITELIB}/scipy/special/tests/test_ellip_harm.py
${PYSITELIB}/scipy/special/tests/test_lambertw.py
${PYSITELIB}/scipy/special/tests/test_logit.py
${PYSITELIB}/scipy/special/tests/test_mpmath.py
@@ -1164,10 +1141,25 @@ ${PYSITELIB}/scipy/stats/__init__.pyo
${PYSITELIB}/scipy/stats/_binned_statistic.py
${PYSITELIB}/scipy/stats/_binned_statistic.pyc
${PYSITELIB}/scipy/stats/_binned_statistic.pyo
+${PYSITELIB}/scipy/stats/_constants.py
+${PYSITELIB}/scipy/stats/_constants.pyc
+${PYSITELIB}/scipy/stats/_constants.pyo
+${PYSITELIB}/scipy/stats/_continuous_distns.py
+${PYSITELIB}/scipy/stats/_continuous_distns.pyc
+${PYSITELIB}/scipy/stats/_continuous_distns.pyo
+${PYSITELIB}/scipy/stats/_discrete_distns.py
+${PYSITELIB}/scipy/stats/_discrete_distns.pyc
+${PYSITELIB}/scipy/stats/_discrete_distns.pyo
+${PYSITELIB}/scipy/stats/_distn_infrastructure.py
+${PYSITELIB}/scipy/stats/_distn_infrastructure.pyc
+${PYSITELIB}/scipy/stats/_distn_infrastructure.pyo
+${PYSITELIB}/scipy/stats/_distr_params.py
+${PYSITELIB}/scipy/stats/_distr_params.pyc
+${PYSITELIB}/scipy/stats/_distr_params.pyo
+${PYSITELIB}/scipy/stats/_multivariate.py
+${PYSITELIB}/scipy/stats/_multivariate.pyc
+${PYSITELIB}/scipy/stats/_multivariate.pyo
${PYSITELIB}/scipy/stats/_rank.so
-${PYSITELIB}/scipy/stats/_support.py
-${PYSITELIB}/scipy/stats/_support.pyc
-${PYSITELIB}/scipy/stats/_support.pyo
${PYSITELIB}/scipy/stats/_tukeylambda_stats.py
${PYSITELIB}/scipy/stats/_tukeylambda_stats.pyc
${PYSITELIB}/scipy/stats/_tukeylambda_stats.pyo
@@ -1200,17 +1192,14 @@ ${PYSITELIB}/scipy/stats/rv.pyo
${PYSITELIB}/scipy/stats/setup.py
${PYSITELIB}/scipy/stats/setup.pyc
${PYSITELIB}/scipy/stats/setup.pyo
-${PYSITELIB}/scipy/stats/setupscons.py
-${PYSITELIB}/scipy/stats/setupscons.pyc
-${PYSITELIB}/scipy/stats/setupscons.pyo
${PYSITELIB}/scipy/stats/statlib.so
${PYSITELIB}/scipy/stats/stats.py
${PYSITELIB}/scipy/stats/stats.pyc
${PYSITELIB}/scipy/stats/stats.pyo
+${PYSITELIB}/scipy/stats/tests/common_tests.py
${PYSITELIB}/scipy/stats/tests/test_binned_statistic.py
${PYSITELIB}/scipy/stats/tests/test_contingency.py
${PYSITELIB}/scipy/stats/tests/test_continuous_basic.py
-${PYSITELIB}/scipy/stats/tests/test_continuous_extra.py
${PYSITELIB}/scipy/stats/tests/test_discrete_basic.py
${PYSITELIB}/scipy/stats/tests/test_distributions.py
${PYSITELIB}/scipy/stats/tests/test_fit.py
@@ -1218,6 +1207,7 @@ ${PYSITELIB}/scipy/stats/tests/test_kdeoth.py
${PYSITELIB}/scipy/stats/tests/test_morestats.py
${PYSITELIB}/scipy/stats/tests/test_mstats_basic.py
${PYSITELIB}/scipy/stats/tests/test_mstats_extras.py
+${PYSITELIB}/scipy/stats/tests/test_multivariate.py
${PYSITELIB}/scipy/stats/tests/test_rank.py
${PYSITELIB}/scipy/stats/tests/test_stats.py
${PYSITELIB}/scipy/stats/tests/test_tukeylambda_stats.py
@@ -1488,9 +1478,6 @@ ${PYSITELIB}/scipy/weave/ext_tools.pyo
${PYSITELIB}/scipy/weave/inline_tools.py
${PYSITELIB}/scipy/weave/inline_tools.pyc
${PYSITELIB}/scipy/weave/inline_tools.pyo
-${PYSITELIB}/scipy/weave/md5_load.py
-${PYSITELIB}/scipy/weave/md5_load.pyc
-${PYSITELIB}/scipy/weave/md5_load.pyo
${PYSITELIB}/scipy/weave/numpy_scalar_spec.py
${PYSITELIB}/scipy/weave/numpy_scalar_spec.pyc
${PYSITELIB}/scipy/weave/numpy_scalar_spec.pyo
@@ -1511,9 +1498,6 @@ ${PYSITELIB}/scipy/weave/scxx/weave_imp.cpp
${PYSITELIB}/scipy/weave/setup.py
${PYSITELIB}/scipy/weave/setup.pyc
${PYSITELIB}/scipy/weave/setup.pyo
-${PYSITELIB}/scipy/weave/setupscons.py
-${PYSITELIB}/scipy/weave/setupscons.pyc
-${PYSITELIB}/scipy/weave/setupscons.pyo
${PYSITELIB}/scipy/weave/size_check.py
${PYSITELIB}/scipy/weave/size_check.pyc
${PYSITELIB}/scipy/weave/size_check.pyo
diff --git a/math/py-scipy/distinfo b/math/py-scipy/distinfo
index a585bf4f25b..a01fb12108d 100644
--- a/math/py-scipy/distinfo
+++ b/math/py-scipy/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2013/10/16 19:35:40 markd Exp $
+$NetBSD: distinfo,v 1.6 2015/04/17 00:49:50 wen Exp $
-SHA1 (scipy-0.12.1.tar.gz) = 72fc43def904105fd93b21283bdaa559c726154d
-RMD160 (scipy-0.12.1.tar.gz) = 0b3da558946b66c1f2cfcccd8f2caf795365f3c8
-Size (scipy-0.12.1.tar.gz) = 9012911 bytes
+SHA1 (scipy-0.15.1.tar.gz) = 7ef714ffe95230cd2ce78c51af18983bbe762f2e
+RMD160 (scipy-0.15.1.tar.gz) = 8c7a6468c0f796e0770d920d17829ea4e2cb89a9
+Size (scipy-0.15.1.tar.gz) = 11401878 bytes