summaryrefslogtreecommitdiff
path: root/numpy/testing
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-01-04 19:00:27 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-01-04 19:00:27 +0000
commite706c7d92c4ee41e8e995fb3838bd0931b57efb5 (patch)
tree015a057d49422774e49ed211a37c14105d03a713 /numpy/testing
parentc14d4fe25cb5cd482369734dd487ac8f376851c9 (diff)
downloadnumpy-e706c7d92c4ee41e8e995fb3838bd0931b57efb5.tar.gz
Changed all references to scipy to numpy
Diffstat (limited to 'numpy/testing')
-rw-r--r--numpy/testing/__init__.py2
-rw-r--r--numpy/testing/scipytest.py2
-rwxr-xr-xnumpy/testing/setup.py8
3 files changed, 6 insertions, 6 deletions
diff --git a/numpy/testing/__init__.py b/numpy/testing/__init__.py
index a0a1405f0..028890a49 100644
--- a/numpy/testing/__init__.py
+++ b/numpy/testing/__init__.py
@@ -1,4 +1,4 @@
from info import __doc__
-from scipytest import *
+from numpytest import *
from utils import *
diff --git a/numpy/testing/scipytest.py b/numpy/testing/scipytest.py
index b2aea7b72..d23b6f0e4 100644
--- a/numpy/testing/scipytest.py
+++ b/numpy/testing/scipytest.py
@@ -207,7 +207,7 @@ class ScipyTest:
"""
def __init__(self, package=None):
if package is None:
- from scipy.distutils.misc_util import get_frame
+ from numpy.distutils.misc_util import get_frame
f = get_frame(1)
package = f.f_locals['__name__']
self.package = package
diff --git a/numpy/testing/setup.py b/numpy/testing/setup.py
index 0f7764f07..96647f84e 100755
--- a/numpy/testing/setup.py
+++ b/numpy/testing/setup.py
@@ -1,16 +1,16 @@
#!/usr/bin/env python
def configuration(parent_package='',top_path=None):
- from scipy.distutils.misc_util import Configuration
+ from numpy.distutils.misc_util import Configuration
config = Configuration('testing',parent_package,top_path)
return config
if __name__ == '__main__':
- from scipy.distutils.core import setup
+ from numpy.distutils.core import setup
setup(maintainer = "SciPy Developers",
- maintainer_email = "scipy-dev@scipy.org",
+ maintainer_email = "numpy-dev@numpy.org",
description = "SciPy test module",
- url = "http://www.scipy.org",
+ url = "http://www.numpy.org",
license = "SciPy License (BSD Style)",
**configuration(top_path='').todict()
)