diff options
| author | rgommers <ralf.gommers@googlemail.com> | 2011-03-07 09:38:32 +0800 |
|---|---|---|
| committer | rgommers <ralf.gommers@googlemail.com> | 2011-03-11 12:27:02 +0800 |
| commit | 083f6e1933dc244db6a97b49830071be6aa6555c (patch) | |
| tree | 6234a45e7085b9f0b6e9364d80e8a640c369a9c4 | |
| parent | 44ae46c70d0b9cb4909bfafe1e4dbef3cd90f5b9 (diff) | |
| download | numpy-083f6e1933dc244db6a97b49830071be6aa6555c.tar.gz | |
DEP: remove deprecated get_numpy_include.
| -rwxr-xr-x | doc/swig/test/setup.py | 7 | ||||
| -rw-r--r-- | numpy/lib/tests/test_regression.py | 4 | ||||
| -rw-r--r-- | numpy/lib/utils.py | 3 |
3 files changed, 4 insertions, 10 deletions
diff --git a/doc/swig/test/setup.py b/doc/swig/test/setup.py index fadf8b5cd..f2fc29aac 100755 --- a/doc/swig/test/setup.py +++ b/doc/swig/test/setup.py @@ -7,11 +7,8 @@ from distutils import sysconfig # Third-party modules - we depend on numpy for everything import numpy -# Obtain the numpy include directory. This logic works across numpy versions. -try: - numpy_include = numpy.get_include() -except AttributeError: - numpy_include = numpy.get_numpy_include() +# Obtain the numpy include directory. +numpy_include = numpy.get_include() # Array extension module _Array = Extension("_Array", diff --git a/numpy/lib/tests/test_regression.py b/numpy/lib/tests/test_regression.py index 0e63fb08c..ea4d75f6b 100644 --- a/numpy/lib/tests/test_regression.py +++ b/numpy/lib/tests/test_regression.py @@ -172,13 +172,11 @@ class TestRegression(TestCase): """Ticket #1387: empty array as input for bincount.""" assert_raises(ValueError, lambda : np.bincount(np.array([], dtype=np.intp))) - @dec.deprecated() 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(), - np.get_numpy_include()] + include_dirs = [np.get_include(), np.get_numarray_include()] for path in include_dirs: assert_(isinstance(path, (str, unicode))) assert_(path != '') diff --git a/numpy/lib/utils.py b/numpy/lib/utils.py index fb597a7ed..1e7364adc 100644 --- a/numpy/lib/utils.py +++ b/numpy/lib/utils.py @@ -6,7 +6,7 @@ import re from numpy.core.numerictypes import issubclass_, issubsctype, issubdtype from numpy.core import product, ndarray, ufunc -__all__ = ['issubclass_', 'get_numpy_include', 'issubsctype', 'issubdtype', +__all__ = ['issubclass_', 'issubsctype', 'issubdtype', 'deprecate', 'deprecate_with_doc', 'get_numarray_include', 'get_include', 'info', 'source', 'who', 'lookfor', 'byte_bounds', 'may_share_memory', 'safe_eval'] @@ -215,7 +215,6 @@ def deprecate(*args, **kwargs): return _Deprecate(*args, **kwargs) deprecate_with_doc = lambda msg: _Deprecate(message=msg) -get_numpy_include = deprecate(get_include, 'get_numpy_include', 'get_include') #-------------------------------------------- |