DEP, MAINT: Remove references to numeric and numarray.

This covers those locations that either import or build numarray
or numeric.

6 files changed, 4 insertions, 19 deletions

diff --git a/numpy/bento.info b/numpy/bento.info
index 4235be897..1bed9c711 100644
--- a/numpy/bento.info
+++ b/numpy/bento.info
@@ -17,8 +17,6 @@ Library:
         linalg,
         ma,
         matrixlib,
-        numarray,
-        oldnumeric,
         polynomial,
         random,
         testing
diff --git a/numpy/core/setup.py b/numpy/core/setup.py
index 576b7d5ff..8c6c287a1 100644
--- a/numpy/core/setup.py
+++ b/numpy/core/setup.py
@@ -762,7 +762,6 @@ def configuration(parent_package='',top_path=None):
             join('include', 'numpy', 'arrayscalars.h'),
             join('include', 'numpy', 'noprefix.h'),
             join('include', 'numpy', 'npy_interrupt.h'),
-            join('include', 'numpy', 'oldnumeric.h'),
             join('include', 'numpy', 'npy_3kcompat.h'),
             join('include', 'numpy', 'npy_math.h'),
             join('include', 'numpy', 'halffloat.h'),
diff --git a/numpy/core/tests/test_regression.py b/numpy/core/tests/test_regression.py
index 7118af8c3..f3f881aad 100644
--- a/numpy/core/tests/test_regression.py
+++ b/numpy/core/tests/test_regression.py
@@ -1419,12 +1419,6 @@ class TestRegression(TestCase):
         x = np.array([1, 2, 3], dtype=np.dtype('<i4'))
         assert_equal(md5(x).hexdigest(), '2a1dd1e1e59d0a384c26951e316cd7e6')
 
-    def test_numeric_handleError(self):
-        """Ticket #1405"""
-        from numpy import numarray
-        # Just make sure this doesn't throw an exception
-        numarray.handleError(0, "")
-
     def test_0d_string_scalar(self):
         # Bug #1436; the following should succeed
         np.asarray('x', '>c')
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py
index f77e52592..c146178f0 100644
--- a/numpy/distutils/misc_util.py
+++ b/numpy/distutils/misc_util.py
@@ -1294,10 +1294,6 @@ class Configuration(object):
         else:
             self.include_dirs.extend(include_dirs)
 
-    def add_numarray_include_dirs(self):
-        import numpy.numarray.util as nnu
-        self.add_include_dirs(*nnu.get_numarray_include_dirs())
-
     def add_headers(self,*files):
         """Add installable headers to configuration.
 
diff --git a/numpy/lib/tests/test_regression.py b/numpy/lib/tests/test_regression.py
index 7d4487342..43c0d8636 100644
--- a/numpy/lib/tests/test_regression.py
+++ b/numpy/lib/tests/test_regression.py
@@ -180,10 +180,10 @@ class TestRegression(TestCase):
             sys.stdout = oldstdout
 
     def test_include_dirs(self):
-        """As a sanity check, just test that get_include and
-        get_numarray_include include something reasonable.  Somewhat
-        related to ticket #1405."""
-        include_dirs = [np.get_include(), np.get_numarray_include()]
+        # As a sanity check, just test that get_include
+        # includes something reasonable.  Somewhat
+        # related to ticket #1405."""
+        include_dirs = [np.get_include()]
         for path in include_dirs:
             assert_(isinstance(path, (str, unicode)))
             assert_(path != '')
diff --git a/numpy/setup.py b/numpy/setup.py
index 13ae7b3f2..2c3846271 100644
--- a/numpy/setup.py
+++ b/numpy/setup.py
@@ -10,8 +10,6 @@ def configuration(parent_package='',top_path=None):
     config.add_subpackage('f2py')
     config.add_subpackage('core')
     config.add_subpackage('lib')
-    config.add_subpackage('oldnumeric')
-    config.add_subpackage('numarray')
     config.add_subpackage('fft')
     config.add_subpackage('linalg')
     config.add_subpackage('random')