summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
Diffstat (limited to 'math')
-rw-r--r--math/py-scipy/Makefile11
-rw-r--r--math/py-scipy/PLIST270
-rw-r--r--math/py-scipy/distinfo10
3 files changed, 177 insertions, 114 deletions
diff --git a/math/py-scipy/Makefile b/math/py-scipy/Makefile
index e61e6c83f0a..6e41c6d781c 100644
--- a/math/py-scipy/Makefile
+++ b/math/py-scipy/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2016/03/18 12:54:57 wiedi Exp $
+# $NetBSD: Makefile,v 1.20 2016/04/23 22:51:57 markd Exp $
-DISTNAME= scipy-0.15.1
-PKGNAME= ${PYPKGPREFIX}-scipy-0.15.1
+DISTNAME= scipy-0.17.0
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= math python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scipy/}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=scipy/}
+GITHUB_PROJECT= scipy
+GITHUB_TAG= v${PKGVERSION_NOREV}
MAINTAINER= markd@NetBSD.org
HOMEPAGE= http://www.scipy.org/
@@ -103,6 +105,7 @@ fix-darwin-install-name:
.include "../../lang/python/application.mk"
.include "../../lang/python/distutils.mk"
+.include "../../devel/py-cython/buildlink3.mk"
.include "../../math/fftw/buildlink3.mk"
.include "../../math/py-numpy/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/py-scipy/PLIST b/math/py-scipy/PLIST
index 250dc36eb0b..f1eb6b54c78 100644
--- a/math/py-scipy/PLIST
+++ b/math/py-scipy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2015/04/25 13:43:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2016/04/23 22:51:57 markd Exp $
${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/scipy/BENTO_BUILD.txt
${PYSITELIB}/scipy/HACKING.rst.txt
@@ -17,6 +17,40 @@ ${PYSITELIB}/scipy/_build_utils/__init__.pyo
${PYSITELIB}/scipy/_build_utils/_fortran.py
${PYSITELIB}/scipy/_build_utils/_fortran.pyc
${PYSITELIB}/scipy/_build_utils/_fortran.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/_testutils.py
+${PYSITELIB}/scipy/_lib/_testutils.pyc
+${PYSITELIB}/scipy/_lib/_testutils.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/decorator.py
+${PYSITELIB}/scipy/_lib/decorator.pyc
+${PYSITELIB}/scipy/_lib/decorator.pyo
+${PYSITELIB}/scipy/_lib/setup.py
+${PYSITELIB}/scipy/_lib/setup.pyc
+${PYSITELIB}/scipy/_lib/setup.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/cluster/__init__.py
${PYSITELIB}/scipy/cluster/__init__.pyc
${PYSITELIB}/scipy/cluster/__init__.pyo
@@ -28,11 +62,9 @@ ${PYSITELIB}/scipy/cluster/hierarchy.pyo
${PYSITELIB}/scipy/cluster/setup.py
${PYSITELIB}/scipy/cluster/setup.pyc
${PYSITELIB}/scipy/cluster/setup.pyo
-${PYSITELIB}/scipy/cluster/tests/data.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
${PYSITELIB}/scipy/cluster/vq.py
${PYSITELIB}/scipy/cluster/vq.pyc
${PYSITELIB}/scipy/cluster/vq.pyo
@@ -57,8 +89,6 @@ ${PYSITELIB}/scipy/fftpack/_fftpack.so
${PYSITELIB}/scipy/fftpack/basic.py
${PYSITELIB}/scipy/fftpack/basic.pyc
${PYSITELIB}/scipy/fftpack/basic.pyo
-${PYSITELIB}/scipy/fftpack/benchmarks/bench_basic.py
-${PYSITELIB}/scipy/fftpack/benchmarks/bench_pseudo_diffs.py
${PYSITELIB}/scipy/fftpack/convolve.so
${PYSITELIB}/scipy/fftpack/fftpack_version.py
${PYSITELIB}/scipy/fftpack/fftpack_version.pyc
@@ -85,6 +115,7 @@ ${PYSITELIB}/scipy/fftpack/tests/gendata.py
${PYSITELIB}/scipy/fftpack/tests/test.npz
${PYSITELIB}/scipy/fftpack/tests/test_basic.py
${PYSITELIB}/scipy/fftpack/tests/test_helper.py
+${PYSITELIB}/scipy/fftpack/tests/test_import.py
${PYSITELIB}/scipy/fftpack/tests/test_pseudo_diffs.py
${PYSITELIB}/scipy/fftpack/tests/test_real_transforms.py
${PYSITELIB}/scipy/integrate/__init__.py
@@ -97,6 +128,7 @@ ${PYSITELIB}/scipy/integrate/_ode.pyo
${PYSITELIB}/scipy/integrate/_odepack.so
${PYSITELIB}/scipy/integrate/_quadpack.so
${PYSITELIB}/scipy/integrate/_test_multivariate.so
+${PYSITELIB}/scipy/integrate/_test_odeint_banded.so
${PYSITELIB}/scipy/integrate/lsoda.so
${PYSITELIB}/scipy/integrate/odepack.py
${PYSITELIB}/scipy/integrate/odepack.pyc
@@ -111,8 +143,10 @@ ${PYSITELIB}/scipy/integrate/setup.py
${PYSITELIB}/scipy/integrate/setup.pyc
${PYSITELIB}/scipy/integrate/setup.pyo
${PYSITELIB}/scipy/integrate/tests/_test_multivariate.c
+${PYSITELIB}/scipy/integrate/tests/banded5x5.f
${PYSITELIB}/scipy/integrate/tests/test_banded_ode_solvers.py
${PYSITELIB}/scipy/integrate/tests/test_integrate.py
+${PYSITELIB}/scipy/integrate/tests/test_odeint_jac.py
${PYSITELIB}/scipy/integrate/tests/test_quadpack.py
${PYSITELIB}/scipy/integrate/tests/test_quadrature.py
${PYSITELIB}/scipy/integrate/vode.so
@@ -158,6 +192,7 @@ ${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_gil.py
${PYSITELIB}/scipy/interpolate/tests/test_interpnd.py
${PYSITELIB}/scipy/interpolate/tests/test_interpolate.py
${PYSITELIB}/scipy/interpolate/tests/test_interpolate_wrapper.py
@@ -182,6 +217,7 @@ ${PYSITELIB}/scipy/io/arff/setup.pyc
${PYSITELIB}/scipy/io/arff/setup.pyo
${PYSITELIB}/scipy/io/arff/tests/data/iris.arff
${PYSITELIB}/scipy/io/arff/tests/data/missing.arff
+${PYSITELIB}/scipy/io/arff/tests/data/nodata.arff
${PYSITELIB}/scipy/io/arff/tests/data/test1.arff
${PYSITELIB}/scipy/io/arff/tests/data/test2.arff
${PYSITELIB}/scipy/io/arff/tests/data/test3.arff
@@ -211,8 +247,6 @@ ${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
${PYSITELIB}/scipy/io/matlab/byteordercodes.pyo
@@ -238,11 +272,17 @@ ${PYSITELIB}/scipy/io/matlab/setup.pyc
${PYSITELIB}/scipy/io/matlab/setup.pyo
${PYSITELIB}/scipy/io/matlab/streams.so
${PYSITELIB}/scipy/io/matlab/tests/afunc.m
+${PYSITELIB}/scipy/io/matlab/tests/data/bad_miuint32.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/bad_miutf8_array_name.mat
${PYSITELIB}/scipy/io/matlab/tests/data/big_endian.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/broken_utf8.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/logical_sparse.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/miuint32_for_miint32.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/miutf8_array_name.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
@@ -377,6 +417,7 @@ ${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/example_2.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
@@ -390,6 +431,7 @@ ${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/invalid_pointer.sav
${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
@@ -418,8 +460,11 @@ ${PYSITELIB}/scipy/io/tests/data/struct_pointers_replicated_3d.sav
${PYSITELIB}/scipy/io/tests/data/struct_scalars.sav
${PYSITELIB}/scipy/io/tests/data/struct_scalars_replicated.sav
${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/test-44100Hz-2ch-32bit-float-be.wav
+${PYSITELIB}/scipy/io/tests/data/test-44100Hz-2ch-32bit-float-le.wav
+${PYSITELIB}/scipy/io/tests/data/test-44100Hz-le-1ch-4bytes.wav
+${PYSITELIB}/scipy/io/tests/data/test-48000Hz-2ch-64bit-float-le-wavex.wav
+${PYSITELIB}/scipy/io/tests/data/test-8000Hz-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
@@ -429,76 +474,24 @@ ${PYSITELIB}/scipy/io/tests/test_wavfile.py
${PYSITELIB}/scipy/io/wavfile.py
${PYSITELIB}/scipy/io/wavfile.pyc
${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
-${PYSITELIB}/scipy/lib/blas/cblas.so
-${PYSITELIB}/scipy/lib/blas/fblas.so
-${PYSITELIB}/scipy/lib/blas/scons_support.py
-${PYSITELIB}/scipy/lib/blas/scons_support.pyc
-${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/tests/test_blas.py
-${PYSITELIB}/scipy/lib/blas/tests/test_fblas.py
-${PYSITELIB}/scipy/lib/decorator.py
-${PYSITELIB}/scipy/lib/decorator.pyc
-${PYSITELIB}/scipy/lib/decorator.pyo
-${PYSITELIB}/scipy/lib/lapack/__init__.py
-${PYSITELIB}/scipy/lib/lapack/__init__.pyc
-${PYSITELIB}/scipy/lib/lapack/__init__.pyo
-${PYSITELIB}/scipy/lib/lapack/calc_lwork.so
-${PYSITELIB}/scipy/lib/lapack/clapack.so
-${PYSITELIB}/scipy/lib/lapack/flapack.so
-${PYSITELIB}/scipy/lib/lapack/scons_support.py
-${PYSITELIB}/scipy/lib/lapack/scons_support.pyc
-${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/tests/common.py
-${PYSITELIB}/scipy/lib/lapack/tests/test_esv.py
-${PYSITELIB}/scipy/lib/lapack/tests/test_gesv.py
-${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/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.pxd
${PYSITELIB}/scipy/linalg/__init__.py
${PYSITELIB}/scipy/linalg/__init__.pyc
${PYSITELIB}/scipy/linalg/__init__.pyo
${PYSITELIB}/scipy/linalg/_calc_lwork.so
+${PYSITELIB}/scipy/linalg/_cython_signature_generator.py
+${PYSITELIB}/scipy/linalg/_cython_signature_generator.pyc
+${PYSITELIB}/scipy/linalg/_cython_signature_generator.pyo
+${PYSITELIB}/scipy/linalg/_cython_wrapper_generators.py
+${PYSITELIB}/scipy/linalg/_cython_wrapper_generators.pyc
+${PYSITELIB}/scipy/linalg/_cython_wrapper_generators.pyo
${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/_decomp_update.so
${PYSITELIB}/scipy/linalg/_expm_frechet.py
${PYSITELIB}/scipy/linalg/_expm_frechet.pyc
${PYSITELIB}/scipy/linalg/_expm_frechet.pyo
@@ -518,6 +511,7 @@ ${PYSITELIB}/scipy/linalg/_matfuncs_sqrtm.pyo
${PYSITELIB}/scipy/linalg/_procrustes.py
${PYSITELIB}/scipy/linalg/_procrustes.pyc
${PYSITELIB}/scipy/linalg/_procrustes.pyo
+${PYSITELIB}/scipy/linalg/_solve_toeplitz.so
${PYSITELIB}/scipy/linalg/_solvers.py
${PYSITELIB}/scipy/linalg/_solvers.pyc
${PYSITELIB}/scipy/linalg/_solvers.pyo
@@ -527,21 +521,16 @@ ${PYSITELIB}/scipy/linalg/_testutils.pyo
${PYSITELIB}/scipy/linalg/basic.py
${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.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
-${PYSITELIB}/scipy/linalg/clapack.py
-${PYSITELIB}/scipy/linalg/clapack.pyc
-${PYSITELIB}/scipy/linalg/clapack.pyo
+${PYSITELIB}/scipy/linalg/cython_blas.pxd
+${PYSITELIB}/scipy/linalg/cython_blas.so
+${PYSITELIB}/scipy/linalg/cython_lapack.pxd
+${PYSITELIB}/scipy/linalg/cython_lapack.so
${PYSITELIB}/scipy/linalg/decomp.py
${PYSITELIB}/scipy/linalg/decomp.pyc
${PYSITELIB}/scipy/linalg/decomp.pyo
@@ -560,12 +549,6 @@ ${PYSITELIB}/scipy/linalg/decomp_schur.pyo
${PYSITELIB}/scipy/linalg/decomp_svd.py
${PYSITELIB}/scipy/linalg/decomp_svd.pyc
${PYSITELIB}/scipy/linalg/decomp_svd.pyo
-${PYSITELIB}/scipy/linalg/fblas.py
-${PYSITELIB}/scipy/linalg/fblas.pyc
-${PYSITELIB}/scipy/linalg/fblas.pyo
-${PYSITELIB}/scipy/linalg/flapack.py
-${PYSITELIB}/scipy/linalg/flapack.pyc
-${PYSITELIB}/scipy/linalg/flapack.pyo
${PYSITELIB}/scipy/linalg/flinalg.py
${PYSITELIB}/scipy/linalg/flinalg.pyc
${PYSITELIB}/scipy/linalg/flinalg.pyo
@@ -593,14 +576,18 @@ ${PYSITELIB}/scipy/linalg/special_matrices.pyo
${PYSITELIB}/scipy/linalg/tests/test_basic.py
${PYSITELIB}/scipy/linalg/tests/test_blas.py
${PYSITELIB}/scipy/linalg/tests/test_build.py
+${PYSITELIB}/scipy/linalg/tests/test_cython_blas.py
+${PYSITELIB}/scipy/linalg/tests/test_cython_lapack.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_decomp_update.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_solve_toeplitz.py
${PYSITELIB}/scipy/linalg/tests/test_solvers.py
${PYSITELIB}/scipy/linalg/tests/test_special_matrices.py
${PYSITELIB}/scipy/misc/__init__.py
@@ -614,16 +601,37 @@ ${PYSITELIB}/scipy/misc/doccer.py
${PYSITELIB}/scipy/misc/doccer.pyc
${PYSITELIB}/scipy/misc/doccer.pyo
${PYSITELIB}/scipy/misc/face.dat
-${PYSITELIB}/scipy/misc/lena.dat
${PYSITELIB}/scipy/misc/pilutil.py
${PYSITELIB}/scipy/misc/pilutil.pyc
${PYSITELIB}/scipy/misc/pilutil.pyo
${PYSITELIB}/scipy/misc/setup.py
${PYSITELIB}/scipy/misc/setup.pyc
${PYSITELIB}/scipy/misc/setup.pyo
+${PYSITELIB}/scipy/misc/tests/data/3x3x3.png
+${PYSITELIB}/scipy/misc/tests/data/3x3x4.png
+${PYSITELIB}/scipy/misc/tests/data/3x4x3.png
+${PYSITELIB}/scipy/misc/tests/data/3x4x4.png
+${PYSITELIB}/scipy/misc/tests/data/3x5x3.png
+${PYSITELIB}/scipy/misc/tests/data/3x5x4.png
+${PYSITELIB}/scipy/misc/tests/data/4x3x3.png
+${PYSITELIB}/scipy/misc/tests/data/4x3x4.png
+${PYSITELIB}/scipy/misc/tests/data/4x4x3.png
+${PYSITELIB}/scipy/misc/tests/data/4x4x4.png
+${PYSITELIB}/scipy/misc/tests/data/4x5x3.png
+${PYSITELIB}/scipy/misc/tests/data/4x5x4.png
+${PYSITELIB}/scipy/misc/tests/data/5x3x3.png
+${PYSITELIB}/scipy/misc/tests/data/5x3x4.png
+${PYSITELIB}/scipy/misc/tests/data/5x4x3.png
+${PYSITELIB}/scipy/misc/tests/data/5x4x4.png
+${PYSITELIB}/scipy/misc/tests/data/5x5x3.png
+${PYSITELIB}/scipy/misc/tests/data/5x5x4.png
+${PYSITELIB}/scipy/misc/tests/data/blocks2bit.png
+${PYSITELIB}/scipy/misc/tests/data/box1.png
+${PYSITELIB}/scipy/misc/tests/data/foo3x5x4indexed.png
${PYSITELIB}/scipy/misc/tests/data/icon.png
${PYSITELIB}/scipy/misc/tests/data/icon_mono.png
${PYSITELIB}/scipy/misc/tests/data/icon_mono_flat.png
+${PYSITELIB}/scipy/misc/tests/data/pattern4bit.png
${PYSITELIB}/scipy/misc/tests/test_common.py
${PYSITELIB}/scipy/misc/tests/test_doccer.py
${PYSITELIB}/scipy/misc/tests/test_pilutil.py
@@ -694,19 +702,57 @@ ${PYSITELIB}/scipy/optimize/_cobyla.so
${PYSITELIB}/scipy/optimize/_differentialevolution.py
${PYSITELIB}/scipy/optimize/_differentialevolution.pyc
${PYSITELIB}/scipy/optimize/_differentialevolution.pyo
+${PYSITELIB}/scipy/optimize/_group_columns.so
+${PYSITELIB}/scipy/optimize/_hungarian.py
+${PYSITELIB}/scipy/optimize/_hungarian.pyc
+${PYSITELIB}/scipy/optimize/_hungarian.pyo
${PYSITELIB}/scipy/optimize/_lbfgsb.so
${PYSITELIB}/scipy/optimize/_linprog.py
${PYSITELIB}/scipy/optimize/_linprog.pyc
${PYSITELIB}/scipy/optimize/_linprog.pyo
+${PYSITELIB}/scipy/optimize/_lsq/__init__.py
+${PYSITELIB}/scipy/optimize/_lsq/__init__.pyc
+${PYSITELIB}/scipy/optimize/_lsq/__init__.pyo
+${PYSITELIB}/scipy/optimize/_lsq/bvls.py
+${PYSITELIB}/scipy/optimize/_lsq/bvls.pyc
+${PYSITELIB}/scipy/optimize/_lsq/bvls.pyo
+${PYSITELIB}/scipy/optimize/_lsq/common.py
+${PYSITELIB}/scipy/optimize/_lsq/common.pyc
+${PYSITELIB}/scipy/optimize/_lsq/common.pyo
+${PYSITELIB}/scipy/optimize/_lsq/dogbox.py
+${PYSITELIB}/scipy/optimize/_lsq/dogbox.pyc
+${PYSITELIB}/scipy/optimize/_lsq/dogbox.pyo
+${PYSITELIB}/scipy/optimize/_lsq/givens_elimination.so
+${PYSITELIB}/scipy/optimize/_lsq/least_squares.py
+${PYSITELIB}/scipy/optimize/_lsq/least_squares.pyc
+${PYSITELIB}/scipy/optimize/_lsq/least_squares.pyo
+${PYSITELIB}/scipy/optimize/_lsq/lsq_linear.py
+${PYSITELIB}/scipy/optimize/_lsq/lsq_linear.pyc
+${PYSITELIB}/scipy/optimize/_lsq/lsq_linear.pyo
+${PYSITELIB}/scipy/optimize/_lsq/setup.py
+${PYSITELIB}/scipy/optimize/_lsq/setup.pyc
+${PYSITELIB}/scipy/optimize/_lsq/setup.pyo
+${PYSITELIB}/scipy/optimize/_lsq/trf.py
+${PYSITELIB}/scipy/optimize/_lsq/trf.pyc
+${PYSITELIB}/scipy/optimize/_lsq/trf.pyo
+${PYSITELIB}/scipy/optimize/_lsq/trf_linear.py
+${PYSITELIB}/scipy/optimize/_lsq/trf_linear.pyc
+${PYSITELIB}/scipy/optimize/_lsq/trf_linear.pyo
${PYSITELIB}/scipy/optimize/_minimize.py
${PYSITELIB}/scipy/optimize/_minimize.pyc
${PYSITELIB}/scipy/optimize/_minimize.pyo
${PYSITELIB}/scipy/optimize/_minpack.so
${PYSITELIB}/scipy/optimize/_nnls.so
+${PYSITELIB}/scipy/optimize/_numdiff.py
+${PYSITELIB}/scipy/optimize/_numdiff.pyc
+${PYSITELIB}/scipy/optimize/_numdiff.pyo
${PYSITELIB}/scipy/optimize/_root.py
${PYSITELIB}/scipy/optimize/_root.pyc
${PYSITELIB}/scipy/optimize/_root.pyo
${PYSITELIB}/scipy/optimize/_slsqp.so
+${PYSITELIB}/scipy/optimize/_spectral.py
+${PYSITELIB}/scipy/optimize/_spectral.pyc
+${PYSITELIB}/scipy/optimize/_spectral.pyo
${PYSITELIB}/scipy/optimize/_trustregion.py
${PYSITELIB}/scipy/optimize/_trustregion.pyc
${PYSITELIB}/scipy/optimize/_trustregion.pyo
@@ -720,13 +766,6 @@ ${PYSITELIB}/scipy/optimize/_tstutils.py
${PYSITELIB}/scipy/optimize/_tstutils.pyc
${PYSITELIB}/scipy/optimize/_tstutils.pyo
${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
@@ -758,11 +797,17 @@ ${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__numdiff.py
${PYSITELIB}/scipy/optimize/tests/test__root.py
-${PYSITELIB}/scipy/optimize/tests/test_anneal.py
+${PYSITELIB}/scipy/optimize/tests/test__spectral.py
${PYSITELIB}/scipy/optimize/tests/test_cobyla.py
+${PYSITELIB}/scipy/optimize/tests/test_hungarian.py
+${PYSITELIB}/scipy/optimize/tests/test_lbfgsb_hessinv.py
+${PYSITELIB}/scipy/optimize/tests/test_least_squares.py
${PYSITELIB}/scipy/optimize/tests/test_linesearch.py
${PYSITELIB}/scipy/optimize/tests/test_linprog.py
+${PYSITELIB}/scipy/optimize/tests/test_lsq_common.py
+${PYSITELIB}/scipy/optimize/tests/test_lsq_linear.py
${PYSITELIB}/scipy/optimize/tests/test_minpack.py
${PYSITELIB}/scipy/optimize/tests/test_nnls.py
${PYSITELIB}/scipy/optimize/tests/test_nonlin.py
@@ -787,7 +832,10 @@ ${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/_max_len_seq.py
+${PYSITELIB}/scipy/signal/_max_len_seq.pyc
+${PYSITELIB}/scipy/signal/_max_len_seq.pyo
+${PYSITELIB}/scipy/signal/_max_len_seq_inner.so
${PYSITELIB}/scipy/signal/_peak_finding.py
${PYSITELIB}/scipy/signal/_peak_finding.pyc
${PYSITELIB}/scipy/signal/_peak_finding.pyo
@@ -795,7 +843,6 @@ ${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
@@ -856,7 +903,6 @@ ${PYSITELIB}/scipy/sparse/_sparsetools.so
${PYSITELIB}/scipy/sparse/base.py
${PYSITELIB}/scipy/sparse/base.pyc
${PYSITELIB}/scipy/sparse/base.pyo
-${PYSITELIB}/scipy/sparse/benchmarks/bench_sparse.py
${PYSITELIB}/scipy/sparse/bsr.py
${PYSITELIB}/scipy/sparse/bsr.pyc
${PYSITELIB}/scipy/sparse/bsr.pyo
@@ -927,12 +973,12 @@ ${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/_norm.py
+${PYSITELIB}/scipy/sparse/linalg/_norm.pyc
+${PYSITELIB}/scipy/sparse/linalg/_norm.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
@@ -964,7 +1010,6 @@ ${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
@@ -1018,6 +1063,7 @@ ${PYSITELIB}/scipy/sparse/linalg/setup.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_norm.py
${PYSITELIB}/scipy/sparse/linalg/tests/test_onenormest.py
${PYSITELIB}/scipy/sparse/setup.py
${PYSITELIB}/scipy/sparse/setup.pyc
@@ -1046,7 +1092,9 @@ ${PYSITELIB}/scipy/spatial/_distance_wrap.so
${PYSITELIB}/scipy/spatial/_plotutils.py
${PYSITELIB}/scipy/spatial/_plotutils.pyc
${PYSITELIB}/scipy/spatial/_plotutils.pyo
-${PYSITELIB}/scipy/spatial/benchmarks/bench_ckdtree.py
+${PYSITELIB}/scipy/spatial/_procrustes.py
+${PYSITELIB}/scipy/spatial/_procrustes.pyc
+${PYSITELIB}/scipy/spatial/_procrustes.pyo
${PYSITELIB}/scipy/spatial/ckdtree.so
${PYSITELIB}/scipy/spatial/distance.py
${PYSITELIB}/scipy/spatial/distance.pyc
@@ -1084,6 +1132,7 @@ ${PYSITELIB}/scipy/spatial/tests/data/pdist-seuclidean-ml.txt
${PYSITELIB}/scipy/spatial/tests/data/pdist-spearman-ml.txt
${PYSITELIB}/scipy/spatial/tests/data/random-bool-data.txt
${PYSITELIB}/scipy/spatial/tests/test__plotutils.py
+${PYSITELIB}/scipy/spatial/tests/test__procrustes.py
${PYSITELIB}/scipy/spatial/tests/test_distance.py
${PYSITELIB}/scipy/spatial/tests/test_kdtree.py
${PYSITELIB}/scipy/spatial/tests/test_qhull.py
@@ -1160,6 +1209,9 @@ ${PYSITELIB}/scipy/stats/_multivariate.py
${PYSITELIB}/scipy/stats/_multivariate.pyc
${PYSITELIB}/scipy/stats/_multivariate.pyo
${PYSITELIB}/scipy/stats/_rank.so
+${PYSITELIB}/scipy/stats/_stats_mstats_common.py
+${PYSITELIB}/scipy/stats/_stats_mstats_common.pyc
+${PYSITELIB}/scipy/stats/_stats_mstats_common.pyo
${PYSITELIB}/scipy/stats/_tukeylambda_stats.py
${PYSITELIB}/scipy/stats/_tukeylambda_stats.pyc
${PYSITELIB}/scipy/stats/_tukeylambda_stats.pyo
@@ -1169,7 +1221,6 @@ ${PYSITELIB}/scipy/stats/contingency.pyo
${PYSITELIB}/scipy/stats/distributions.py
${PYSITELIB}/scipy/stats/distributions.pyc
${PYSITELIB}/scipy/stats/distributions.pyo
-${PYSITELIB}/scipy/stats/futil.so
${PYSITELIB}/scipy/stats/kde.py
${PYSITELIB}/scipy/stats/kde.pyc
${PYSITELIB}/scipy/stats/kde.pyo
@@ -1186,9 +1237,6 @@ ${PYSITELIB}/scipy/stats/mstats_extras.py
${PYSITELIB}/scipy/stats/mstats_extras.pyc
${PYSITELIB}/scipy/stats/mstats_extras.pyo
${PYSITELIB}/scipy/stats/mvn.so
-${PYSITELIB}/scipy/stats/rv.py
-${PYSITELIB}/scipy/stats/rv.pyc
-${PYSITELIB}/scipy/stats/rv.pyo
${PYSITELIB}/scipy/stats/setup.py
${PYSITELIB}/scipy/stats/setup.pyc
${PYSITELIB}/scipy/stats/setup.pyo
@@ -1197,6 +1245,18 @@ ${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/data/nist_anova/AtmWtAg.dat
+${PYSITELIB}/scipy/stats/tests/data/nist_anova/SiRstv.dat
+${PYSITELIB}/scipy/stats/tests/data/nist_anova/SmLs01.dat
+${PYSITELIB}/scipy/stats/tests/data/nist_anova/SmLs02.dat
+${PYSITELIB}/scipy/stats/tests/data/nist_anova/SmLs03.dat
+${PYSITELIB}/scipy/stats/tests/data/nist_anova/SmLs04.dat
+${PYSITELIB}/scipy/stats/tests/data/nist_anova/SmLs05.dat
+${PYSITELIB}/scipy/stats/tests/data/nist_anova/SmLs06.dat
+${PYSITELIB}/scipy/stats/tests/data/nist_anova/SmLs07.dat
+${PYSITELIB}/scipy/stats/tests/data/nist_anova/SmLs08.dat
+${PYSITELIB}/scipy/stats/tests/data/nist_anova/SmLs09.dat
+${PYSITELIB}/scipy/stats/tests/data/nist_linregress/Norris.dat
${PYSITELIB}/scipy/stats/tests/test_binned_statistic.py
${PYSITELIB}/scipy/stats/tests/test_contingency.py
${PYSITELIB}/scipy/stats/tests/test_continuous_basic.py
diff --git a/math/py-scipy/distinfo b/math/py-scipy/distinfo
index 1dc75fa1d5f..27e72529219 100644
--- a/math/py-scipy/distinfo
+++ b/math/py-scipy/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 23:33:43 agc Exp $
+$NetBSD: distinfo,v 1.8 2016/04/23 22:51:57 markd Exp $
-SHA1 (scipy-0.15.1.tar.gz) = 7ef714ffe95230cd2ce78c51af18983bbe762f2e
-RMD160 (scipy-0.15.1.tar.gz) = 8c7a6468c0f796e0770d920d17829ea4e2cb89a9
-SHA512 (scipy-0.15.1.tar.gz) = fff4412d850c431a1b4e6ee3b17958ee5ab3beb81e6cb8a8e7d56d368751eaa8781d7c3e69d932dc002d718fddc66a72098acfe74cfe29ec80b24e6736317275
-Size (scipy-0.15.1.tar.gz) = 11401878 bytes
+SHA1 (scipy-0.17.0.tar.gz) = 5f23bd9b1e89a9f8329183cee78e27f80b795c2d
+RMD160 (scipy-0.17.0.tar.gz) = e57f81fe6d4eb6a8262cf186db1163c72fea86d3
+SHA512 (scipy-0.17.0.tar.gz) = c508746edc8a4699fb783849d5db4a43eea4e98e22592c1d05454859437b6eaebadc5980d72dd6b868c8132b94a32e3bdd73286cf994cf2fb1aec6fefdd7dabe
+Size (scipy-0.17.0.tar.gz) = 11474364 bytes