Tue Jul 15 19:27:53 CDT 2008

Author: alan.mcintyre
Date: 2008-07-15 19:26:23 -0500 (Tue, 15 Jul 2008)
New Revision: 4545

Removed:
   trunk/scipy/testing/
Modified:
   trunk/scipy/__init__.py
   trunk/scipy/cluster/__init__.py
   trunk/scipy/cluster/tests/test_hierarchy.py
   trunk/scipy/cluster/tests/test_vq.py
   trunk/scipy/fftpack/__init__.py
   trunk/scipy/fftpack/benchmarks/bench_basic.py
   trunk/scipy/fftpack/benchmarks/bench_pseudo_diffs.py
   trunk/scipy/fftpack/tests/test_basic.py
   trunk/scipy/fftpack/tests/test_helper.py
   trunk/scipy/fftpack/tests/test_pseudo_diffs.py
   trunk/scipy/integrate/__init__.py
   trunk/scipy/integrate/tests/test_integrate.py
   trunk/scipy/integrate/tests/test_quadpack.py
   trunk/scipy/integrate/tests/test_quadrature.py
   trunk/scipy/interpolate/__init__.py
   trunk/scipy/interpolate/tests/test_fitpack.py
   trunk/scipy/interpolate/tests/test_interpolate.py
   trunk/scipy/interpolate/tests/test_polyint.py
   trunk/scipy/io/__init__.py
   trunk/scipy/io/arff/tests/test_data.py
   trunk/scipy/io/arff/tests/test_header.py
   trunk/scipy/io/matlab/tests/test_mio.py
   trunk/scipy/io/tests/test_array_import.py
   trunk/scipy/io/tests/test_mmio.py
   trunk/scipy/io/tests/test_npfile.py
   trunk/scipy/io/tests/test_recaster.py
   trunk/scipy/lib/__init__.py
   trunk/scipy/lib/blas/__init__.py
   trunk/scipy/lib/blas/tests/test_blas.py
   trunk/scipy/lib/blas/tests/test_fblas.py
   trunk/scipy/lib/lapack/__init__.py
   trunk/scipy/lib/lapack/tests/esv_tests.py
   trunk/scipy/lib/lapack/tests/gesv_tests.py
   trunk/scipy/lib/lapack/tests/test_lapack.py
   trunk/scipy/linalg/__init__.py
   trunk/scipy/linalg/benchmarks/bench_basic.py
   trunk/scipy/linalg/benchmarks/bench_decom.py
   trunk/scipy/linalg/tests/test_atlas_version.py
   trunk/scipy/linalg/tests/test_basic.py
   trunk/scipy/linalg/tests/test_blas.py
   trunk/scipy/linalg/tests/test_decomp.py
   trunk/scipy/linalg/tests/test_fblas.py
   trunk/scipy/linalg/tests/test_lapack.py
   trunk/scipy/linalg/tests/test_matfuncs.py
   trunk/scipy/maxentropy/__init__.py
   trunk/scipy/maxentropy/tests/test_maxentropy.py
   trunk/scipy/misc/__init__.py
   trunk/scipy/misc/ppimport.py
   trunk/scipy/misc/tests/test_pilutil.py
   trunk/scipy/ndimage/__init__.py
   trunk/scipy/ndimage/tests/test_ndimage.py
   trunk/scipy/ndimage/tests/test_registration.py
   trunk/scipy/ndimage/tests/test_segment.py
   trunk/scipy/odr/__init__.py
   trunk/scipy/odr/tests/test_odr.py
   trunk/scipy/optimize/__init__.py
   trunk/scipy/optimize/benchmarks/bench_zeros.py
   trunk/scipy/optimize/tests/test_cobyla.py
   trunk/scipy/optimize/tests/test_nonlin.py
   trunk/scipy/optimize/tests/test_optimize.py
   trunk/scipy/optimize/tests/test_slsqp.py
   trunk/scipy/optimize/tests/test_zeros.py
   trunk/scipy/sandbox/cdavid/__init__.py
   trunk/scipy/sandbox/cdavid/tests/test_autocorr.py
   trunk/scipy/sandbox/cdavid/tests/test_lpc.py
   trunk/scipy/sandbox/cdavid/tests/test_segmentaxis.py
   trunk/scipy/sandbox/exmplpackage/__init__.py
   trunk/scipy/sandbox/exmplpackage/benchmarks/bench_foo.py
   trunk/scipy/sandbox/exmplpackage/tests/test_foo.py
   trunk/scipy/sandbox/exmplpackage/yyy/__init__.py
   trunk/scipy/sandbox/exmplpackage/yyy/tests/test_yyy.py
   trunk/scipy/sandbox/fdfpack/tests/test_fdf.py
   trunk/scipy/sandbox/montecarlo/tests/test_dictsampler.py
   trunk/scipy/sandbox/montecarlo/tests/test_intsampler.py
   trunk/scipy/sandbox/numexpr/tests/test_numexpr.py
   trunk/scipy/sandbox/pyloess/tests/test_mpyloess.py
   trunk/scipy/sandbox/pyloess/tests/test_pyloess.py
   trunk/scipy/sandbox/rbf/__init__.py
   trunk/scipy/sandbox/rbf/tests/test_rbf.py
   trunk/scipy/sandbox/spline/__init__.py
   trunk/scipy/sandbox/spline/tests/test_fitpack.py
   trunk/scipy/sandbox/spline/tests/test_spline.py
   trunk/scipy/setup.py
   trunk/scipy/setupscons.py
   trunk/scipy/signal/__init__.py
   trunk/scipy/signal/tests/test_signaltools.py
   trunk/scipy/signal/tests/test_wavelets.py
   trunk/scipy/sparse/__init__.py
   trunk/scipy/sparse/benchmarks/bench_sparse.py
   trunk/scipy/sparse/linalg/__init__.py
   trunk/scipy/sparse/linalg/dsolve/__init__.py
   trunk/scipy/sparse/linalg/dsolve/tests/test_linsolve.py
   trunk/scipy/sparse/linalg/dsolve/umfpack/__init__.py
   trunk/scipy/sparse/linalg/dsolve/umfpack/tests/test_umfpack.py
   trunk/scipy/sparse/linalg/eigen/__init__.py
   trunk/scipy/sparse/linalg/eigen/arpack/tests/test_arpack.py
   trunk/scipy/sparse/linalg/eigen/arpack/tests/test_speigs.py
   trunk/scipy/sparse/linalg/eigen/lobpcg/__init__.py
   trunk/scipy/sparse/linalg/eigen/lobpcg/tests/test_lobpcg.py
   trunk/scipy/sparse/linalg/isolve/__init__.py
   trunk/scipy/sparse/linalg/isolve/tests/test_iterative.py
   trunk/scipy/sparse/linalg/tests/test_interface.py
   trunk/scipy/sparse/tests/test_base.py
   trunk/scipy/sparse/tests/test_construct.py
   trunk/scipy/sparse/tests/test_extract.py
   trunk/scipy/sparse/tests/test_spfuncs.py
   trunk/scipy/sparse/tests/test_sputils.py
   trunk/scipy/special/__init__.py
   trunk/scipy/special/tests/test_basic.py
   trunk/scipy/special/tests/test_spfun_stats.py
   trunk/scipy/stats/__init__.py
   trunk/scipy/stats/models/__init__.py
   trunk/scipy/stats/models/tests/test_bspline.py
   trunk/scipy/stats/models/tests/test_formula.py
   trunk/scipy/stats/models/tests/test_glm.py
   trunk/scipy/stats/models/tests/test_regression.py
   trunk/scipy/stats/models/tests/test_rlm.py
   trunk/scipy/stats/models/tests/test_scale.py
   trunk/scipy/stats/models/tests/test_utils.py
   trunk/scipy/stats/morestats.py
   trunk/scipy/stats/tests/test_distributions.py
   trunk/scipy/stats/tests/test_mmorestats.py
   trunk/scipy/stats/tests/test_morestats.py
   trunk/scipy/stats/tests/test_mstats.py
   trunk/scipy/stats/tests/test_stats.py
   trunk/scipy/weave/__init__.py
   trunk/scipy/weave/tests/test_ast_tools.py
   trunk/scipy/weave/tests/test_blitz_tools.py
   trunk/scipy/weave/tests/test_build_tools.py
   trunk/scipy/weave/tests/test_c_spec.py
   trunk/scipy/weave/tests/test_catalog.py
   trunk/scipy/weave/tests/test_ext_tools.py
   trunk/scipy/weave/tests/test_inline_tools.py
   trunk/scipy/weave/tests/test_numpy_scalar_spec.py
   trunk/scipy/weave/tests/test_scxx.py
   trunk/scipy/weave/tests/test_scxx_dict.py
   trunk/scipy/weave/tests/test_scxx_object.py
   trunk/scipy/weave/tests/test_scxx_sequence.py
   trunk/scipy/weave/tests/test_size_check.py
   trunk/scipy/weave/tests/test_slice_handler.py
   trunk/scipy/weave/tests/test_standard_array_spec.py
   trunk/scipy/weave/tests/test_wx_spec.py
Log:
Remove the testing package, and switched all test modules to use numpy.test instead.


Modified: trunk/scipy/__init__.py
===================================================================

--- trunk/scipy/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -67,7 +67,7 @@
 # "from scipy import *". This works around a numpy bug present in < 1.2.
 subpackages = """cluster constants fftpack integrate interpolate io lib linalg
 linsolve maxentropy misc ndimage odr optimize sandbox signal sparse special
-splinalg stats stsci testing weave""".split()
+splinalg stats stsci weave""".split()
 for name in subpackages:
     try:
         __all__.remove(name)
@@ -83,7 +83,7 @@
 """
 __doc__ += pkgload.get_pkgdocs()
 
-from testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test
 bench = Tester().bench
 __doc__ += """

Modified: trunk/scipy/cluster/__init__.py
===================================================================
--- trunk/scipy/cluster/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/cluster/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -7,5 +7,5 @@
 __all__ = ['vq', 'hierarchy', 'distance']
 
 import vq, hierarchy, distance
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test

Modified: trunk/scipy/cluster/tests/test_hierarchy.py
===================================================================
--- trunk/scipy/cluster/tests/test_hierarchy.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/cluster/tests/test_hierarchy.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -37,7 +37,7 @@
 import os.path
 import numpy
 
-from scipy.testing import *
+from numpy.testing import *
 from scipy.cluster.hierarchy import squareform, linkage, from_mlab_linkage, numobs_dm, numobs_y, numobs_linkage
 from scipy.cluster.distance import pdist, matching, jaccard, dice, sokalsneath, rogerstanimoto, russellrao, yule
 

Modified: trunk/scipy/cluster/tests/test_vq.py
===================================================================
--- trunk/scipy/cluster/tests/test_vq.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/cluster/tests/test_vq.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -8,7 +8,7 @@
 
 import sys
 import os.path
-from scipy.testing import *
+from numpy.testing import *
 
 import numpy as N
 

Modified: trunk/scipy/fftpack/__init__.py
===================================================================
--- trunk/scipy/fftpack/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/fftpack/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -17,6 +17,6 @@
 del k, register_func
 
 
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test
 bench = Tester().bench

Modified: trunk/scipy/fftpack/benchmarks/bench_basic.py
===================================================================
--- trunk/scipy/fftpack/benchmarks/bench_basic.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/fftpack/benchmarks/bench_basic.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,7 +1,7 @@
 """ Test functions for fftpack.basic module
 """
 import sys
-from scipy.testing import *
+from numpy.testing import *
 from scipy.fftpack import ifft,fft,fftn,ifftn,rfft,irfft
 from scipy.fftpack import _fftpack as fftpack
 

Modified: trunk/scipy/fftpack/benchmarks/bench_pseudo_diffs.py
===================================================================
--- trunk/scipy/fftpack/benchmarks/bench_pseudo_diffs.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/fftpack/benchmarks/bench_pseudo_diffs.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -4,7 +4,7 @@
 
 from numpy import arange, add, array, sin, cos, pi,exp,tanh,sum,sign
 
-from scipy.testing import *
+from numpy.testing import *
 from scipy.fftpack import diff,fft,ifft,tilbert,itilbert,hilbert,ihilbert,rfft
 from scipy.fftpack import shift
 from scipy.fftpack import fftfreq

Modified: trunk/scipy/fftpack/tests/test_basic.py
===================================================================
--- trunk/scipy/fftpack/tests/test_basic.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/fftpack/tests/test_basic.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -11,7 +11,7 @@
   python tests/test_basic.py
 """
 import sys
-from scipy.testing import *
+from numpy.testing import *
 from scipy.fftpack import ifft,fft,fftn,ifftn,rfft,irfft
 from scipy.fftpack import _fftpack as fftpack
 

Modified: trunk/scipy/fftpack/tests/test_helper.py
===================================================================
--- trunk/scipy/fftpack/tests/test_helper.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/fftpack/tests/test_helper.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -12,7 +12,7 @@
 """
 
 import sys
-from scipy.testing import *
+from numpy.testing import *
 from scipy.fftpack import fftshift,ifftshift,fftfreq,rfftfreq
 
 from numpy import pi

Modified: trunk/scipy/fftpack/tests/test_pseudo_diffs.py
===================================================================
--- trunk/scipy/fftpack/tests/test_pseudo_diffs.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/fftpack/tests/test_pseudo_diffs.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -11,7 +11,7 @@
   python tests/test_pseudo_diffs.py [<level>]
 """
 import sys
-from scipy.testing import *
+from numpy.testing import *
 from scipy.fftpack import diff,fft,ifft,tilbert,itilbert,hilbert,ihilbert,rfft
 from scipy.fftpack import shift
 from scipy.fftpack import fftfreq

Modified: trunk/scipy/integrate/__init__.py
===================================================================
--- trunk/scipy/integrate/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/integrate/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -12,5 +12,5 @@
 from ode import *
 
 __all__ = filter(lambda s:not s.startswith('_'),dir())
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test

Modified: trunk/scipy/integrate/tests/test_integrate.py
===================================================================
--- trunk/scipy/integrate/tests/test_integrate.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/integrate/tests/test_integrate.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -8,7 +8,7 @@
                    eye, pi, exp, allclose)
 from scipy.linalg import norm
 
-from scipy.testing import *
+from numpy.testing import *
 from scipy.integrate import odeint, ode
 
 #------------------------------------------------------------------------------

Modified: trunk/scipy/integrate/tests/test_quadpack.py
===================================================================
--- trunk/scipy/integrate/tests/test_quadpack.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/integrate/tests/test_quadpack.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,6 +1,6 @@
 import numpy
 from numpy import sqrt, cos, sin, arctan, exp, log, pi, Inf
-from scipy.testing import *
+from numpy.testing import *
 from scipy.integrate import quad, dblquad, tplquad
 
 def assert_quad((value, err), tabledValue, errTol=1.5e-8):

Modified: trunk/scipy/integrate/tests/test_quadrature.py
===================================================================
--- trunk/scipy/integrate/tests/test_quadrature.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/integrate/tests/test_quadrature.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,7 +1,7 @@
 
 import numpy
 from numpy import cos, sin, pi
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.integrate import quadrature, romberg, romb
 

Modified: trunk/scipy/interpolate/__init__.py
===================================================================
--- trunk/scipy/interpolate/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/interpolate/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -15,5 +15,5 @@
 from polyint import *
 
 __all__ = filter(lambda s:not s.startswith('_'),dir())
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test

Modified: trunk/scipy/interpolate/tests/test_fitpack.py
===================================================================
--- trunk/scipy/interpolate/tests/test_fitpack.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/interpolate/tests/test_fitpack.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -13,7 +13,7 @@
 #import libwadpy
 
 import sys
-from scipy.testing import *
+from numpy.testing import *
 from numpy import array, diff
 from scipy.interpolate.fitpack2 import UnivariateSpline,LSQUnivariateSpline,\
      InterpolatedUnivariateSpline

Modified: trunk/scipy/interpolate/tests/test_interpolate.py
===================================================================
--- trunk/scipy/interpolate/tests/test_interpolate.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/interpolate/tests/test_interpolate.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,4 +1,4 @@
-from scipy.testing import *
+from numpy.testing import *
 from numpy import mgrid, pi, sin, ogrid, poly1d
 import numpy as np
 

Modified: trunk/scipy/interpolate/tests/test_polyint.py
===================================================================
--- trunk/scipy/interpolate/tests/test_polyint.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/interpolate/tests/test_polyint.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,5 +1,5 @@
 
-from scipy.testing import *
+from numpy.testing import *
 from scipy.interpolate import KroghInterpolator, krogh_interpolate, \
         BarycentricInterpolator, barycentric_interpolate, \
         PiecewisePolynomial, piecewise_polynomial_interpolate, \

Modified: trunk/scipy/io/__init__.py
===================================================================
--- trunk/scipy/io/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/io/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -84,5 +84,5 @@
 from mmio import mminfo, mmread, mmwrite
 
 __all__ = filter(lambda s:not s.startswith('_'),dir())
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test

Modified: trunk/scipy/io/arff/tests/test_data.py
===================================================================
--- trunk/scipy/io/arff/tests/test_data.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/io/arff/tests/test_data.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -3,7 +3,7 @@
 import os
 
 import numpy as N
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.io.arff.arffread import loadarff
 

Modified: trunk/scipy/io/arff/tests/test_header.py
===================================================================
--- trunk/scipy/io/arff/tests/test_header.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/io/arff/tests/test_header.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -2,7 +2,7 @@
 """Test for parsing arff headers only."""
 import os
 
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.io.arff.arffread import read_header, MetaData, parse_type, \
                                    ParseArffError

Modified: trunk/scipy/io/matlab/tests/test_mio.py
===================================================================
--- trunk/scipy/io/matlab/tests/test_mio.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/io/matlab/tests/test_mio.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -4,7 +4,7 @@
 from glob import glob
 from cStringIO import StringIO
 from tempfile import mkstemp, mkdtemp
-from scipy.testing import *
+from numpy.testing import *
 from numpy import arange, array, eye, pi, cos, exp, sin, sqrt, ndarray,  \
      zeros, reshape, transpose, empty
 import scipy.sparse as SP

Modified: trunk/scipy/io/tests/test_array_import.py
===================================================================
--- trunk/scipy/io/tests/test_array_import.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/io/tests/test_array_import.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -4,7 +4,7 @@
 # also check out numpyio.fread.__doc__ and other method docstrings.
 
 import os
-from scipy.testing import *
+from numpy.testing import *
 import scipy.io as io
 from scipy.io import numpyio
 from scipy.io import array_import

Modified: trunk/scipy/io/tests/test_mmio.py
===================================================================
--- trunk/scipy/io/tests/test_mmio.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/io/tests/test_mmio.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -2,7 +2,7 @@
 
 from tempfile import mktemp
 from numpy import array,transpose
-from scipy.testing import *
+from numpy.testing import *
 
 import scipy
 import scipy.sparse

Modified: trunk/scipy/io/tests/test_npfile.py
===================================================================
--- trunk/scipy/io/tests/test_npfile.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/io/tests/test_npfile.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,7 +1,7 @@
 import os
 from StringIO import StringIO
 from tempfile import mkstemp
-from scipy.testing import *
+from numpy.testing import *
 import numpy as N
 
 from scipy.io.npfile import npfile, sys_endian_code

Modified: trunk/scipy/io/tests/test_recaster.py
===================================================================
--- trunk/scipy/io/tests/test_recaster.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/io/tests/test_recaster.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,5 +1,5 @@
 import numpy as N
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.io.recaster import sctype_attributes, Recaster, RecastError
 

Modified: trunk/scipy/lib/__init__.py
===================================================================
--- trunk/scipy/lib/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/lib/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,5 +1,5 @@
 
 from info import __doc__, __all__
 
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test

Modified: trunk/scipy/lib/blas/__init__.py
===================================================================
--- trunk/scipy/lib/blas/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/lib/blas/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -58,5 +58,5 @@
         funcs.append(func)
     return tuple(funcs)
 
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test

Modified: trunk/scipy/lib/blas/tests/test_blas.py
===================================================================
--- trunk/scipy/lib/blas/tests/test_blas.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/lib/blas/tests/test_blas.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -16,7 +16,7 @@
 import math
 
 from numpy import arange, add, array
-from scipy.testing import *
+from numpy.testing import *
 from scipy.lib.blas import fblas
 from scipy.lib.blas import cblas
 from scipy.lib.blas import get_blas_funcs

Modified: trunk/scipy/lib/blas/tests/test_fblas.py
===================================================================
--- trunk/scipy/lib/blas/tests/test_fblas.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/lib/blas/tests/test_fblas.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -10,7 +10,7 @@
 from numpy import zeros, transpose, newaxis, shape, float32, \
      float64, complex64, complex128, arange, array, common_type, \
      conjugate
-from scipy.testing import *
+from numpy.testing import *
 from scipy.lib.blas import fblas
 
 #decimal accuracy to require between Python and LAPACK/BLAS calculations

Modified: trunk/scipy/lib/lapack/__init__.py
===================================================================
--- trunk/scipy/lib/lapack/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/lib/lapack/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -90,5 +90,5 @@
 func_code = %(func_name)s.func_code
 '''
 
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test

Modified: trunk/scipy/lib/lapack/tests/esv_tests.py
===================================================================
--- trunk/scipy/lib/lapack/tests/esv_tests.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/lib/lapack/tests/esv_tests.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,5 +1,5 @@
 
-from scipy.testing import *
+from numpy.testing import *
 from numpy import dot
 
 class _test_ev(object):

Modified: trunk/scipy/lib/lapack/tests/gesv_tests.py
===================================================================
--- trunk/scipy/lib/lapack/tests/gesv_tests.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/lib/lapack/tests/gesv_tests.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,5 +1,5 @@
 
-from scipy.testing import *
+from numpy.testing import *
 from numpy import dot
 
 class _test_gev(object):

Modified: trunk/scipy/lib/lapack/tests/test_lapack.py
===================================================================
--- trunk/scipy/lib/lapack/tests/test_lapack.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/lib/lapack/tests/test_lapack.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -16,7 +16,7 @@
 
 import os
 import sys
-from scipy.testing import *
+from numpy.testing import *
 from numpy import dot, ones, zeros
 
 from scipy.lib.lapack import flapack, clapack

Modified: trunk/scipy/linalg/__init__.py
===================================================================
--- trunk/scipy/linalg/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/linalg/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -30,6 +30,6 @@
 
 del k, register_func
 
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test
 bench = Tester().bench

Modified: trunk/scipy/linalg/benchmarks/bench_basic.py
===================================================================
--- trunk/scipy/linalg/benchmarks/bench_basic.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/linalg/benchmarks/bench_basic.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -2,7 +2,7 @@
 import numpy
 from numpy import arange, add, array, dot, zeros, identity, conjugate, transpose
 
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.linalg import solve,inv,det,lstsq, toeplitz, hankel, tri, triu, \
      tril, pinv, pinv2, solve_banded

Modified: trunk/scipy/linalg/benchmarks/bench_decom.py
===================================================================
--- trunk/scipy/linalg/benchmarks/bench_decom.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/linalg/benchmarks/bench_decom.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -7,7 +7,7 @@
 from numpy import linalg
 from scipy.linalg import eigvals
 
-from scipy.testing import *
+from numpy.testing import *
 
 def random(size):
     return rand(*size)

Modified: trunk/scipy/linalg/tests/test_atlas_version.py
===================================================================
--- trunk/scipy/linalg/tests/test_atlas_version.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/linalg/tests/test_atlas_version.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -4,7 +4,7 @@
 #
 
 import sys
-from scipy.testing import *
+from numpy.testing import *
 
 import scipy.linalg.atlas_version
 

Modified: trunk/scipy/linalg/tests/test_basic.py
===================================================================
--- trunk/scipy/linalg/tests/test_basic.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/linalg/tests/test_basic.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -23,7 +23,7 @@
 from numpy import arange, add, array, dot, zeros, identity, conjugate, transpose
 
 import sys
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.linalg import solve,inv,det,lstsq, toeplitz, hankel, tri, triu, \
      tril, pinv, pinv2, solve_banded

Modified: trunk/scipy/linalg/tests/test_blas.py
===================================================================
--- trunk/scipy/linalg/tests/test_blas.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/linalg/tests/test_blas.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -17,7 +17,7 @@
 
 from numpy import arange, add, array
 
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.linalg import fblas, cblas
 

Modified: trunk/scipy/linalg/tests/test_decomp.py
===================================================================
--- trunk/scipy/linalg/tests/test_decomp.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/linalg/tests/test_decomp.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -15,7 +15,7 @@
 """
 
 import sys
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.linalg import eig,eigvals,lu,svd,svdvals,cholesky,qr, \
      schur,rsf2csf, lu_solve,lu_factor,solve,diagsvd,hessenberg,rq, \

Modified: trunk/scipy/linalg/tests/test_fblas.py
===================================================================
--- trunk/scipy/linalg/tests/test_fblas.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/linalg/tests/test_fblas.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -13,7 +13,7 @@
      common_type, conjugate
 from scipy.linalg import fblas
 
-from scipy.testing import *
+from numpy.testing import *
 
 
 #decimal accuracy to require between Python and LAPACK/BLAS calculations

Modified: trunk/scipy/linalg/tests/test_lapack.py
===================================================================
--- trunk/scipy/linalg/tests/test_lapack.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/linalg/tests/test_lapack.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -5,7 +5,7 @@
 
 
 import sys
-from scipy.testing import *
+from numpy.testing import *
 from numpy import ones
 
 from scipy.linalg import flapack, clapack

Modified: trunk/scipy/linalg/tests/test_matfuncs.py
===================================================================
--- trunk/scipy/linalg/tests/test_matfuncs.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/linalg/tests/test_matfuncs.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -11,7 +11,7 @@
 import numpy
 from numpy import array, identity, dot, sqrt
 
-from scipy.testing import *
+from numpy.testing import *
 
 import scipy.linalg
 from scipy.linalg import signm,logm,funm, sqrtm, expm, expm2, expm3

Modified: trunk/scipy/maxentropy/__init__.py
===================================================================
--- trunk/scipy/maxentropy/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/maxentropy/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -8,5 +8,5 @@
 from info import __doc__
 from maxentropy import *
 
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test

Modified: trunk/scipy/maxentropy/tests/test_maxentropy.py
===================================================================
--- trunk/scipy/maxentropy/tests/test_maxentropy.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/maxentropy/tests/test_maxentropy.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -7,7 +7,7 @@
 """
 
 import sys
-from scipy.testing import *
+from numpy.testing import *
 from numpy import arange, add, array, dot, zeros, identity, log, exp, ones
 from scipy.maxentropy.maxentropy import *
 

Modified: trunk/scipy/misc/__init__.py
===================================================================
--- trunk/scipy/misc/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/misc/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -20,5 +20,5 @@
 
 __all__ += common.__all__
 
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test

Modified: trunk/scipy/misc/ppimport.py
===================================================================
--- trunk/scipy/misc/ppimport.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/misc/ppimport.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -242,7 +242,7 @@
         self.__dict__['_ppimport_p_frame'] = p_frame
 
         if location != 'sys.path':
-            from scipy.testing.pkgtester import Tester
+            from numpy.testing import Tester
             self.__dict__['test'] = Tester(os,path.dirname(location)).test
 
         # install loader
@@ -283,7 +283,7 @@
         self.__dict__['_ppimport_module'] = module
 
         # XXX: Should we check the existence of module.test? Warn?
-        from scipy.testing.pkgtester import Tester
+        from numpy.testing import Tester
         test = Tester(os.path.dirname(module)).test
         return module
 

Modified: trunk/scipy/misc/tests/test_pilutil.py
===================================================================
--- trunk/scipy/misc/tests/test_pilutil.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/misc/tests/test_pilutil.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -2,7 +2,7 @@
 import glob
 import numpy as N
 
-from scipy.testing import *
+from numpy.testing import *
 
 try:
     import PIL.Image

Modified: trunk/scipy/ndimage/__init__.py
===================================================================
--- trunk/scipy/ndimage/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/ndimage/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -38,5 +38,5 @@
 from info import __doc__
 __version__ = '2.0'
 
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test

Modified: trunk/scipy/ndimage/tests/test_ndimage.py
===================================================================
--- trunk/scipy/ndimage/tests/test_ndimage.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/ndimage/tests/test_ndimage.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -31,7 +31,7 @@
 import math
 import numpy
 from numpy import fft
-from scipy.testing import *
+from numpy.testing import *
 import scipy.ndimage as ndimage
 
 eps = 1e-12

Modified: trunk/scipy/ndimage/tests/test_registration.py
===================================================================
--- trunk/scipy/ndimage/tests/test_registration.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/ndimage/tests/test_registration.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,7 +1,7 @@
 import math
 import numpy as np
 import scipy.ndimage._registration as reg
-from scipy.testing import *
+from numpy.testing import *
 
 def load_desc():
     # this is for a 256x256x90 volume with 0.9375 x 0.9375 * 1.5 mm voxel sizes 

Modified: trunk/scipy/ndimage/tests/test_segment.py
===================================================================
--- trunk/scipy/ndimage/tests/test_segment.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/ndimage/tests/test_segment.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,7 +1,7 @@
 import math
 import numpy as NP
 import scipy.ndimage._segmenter as seg
-from scipy.testing import *
+from numpy.testing import *
 
 def run_sobel():
     img    = seg.build_test_discs()

Modified: trunk/scipy/odr/__init__.py
===================================================================
--- trunk/scipy/odr/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/odr/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -21,6 +21,6 @@
 __all__ = ['odr', 'odr_error', 'odr_stop', 'Data', 'RealData', 'Model',
            'Output', 'ODR', 'odrpack']
 
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test
 #### EOF #######################################################################

Modified: trunk/scipy/odr/tests/test_odr.py
===================================================================
--- trunk/scipy/odr/tests/test_odr.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/odr/tests/test_odr.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -4,7 +4,7 @@
 # Scipy imports.
 import numpy as np
 from numpy import pi
-from scipy.testing import *
+from numpy.testing import *
 from scipy.odr import Data, Model, ODR, RealData, odr_stop
 
 

Modified: trunk/scipy/optimize/__init__.py
===================================================================
--- trunk/scipy/optimize/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/optimize/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -16,6 +16,6 @@
 from slsqp import fmin_slsqp
 
 __all__ = filter(lambda s:not s.startswith('_'),dir())
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test
 bench = Tester().bench

Modified: trunk/scipy/optimize/benchmarks/bench_zeros.py
===================================================================
--- trunk/scipy/optimize/benchmarks/bench_zeros.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/optimize/benchmarks/bench_zeros.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,6 +1,6 @@
 from math import sqrt
 
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.optimize import zeros as cc
 

Modified: trunk/scipy/optimize/tests/test_cobyla.py
===================================================================
--- trunk/scipy/optimize/tests/test_cobyla.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/optimize/tests/test_cobyla.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,6 +1,6 @@
 import math
 
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.optimize import cobyla as co
 

Modified: trunk/scipy/optimize/tests/test_nonlin.py
===================================================================
--- trunk/scipy/optimize/tests/test_nonlin.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/optimize/tests/test_nonlin.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -3,7 +3,7 @@
 May 2007
 """
 
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.optimize import nonlin
 from numpy import matrix, diag

Modified: trunk/scipy/optimize/tests/test_optimize.py
===================================================================
--- trunk/scipy/optimize/tests/test_optimize.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/optimize/tests/test_optimize.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -9,7 +9,7 @@
 
 """
 
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy import optimize
 from scipy.optimize import leastsq

Modified: trunk/scipy/optimize/tests/test_slsqp.py
===================================================================
--- trunk/scipy/optimize/tests/test_slsqp.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/optimize/tests/test_slsqp.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,4 +1,4 @@
-from scipy.testing import *
+from numpy.testing import *
 import numpy as np
 
 from scipy.optimize import  fmin_slsqp

Modified: trunk/scipy/optimize/tests/test_zeros.py
===================================================================
--- trunk/scipy/optimize/tests/test_zeros.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/optimize/tests/test_zeros.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -2,7 +2,7 @@
 
 from math import sqrt
 
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.optimize import zeros as cc
 

Modified: trunk/scipy/sandbox/cdavid/__init__.py
===================================================================
--- trunk/scipy/sandbox/cdavid/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sandbox/cdavid/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -5,5 +5,5 @@
 from autocorr import autocorr_oneside_nofft, autocorr_fft
 from segmentaxis import segment_axis
 
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test

Modified: trunk/scipy/sandbox/cdavid/tests/test_autocorr.py
===================================================================
--- trunk/scipy/sandbox/cdavid/tests/test_autocorr.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sandbox/cdavid/tests/test_autocorr.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 # Last Change: Fri Dec 15 10:00 PM 2006 J
 
-from scipy.testing import *
+from numpy.testing import *
 from numpy.random import randn, seed
 from numpy import correlate, array, concatenate, require, corrcoef
 from numpy.fft import fft, ifft

Modified: trunk/scipy/sandbox/cdavid/tests/test_lpc.py
===================================================================
--- trunk/scipy/sandbox/cdavid/tests/test_lpc.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sandbox/cdavid/tests/test_lpc.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 # Last Change: Tue Nov 28 05:00 PM 2006 J
 
-from scipy.testing import *
+from numpy.testing import *
 from numpy.random import randn, seed
 from numpy import correlate, array, concatenate, require
 

Modified: trunk/scipy/sandbox/cdavid/tests/test_segmentaxis.py
===================================================================
--- trunk/scipy/sandbox/cdavid/tests/test_segmentaxis.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sandbox/cdavid/tests/test_segmentaxis.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 # Last Change: Fri Dec 15 10:00 PM 2006 J
 
-from scipy.testing import *
+from numpy.testing import *
 
 import numpy as N
 

Modified: trunk/scipy/sandbox/exmplpackage/__init__.py
===================================================================
--- trunk/scipy/sandbox/exmplpackage/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sandbox/exmplpackage/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -6,7 +6,7 @@
 from info_exmplpackage import __doc__
 
 # Import testing rig, allowing scipy.examplpackage.test()
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test
 
 # Import symbols from sub-module:

Modified: trunk/scipy/sandbox/exmplpackage/benchmarks/bench_foo.py
===================================================================
--- trunk/scipy/sandbox/exmplpackage/benchmarks/bench_foo.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sandbox/exmplpackage/benchmarks/bench_foo.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -8,7 +8,7 @@
 """
 
 import sys
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.sandbox.exmplpackage.foo import *
 

Modified: trunk/scipy/sandbox/exmplpackage/tests/test_foo.py
===================================================================
--- trunk/scipy/sandbox/exmplpackage/tests/test_foo.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sandbox/exmplpackage/tests/test_foo.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -16,7 +16,7 @@
 """
 
 import sys
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.sandbox.exmplpackage.foo import *
 

Modified: trunk/scipy/sandbox/exmplpackage/yyy/__init__.py
===================================================================
--- trunk/scipy/sandbox/exmplpackage/yyy/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sandbox/exmplpackage/yyy/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -5,7 +5,7 @@
 __all__ = ['fun', 'test']
 
 # Import testing rig, allowing scipy.examplpackage.yyy.test()
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test
 
 def fun():

Modified: trunk/scipy/sandbox/exmplpackage/yyy/tests/test_yyy.py
===================================================================
--- trunk/scipy/sandbox/exmplpackage/yyy/tests/test_yyy.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sandbox/exmplpackage/yyy/tests/test_yyy.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,5 +1,5 @@
 
-from scipy.testing import *
+from numpy.testing import *
 
 from yyy import fun
 

Modified: trunk/scipy/sandbox/fdfpack/tests/test_fdf.py
===================================================================
--- trunk/scipy/sandbox/fdfpack/tests/test_fdf.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sandbox/fdfpack/tests/test_fdf.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,5 +1,5 @@
 
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.sandbox.fdfpack import periodic_finite_difference as diff
 

Modified: trunk/scipy/sandbox/montecarlo/tests/test_dictsampler.py
===================================================================
--- trunk/scipy/sandbox/montecarlo/tests/test_dictsampler.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sandbox/montecarlo/tests/test_dictsampler.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -10,7 +10,7 @@
 from numpy import arange, add, array, dot, zeros, identity
 
 import sys
-from scipy.testing import *
+from numpy.testing import *
 
 from numpy import sum, array, average, sqrt
 #from scipy.montecarlo import *

Modified: trunk/scipy/sandbox/montecarlo/tests/test_intsampler.py
===================================================================
--- trunk/scipy/sandbox/montecarlo/tests/test_intsampler.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sandbox/montecarlo/tests/test_intsampler.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -18,7 +18,7 @@
 from numpy import arange, add, array, dot, zeros, identity
 
 import sys
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.sandbox.montecarlo import *
 from scipy import stats

Modified: trunk/scipy/sandbox/numexpr/tests/test_numexpr.py
===================================================================
--- trunk/scipy/sandbox/numexpr/tests/test_numexpr.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sandbox/numexpr/tests/test_numexpr.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,7 +1,7 @@
 import new
 from numpy import array, arange, sin, zeros, sum, int32, empty, \
      prod, uint16, complex_, float64, rec
-from scipy.testing import *
+from numpy.testing import *
 
 
 from scipy.sandbox.numexpr import E, numexpr, evaluate, disassemble

Modified: trunk/scipy/sandbox/pyloess/tests/test_mpyloess.py
===================================================================
--- trunk/scipy/sandbox/pyloess/tests/test_mpyloess.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sandbox/pyloess/tests/test_mpyloess.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -22,7 +22,7 @@
 marray = maskedarray.masked_array
 masked_values = maskedarray.masked_values
 
-from scipy.testing import *
+from numpy.testing import *
 from scipy.sandbox.maskedarray.testutils import build_err_msg, \
         assert_equal, assert_almost_equal
 

Modified: trunk/scipy/sandbox/pyloess/tests/test_pyloess.py
===================================================================
--- trunk/scipy/sandbox/pyloess/tests/test_pyloess.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sandbox/pyloess/tests/test_pyloess.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -21,7 +21,7 @@
 narray = numpy.array
 
 
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.sandbox.pyloess import lowess, stl, loess, loess_anova
 

Modified: trunk/scipy/sandbox/rbf/__init__.py
===================================================================
--- trunk/scipy/sandbox/rbf/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sandbox/rbf/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -7,5 +7,5 @@
 from rbf import *
 
 __all__ = filter(lambda s:not s.startswith('_'),dir())
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test

Modified: trunk/scipy/sandbox/rbf/tests/test_rbf.py
===================================================================
--- trunk/scipy/sandbox/rbf/tests/test_rbf.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sandbox/rbf/tests/test_rbf.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -2,7 +2,7 @@
 # Created by John Travers, Robert Hetland, 2007
 """ Test functions for rbf module """
 
-from scipy.testing import *
+from numpy.testing import *
 from numpy import linspace, sin, random, exp
 
 

Modified: trunk/scipy/sandbox/spline/__init__.py
===================================================================
--- trunk/scipy/sandbox/spline/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sandbox/spline/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -10,5 +10,5 @@
 from spline import *
 
 __all__ = filter(lambda s:not s.startswith('_'),dir())
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test

Modified: trunk/scipy/sandbox/spline/tests/test_fitpack.py
===================================================================
--- trunk/scipy/sandbox/spline/tests/test_fitpack.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sandbox/spline/tests/test_fitpack.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -12,7 +12,7 @@
 """
 
 import sys
-from scipy.testing import *
+from numpy.testing import *
 from numpy import array, arange, around, pi, sin, ravel, zeros, asarray
 
 

Modified: trunk/scipy/sandbox/spline/tests/test_spline.py
===================================================================
--- trunk/scipy/sandbox/spline/tests/test_spline.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sandbox/spline/tests/test_spline.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -13,7 +13,7 @@
 """
 
 import sys
-from scipy.testing import *
+from numpy.testing import *
 from numpy import array, arange, around, pi, sin, cos
 
 

Modified: trunk/scipy/setup.py
===================================================================
--- trunk/scipy/setup.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/setup.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -23,7 +23,6 @@
     config.add_subpackage('ndimage')
     config.add_subpackage('stsci')
     config.add_subpackage('weave')
-    config.add_subpackage('testing')
     config.make_svn_version_py()  # installs __svn_version__.py
     config.make_config_py()
     return config

Modified: trunk/scipy/setupscons.py
===================================================================
--- trunk/scipy/setupscons.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/setupscons.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -22,7 +22,6 @@
     config.add_subpackage('ndimage')
     config.add_subpackage('stsci')
     config.add_subpackage('weave')
-    config.add_subpackage('testing')
     config.make_svn_version_py()  # installs __svn_version__.py
     config.scons_make_config_py() # installs __config__.py
     return config

Modified: trunk/scipy/signal/__init__.py
===================================================================
--- trunk/scipy/signal/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/signal/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -13,5 +13,5 @@
 from wavelets import *
 
 __all__ = filter(lambda s:not s.startswith('_'),dir())
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test

Modified: trunk/scipy/signal/tests/test_signaltools.py
===================================================================
--- trunk/scipy/signal/tests/test_signaltools.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/signal/tests/test_signaltools.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,6 +1,6 @@
 #this program corresponds to special.py
 
-from scipy.testing import *
+from numpy.testing import *
 
 import scipy.signal as signal
 

Modified: trunk/scipy/signal/tests/test_wavelets.py
===================================================================
--- trunk/scipy/signal/tests/test_wavelets.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/signal/tests/test_wavelets.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,5 +1,5 @@
 import numpy as N
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.signal import wavelets
 

Modified: trunk/scipy/sparse/__init__.py
===================================================================
--- trunk/scipy/sparse/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sparse/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -17,6 +17,6 @@
 #from spfuncs import *
 
 __all__ = filter(lambda s:not s.startswith('_'),dir())
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test
 bench = Tester().bench

Modified: trunk/scipy/sparse/benchmarks/bench_sparse.py
===================================================================
--- trunk/scipy/sparse/benchmarks/bench_sparse.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sparse/benchmarks/bench_sparse.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -5,7 +5,7 @@
 import numpy
 from numpy import ones, array, asarray, empty
 
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy import sparse
 from scipy.sparse import csc_matrix, csr_matrix, dok_matrix, \

Modified: trunk/scipy/sparse/linalg/__init__.py
===================================================================
--- trunk/scipy/sparse/linalg/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sparse/linalg/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -9,6 +9,6 @@
 
 
 __all__ = filter(lambda s:not s.startswith('_'),dir())
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test
 bench = Tester().bench

Modified: trunk/scipy/sparse/linalg/dsolve/__init__.py
===================================================================
--- trunk/scipy/sparse/linalg/dsolve/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sparse/linalg/dsolve/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -9,5 +9,5 @@
 from linsolve import *
 
 __all__ = filter(lambda s:not s.startswith('_'),dir())
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test

Modified: trunk/scipy/sparse/linalg/dsolve/tests/test_linsolve.py
===================================================================
--- trunk/scipy/sparse/linalg/dsolve/tests/test_linsolve.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sparse/linalg/dsolve/tests/test_linsolve.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,7 +1,7 @@
 import warnings
 
 from numpy import array, finfo
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.linalg import norm, inv
 from scipy.sparse import spdiags, csc_matrix, SparseEfficiencyWarning

Modified: trunk/scipy/sparse/linalg/dsolve/umfpack/__init__.py
===================================================================
--- trunk/scipy/sparse/linalg/dsolve/umfpack/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sparse/linalg/dsolve/umfpack/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -3,5 +3,5 @@
 from umfpack import *
 
 __all__ = filter(lambda s:not s.startswith('_'),dir())
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test

Modified: trunk/scipy/sparse/linalg/dsolve/umfpack/tests/test_umfpack.py
===================================================================
--- trunk/scipy/sparse/linalg/dsolve/umfpack/tests/test_umfpack.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sparse/linalg/dsolve/umfpack/tests/test_umfpack.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -10,7 +10,7 @@
 from numpy import transpose, array, arange
 
 import random
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy import rand, matrix, diag, eye
 from scipy.sparse import csc_matrix, dok_matrix, spdiags, SparseEfficiencyWarning

Modified: trunk/scipy/sparse/linalg/eigen/__init__.py
===================================================================
--- trunk/scipy/sparse/linalg/eigen/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sparse/linalg/eigen/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -6,6 +6,6 @@
 from lobpcg import *
 
 __all__ = filter(lambda s:not s.startswith('_'),dir())
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test
 bench = Tester().bench

Modified: trunk/scipy/sparse/linalg/eigen/arpack/tests/test_arpack.py
===================================================================
--- trunk/scipy/sparse/linalg/eigen/arpack/tests/test_arpack.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sparse/linalg/eigen/arpack/tests/test_arpack.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -5,7 +5,7 @@
 
 """
 
-from scipy.testing import *
+from numpy.testing import *
 
 from numpy import array,real,imag,finfo,concatenate,\
     column_stack,argsort,dot,round,conj,sort,random

Modified: trunk/scipy/sparse/linalg/eigen/arpack/tests/test_speigs.py
===================================================================
--- trunk/scipy/sparse/linalg/eigen/arpack/tests/test_speigs.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sparse/linalg/eigen/arpack/tests/test_speigs.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.sparse.linalg.interface import aslinearoperator
 from scipy.sparse.linalg.eigen.arpack.speigs import *

Modified: trunk/scipy/sparse/linalg/eigen/lobpcg/__init__.py
===================================================================
--- trunk/scipy/sparse/linalg/eigen/lobpcg/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sparse/linalg/eigen/lobpcg/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -7,5 +7,5 @@
 
 from lobpcg import *
 
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test

Modified: trunk/scipy/sparse/linalg/eigen/lobpcg/tests/test_lobpcg.py
===================================================================
--- trunk/scipy/sparse/linalg/eigen/lobpcg/tests/test_lobpcg.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sparse/linalg/eigen/lobpcg/tests/test_lobpcg.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -3,7 +3,7 @@
 """
 
 import numpy
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy import array, arange, ones, sort, cos, pi, rand, \
      set_printoptions, r_, diag, linalg

Modified: trunk/scipy/sparse/linalg/isolve/__init__.py
===================================================================
--- trunk/scipy/sparse/linalg/isolve/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sparse/linalg/isolve/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -5,6 +5,6 @@
 from minres import minres
 
 __all__ = filter(lambda s:not s.startswith('_'),dir())
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test
 bench = Tester().bench

Modified: trunk/scipy/sparse/linalg/isolve/tests/test_iterative.py
===================================================================
--- trunk/scipy/sparse/linalg/isolve/tests/test_iterative.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sparse/linalg/isolve/tests/test_iterative.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -2,7 +2,7 @@
 """ Test functions for the sparse.linalg.isolve module
 """
 
-from scipy.testing import *
+from numpy.testing import *
 
 from numpy import zeros, dot, diag, ones, arange, array
 from numpy.random import rand

Modified: trunk/scipy/sparse/linalg/tests/test_interface.py
===================================================================
--- trunk/scipy/sparse/linalg/tests/test_interface.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sparse/linalg/tests/test_interface.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -2,7 +2,7 @@
 """ Test functions for the sparse.linalg.interface module
 """
 
-from scipy.testing import *
+from numpy.testing import *
 
 import numpy
 from numpy import array, matrix, ones, ravel

Modified: trunk/scipy/sparse/tests/test_base.py
===================================================================
--- trunk/scipy/sparse/tests/test_base.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sparse/tests/test_base.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -20,7 +20,7 @@
         asarray, vstack, ndarray, transpose, diag
 
 import random
-from scipy.testing import *
+from numpy.testing import *
 
 import scipy.sparse as sparse
 from scipy.sparse import csc_matrix, csr_matrix, dok_matrix, \

Modified: trunk/scipy/sparse/tests/test_construct.py
===================================================================
--- trunk/scipy/sparse/tests/test_construct.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sparse/tests/test_construct.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -2,7 +2,7 @@
 
 import numpy
 from numpy import array, matrix
-from scipy.testing import *
+from numpy.testing import *
 
 
 from scipy.sparse import csr_matrix, coo_matrix

Modified: trunk/scipy/sparse/tests/test_extract.py
===================================================================
--- trunk/scipy/sparse/tests/test_extract.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sparse/tests/test_extract.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -2,7 +2,7 @@
 
 import numpy
 from numpy import array, matrix
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.sparse import csr_matrix
 

Modified: trunk/scipy/sparse/tests/test_spfuncs.py
===================================================================
--- trunk/scipy/sparse/tests/test_spfuncs.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sparse/tests/test_spfuncs.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,5 +1,5 @@
 from numpy import array, kron, matrix, diag
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.sparse.spfuncs import *
 from scipy.sparse import csr_matrix, csc_matrix, bsr_matrix

Modified: trunk/scipy/sparse/tests/test_sputils.py
===================================================================
--- trunk/scipy/sparse/tests/test_sputils.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/sparse/tests/test_sputils.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,7 +1,7 @@
 """unit tests for sparse utility functions"""
 
 import numpy as np
-from scipy.testing import *
+from numpy.testing import *
 from scipy.sparse.sputils import *
 
 

Modified: trunk/scipy/special/__init__.py
===================================================================
--- trunk/scipy/special/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/special/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -19,5 +19,5 @@
 register_func('i0',i0)
 del register_func
 
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test

Modified: trunk/scipy/special/tests/test_basic.py
===================================================================
--- trunk/scipy/special/tests/test_basic.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/special/tests/test_basic.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -34,7 +34,7 @@
 
 from numpy import dot, array
 
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.special import *
 import scipy.special._cephes as cephes

Modified: trunk/scipy/special/tests/test_spfun_stats.py
===================================================================
--- trunk/scipy/special/tests/test_spfun_stats.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/special/tests/test_spfun_stats.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,5 +1,5 @@
 import numpy as N
-from scipy.testing import *
+from numpy.testing import *
 
 
 from scipy.special import gammaln, multigammaln

Modified: trunk/scipy/stats/__init__.py
===================================================================
--- trunk/scipy/stats/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/stats/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -11,5 +11,5 @@
 from kde import gaussian_kde
 
 __all__ = filter(lambda s:not s.startswith('_'),dir())
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test

Modified: trunk/scipy/stats/models/__init__.py
===================================================================
--- trunk/scipy/stats/models/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/stats/models/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -16,5 +16,5 @@
 
 __all__ = filter(lambda s:not s.startswith('_'),dir())
 
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test

Modified: trunk/scipy/stats/models/tests/test_bspline.py
===================================================================
--- trunk/scipy/stats/models/tests/test_bspline.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/stats/models/tests/test_bspline.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -3,7 +3,7 @@
 """
 
 import numpy as N
-from scipy.testing import *
+from numpy.testing import *
 
 import scipy.stats.models as S
 try:

Modified: trunk/scipy/stats/models/tests/test_formula.py
===================================================================
--- trunk/scipy/stats/models/tests/test_formula.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/stats/models/tests/test_formula.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -7,7 +7,7 @@
 import numpy as N
 import numpy.random as R
 import numpy.linalg as L
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.stats.models import utils, formula, contrast
 

Modified: trunk/scipy/stats/models/tests/test_glm.py
===================================================================
--- trunk/scipy/stats/models/tests/test_glm.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/stats/models/tests/test_glm.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -4,7 +4,7 @@
 
 import numpy as N
 import numpy.random as R
-from scipy.testing import *
+from numpy.testing import *
 
 import scipy.stats.models as S
 import scipy.stats.models.glm as models

Modified: trunk/scipy/stats/models/tests/test_regression.py
===================================================================
--- trunk/scipy/stats/models/tests/test_regression.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/stats/models/tests/test_regression.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -3,7 +3,7 @@
 """
 
 from numpy.random import standard_normal
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.stats.models.regression import OLSModel, ARModel
 

Modified: trunk/scipy/stats/models/tests/test_rlm.py
===================================================================
--- trunk/scipy/stats/models/tests/test_rlm.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/stats/models/tests/test_rlm.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -3,7 +3,7 @@
 """
 
 import numpy.random as R
-from scipy.testing import *
+from numpy.testing import *
 
 import scipy.stats.models.rlm as models
 

Modified: trunk/scipy/stats/models/tests/test_scale.py
===================================================================
--- trunk/scipy/stats/models/tests/test_scale.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/stats/models/tests/test_scale.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -3,7 +3,7 @@
 """
 
 import numpy.random as R
-from scipy.testing import *
+from numpy.testing import *
 
 import scipy.stats.models.robust.scale as scale
 

Modified: trunk/scipy/stats/models/tests/test_utils.py
===================================================================
--- trunk/scipy/stats/models/tests/test_utils.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/stats/models/tests/test_utils.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -4,7 +4,7 @@
 
 import numpy as N
 import numpy.random as R
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.stats.models import utils
 

Modified: trunk/scipy/stats/morestats.py
===================================================================
--- trunk/scipy/stats/morestats.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/stats/morestats.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -17,7 +17,7 @@
 import scipy.special as special
 import futil
 import numpy as sb
-from scipy.testing.decorators import setastest
+from numpy.testing.decorators import setastest
 
 __all__ = ['find_repeats',
            'bayes_mvs', 'kstat', 'kstatvar', 'probplot', 'ppcc_max', 'ppcc_plot',

Modified: trunk/scipy/stats/tests/test_distributions.py
===================================================================
--- trunk/scipy/stats/tests/test_distributions.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/stats/tests/test_distributions.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -2,7 +2,7 @@
 
 """
 
-from scipy.testing import *
+from numpy.testing import *
 
 
 import numpy

Modified: trunk/scipy/stats/tests/test_mmorestats.py
===================================================================
--- trunk/scipy/stats/tests/test_mmorestats.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/stats/tests/test_mmorestats.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -14,7 +14,7 @@
 import scipy.stats.mstats as ms
 import scipy.stats.mmorestats as mms
 
-from scipy.testing import *
+from numpy.testing import *
 
 
 class TestMisc(TestCase):

Modified: trunk/scipy/stats/tests/test_morestats.py
===================================================================
--- trunk/scipy/stats/tests/test_morestats.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/stats/tests/test_morestats.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,7 +1,7 @@
 # Author:  Travis Oliphant, 2002
 #
 
-from scipy.testing import *
+from numpy.testing import *
 
 
 import scipy.stats as stats

Modified: trunk/scipy/stats/tests/test_mstats.py
===================================================================
--- trunk/scipy/stats/tests/test_mstats.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/stats/tests/test_mstats.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -9,7 +9,7 @@
 from numpy.ma import masked, nomask
 
 import scipy.stats.mstats as mstats
-from scipy.testing import *
+from numpy.testing import *
 from numpy.ma.testutils import assert_equal, assert_almost_equal, \
     assert_array_almost_equal
 

Modified: trunk/scipy/stats/tests/test_stats.py
===================================================================
--- trunk/scipy/stats/tests/test_stats.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/stats/tests/test_stats.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -7,7 +7,7 @@
 """
 
 import sys
-from scipy.testing import *
+from numpy.testing import *
 from numpy import array, arange, zeros, ravel, float32, float64, power
 import numpy
 

Modified: trunk/scipy/weave/__init__.py
===================================================================
--- trunk/scipy/weave/__init__.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/weave/__init__.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -18,5 +18,5 @@
 except:
     pass
 
-from scipy.testing.pkgtester import Tester
+from numpy.testing import Tester
 test = Tester().test

Modified: trunk/scipy/weave/tests/test_ast_tools.py
===================================================================
--- trunk/scipy/weave/tests/test_ast_tools.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/weave/tests/test_ast_tools.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,4 +1,4 @@
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.weave import ast_tools
 

Modified: trunk/scipy/weave/tests/test_blitz_tools.py
===================================================================
--- trunk/scipy/weave/tests/test_blitz_tools.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/weave/tests/test_blitz_tools.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -4,7 +4,7 @@
 from numpy import dot, float32, float64, complex64, complex128, \
      zeros, random, array, sum, abs, allclose
 
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.weave import blitz_tools
 from scipy.weave.ast_tools import harvest_variables

Modified: trunk/scipy/weave/tests/test_build_tools.py
===================================================================
--- trunk/scipy/weave/tests/test_build_tools.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/weave/tests/test_build_tools.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -4,7 +4,7 @@
 
 import os, sys, tempfile
 
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.weave import build_tools
 

Modified: trunk/scipy/weave/tests/test_c_spec.py
===================================================================
--- trunk/scipy/weave/tests/test_c_spec.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/weave/tests/test_c_spec.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -9,7 +9,7 @@
 global test_dir
 test_dir = ''
 
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.weave import inline_tools,ext_tools,c_spec
 from scipy.weave.build_tools import msvc_exists, gcc_exists

Modified: trunk/scipy/weave/tests/test_catalog.py
===================================================================
--- trunk/scipy/weave/tests/test_catalog.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/weave/tests/test_catalog.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -2,7 +2,7 @@
 import os
 
 
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.weave import catalog
 

Modified: trunk/scipy/weave/tests/test_ext_tools.py
===================================================================
--- trunk/scipy/weave/tests/test_ext_tools.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/weave/tests/test_ext_tools.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,7 +1,7 @@
 
 import time
 
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.weave import ext_tools, c_spec
 try:

Modified: trunk/scipy/weave/tests/test_inline_tools.py
===================================================================
--- trunk/scipy/weave/tests/test_inline_tools.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/weave/tests/test_inline_tools.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,7 +1,7 @@
 
 from numpy import *
 
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.weave import inline_tools
 

Modified: trunk/scipy/weave/tests/test_numpy_scalar_spec.py
===================================================================
--- trunk/scipy/weave/tests/test_numpy_scalar_spec.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/weave/tests/test_numpy_scalar_spec.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -10,7 +10,7 @@
 test_dir = ''
 
 import numpy
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.weave import inline_tools,ext_tools
 from scipy.weave.build_tools import msvc_exists, gcc_exists

Modified: trunk/scipy/weave/tests/test_scxx.py
===================================================================
--- trunk/scipy/weave/tests/test_scxx.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/weave/tests/test_scxx.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -4,7 +4,7 @@
 import time
 import os,sys
 
-from scipy.testing import *
+from numpy.testing import *
 set_local_path()
 from test_scxx_object import *
 from test_scxx_sequence import *

Modified: trunk/scipy/weave/tests/test_scxx_dict.py
===================================================================
--- trunk/scipy/weave/tests/test_scxx_dict.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/weave/tests/test_scxx_dict.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -4,7 +4,7 @@
 import os
 import sys
 
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.weave import inline_tools
 

Modified: trunk/scipy/weave/tests/test_scxx_object.py
===================================================================
--- trunk/scipy/weave/tests/test_scxx_object.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/weave/tests/test_scxx_object.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -4,7 +4,7 @@
 import os
 import sys
 
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.weave import inline_tools
 

Modified: trunk/scipy/weave/tests/test_scxx_sequence.py
===================================================================
--- trunk/scipy/weave/tests/test_scxx_sequence.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/weave/tests/test_scxx_sequence.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -4,7 +4,7 @@
 import time
 import os,sys
 
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.weave import inline_tools
 

Modified: trunk/scipy/weave/tests/test_size_check.py
===================================================================
--- trunk/scipy/weave/tests/test_size_check.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/weave/tests/test_size_check.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,6 +1,6 @@
 import os
 from numpy import *
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.weave import size_check
 from scipy.weave.ast_tools import *

Modified: trunk/scipy/weave/tests/test_slice_handler.py
===================================================================
--- trunk/scipy/weave/tests/test_slice_handler.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/weave/tests/test_slice_handler.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,5 +1,5 @@
 
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.weave import slice_handler
 from scipy.weave.slice_handler import indexed_array_pattern

Modified: trunk/scipy/weave/tests/test_standard_array_spec.py
===================================================================
--- trunk/scipy/weave/tests/test_standard_array_spec.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/weave/tests/test_standard_array_spec.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -1,6 +1,6 @@
 
 from numpy import *
-from scipy.testing import *
+from numpy.testing import *
 
 from scipy.weave import standard_array_spec
 

Modified: trunk/scipy/weave/tests/test_wx_spec.py
===================================================================
--- trunk/scipy/weave/tests/test_wx_spec.py	2008-07-15 12:22:24 UTC (rev 4544)
+++ trunk/scipy/weave/tests/test_wx_spec.py	2008-07-16 00:26:23 UTC (rev 4545)
@@ -8,7 +8,7 @@
                 then returned as a function return value correctly
 """
 
-from scipy.testing import *
+from numpy.testing import *
 
 e = None
 DONOTRUN = False

