diff options
| -rw-r--r-- | numpy/distutils/cpuinfo.py | 2 | ||||
| -rw-r--r-- | numpy/distutils/system_info.py | 2 | ||||
| -rw-r--r-- | numpy/testing/numpytest.py | 6 | ||||
| -rwxr-xr-x | numpy/testing/setup.py | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/numpy/distutils/cpuinfo.py b/numpy/distutils/cpuinfo.py index 692876f95..70b3409a1 100644 --- a/numpy/distutils/cpuinfo.py +++ b/numpy/distutils/cpuinfo.py @@ -5,7 +5,7 @@ cpuinfo Copyright 2002 Pearu Peterson all rights reserved, Pearu Peterson <pearu@cens.ioc.ee> Permission to use, modify, and distribute this software is given under the -terms of the SciPy (BSD style) license. See LICENSE.txt that came with +terms of the NumPy (BSD style) license. See LICENSE.txt that came with this distribution for specifics. Note: This should be merged into proc at some point. Perhaps proc should diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py index 4899c8a5e..4f472b93a 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py @@ -104,7 +104,7 @@ Authors: Copyright 2002 Pearu Peterson all rights reserved, Pearu Peterson <pearu@cens.ioc.ee> Permission to use, modify, and distribute this software is given under the -terms of the SciPy (BSD style) license. See LICENSE.txt that came with +terms of the NumPy (BSD style) license. See LICENSE.txt that came with this distribution for specifics. NO WARRANTY IS EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK. diff --git a/numpy/testing/numpytest.py b/numpy/testing/numpytest.py index 9ac6661b9..f19fce342 100644 --- a/numpy/testing/numpytest.py +++ b/numpy/testing/numpytest.py @@ -211,7 +211,7 @@ def _get_all_method_names(cls): # for debug build--check for memory leaks during the test. -class _SciPyTextTestResult(unittest._TextTestResult): +class _NumPyTextTestResult(unittest._TextTestResult): def startTest(self, test): unittest._TextTestResult.startTest(self, test) if self.showAll: @@ -228,9 +228,9 @@ class _SciPyTextTestResult(unittest._TextTestResult): sys.gettotalrefcount())) return -class SciPyTextTestRunner(unittest.TextTestRunner): +class NumPyTextTestRunner(unittest.TextTestRunner): def _makeResult(self): - return _SciPyTextTestResult(self.stream, self.descriptions, self.verbosity) + return _NumPyTextTestResult(self.stream, self.descriptions, self.verbosity) class NumpyTest: diff --git a/numpy/testing/setup.py b/numpy/testing/setup.py index 96647f84e..e84dcb292 100755 --- a/numpy/testing/setup.py +++ b/numpy/testing/setup.py @@ -7,10 +7,10 @@ def configuration(parent_package='',top_path=None): if __name__ == '__main__': from numpy.distutils.core import setup - setup(maintainer = "SciPy Developers", + setup(maintainer = "NumPy Developers", maintainer_email = "numpy-dev@numpy.org", - description = "SciPy test module", + description = "NumPy test module", url = "http://www.numpy.org", - license = "SciPy License (BSD Style)", + license = "NumPy License (BSD Style)", **configuration(top_path='').todict() ) |