scipy_test -> scipy.test

Lib/fftpack/NOTES.txt

@@ -23,9 +23,6 @@ Run
 Testing
 =======
 
-To test fftpack, you'll need scipy_test package installed (this is
-provided by scipy_core package).
-
 Run
 
 ::

Lib/interpolate/tests/demos_xplt.py

@@ -10,7 +10,7 @@
 """
 
 import sys
-from scipy_test.testing import set_package_path
+from scipy.test.testing import set_package_path
 set_package_path()
 from interpolate.fitpack2 import UnivariateSpline,LSQUnivariateSpline,\
      InterpolatedUnivariateSpline

Lib/tests/test_basic1a.py

@@ -4,8 +4,8 @@
 
 import unittest
 import scipy.base.limits as limits
-from scipy_test.testing import assert_array_equal, assert_equal
-from scipy_test.testing import assert_almost_equal, assert_array_almost_equal
+from scipy.test.testing import assert_array_equal, assert_equal
+from scipy.test.testing import assert_almost_equal, assert_array_almost_equal
 from scipy import *
 
 ##################################################

Lib/tests/test_common.py

@@ -4,8 +4,8 @@
 
 import unittest
 import scipy.base.limits as limits
-from scipy_test.testing import assert_array_equal, assert_equal
-from scipy_test.testing import assert_almost_equal, assert_array_almost_equal
+from scipy.test.testing import assert_array_equal, assert_equal
+from scipy.test.testing import assert_almost_equal, assert_array_almost_equal
 from scipy.base import sqrt, product, add,  ravel, mgrid
 from scipy import rand,randn,comb,factorial
 

Lib/utils/common.py

@@ -293,10 +293,10 @@ def who(vardict=None):
 #-----------------------------------------------------------------------------
 
 def test(level=10):
-    from scipy_test.testing import module_test
+    from scipy.test.testing import module_test
     module_test(__name__,__file__,level=level)
 
 def test_suite(level=1):
-    from scipy_test.testing import module_test_suite
+    from scipy.test.testing import module_test_suite
     return module_test_suite(__name__,__file__,level=level)
 

TOCHANGE.txt

@@ -3,8 +3,8 @@ Changes needed to convert scipy to work with the new scipy core.
 done * scipy_distutils and scipy_base to scipy.disutils and scipy.base
 done * Numeric/arrayobject.h to scipy/arrayobject.h
 done * Numeric/ufuncobject.h to scipy/ufuncobject.h
-* scipy_test to scipy.test
-* Look for use of descr->zero and descr->ones --- need to be replaced
+done * scipy_test to scipy.test
+done * Look for use of descr->zero and descr->ones --- need to be replaced
 * Change use of default_config_dict to Configuration