TST, MAINT: Add `__init__.py` files to tests directories.

This allows pytest to run with duplicate test file names. Note that
`python <path-to-test-file>` no longer works with this change, nor will
a simple `pytest numpy`, because numpy is imported from the numpy
repository. However, `python runtests.py` and `>>> numpy.test()` are
still available.

31 files changed, 18 insertions, 18 deletions

diff --git a/numpy/compat/tests/__init__.py b/numpy/compat/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/numpy/compat/tests/__init__.py
diff --git a/numpy/core/tests/__init__.py b/numpy/core/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/numpy/core/tests/__init__.py
diff --git a/numpy/core/tests/test_longdouble.py b/numpy/core/tests/test_longdouble.py
index ffdf51859..625d40c1b 100644
--- a/numpy/core/tests/test_longdouble.py
+++ b/numpy/core/tests/test_longdouble.py
@@ -7,7 +7,7 @@ from numpy.testing import (
     run_module_suite, assert_, assert_equal, dec, assert_raises,
     assert_array_equal, temppath,
 )
-from test_print import in_foreign_locale
+from .test_print import in_foreign_locale
 
 LD_INFO = np.finfo(np.longdouble)
 longdouble_longer_than_double = (LD_INFO.eps < np.finfo(np.double).eps)
diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py
index eb9fa25cf..e7da5d70a 100644
--- a/numpy/core/tests/test_multiarray.py
+++ b/numpy/core/tests/test_multiarray.py
@@ -22,7 +22,7 @@ from decimal import Decimal
 
 import numpy as np
 from numpy.compat import strchar, unicode
-from test_print import in_foreign_locale
+from .test_print import in_foreign_locale
 from numpy.core.multiarray_tests import (
     test_neighborhood_iterator, test_neighborhood_iterator_oob,
     test_pydatamem_seteventhook_start, test_pydatamem_seteventhook_end,
diff --git a/numpy/distutils/tests/__init__.py b/numpy/distutils/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/numpy/distutils/tests/__init__.py
diff --git a/numpy/f2py/tests/__init__.py b/numpy/f2py/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/numpy/f2py/tests/__init__.py
diff --git a/numpy/f2py/tests/test_array_from_pyobj.py b/numpy/f2py/tests/test_array_from_pyobj.py
index 1f6b59462..663fead6a 100644
--- a/numpy/f2py/tests/test_array_from_pyobj.py
+++ b/numpy/f2py/tests/test_array_from_pyobj.py
@@ -12,7 +12,7 @@ from numpy.testing import (
     run_module_suite, assert_, assert_equal, SkipTest
 )
 from numpy.core.multiarray import typeinfo
-import util
+from . import util
 
 wrap = None
 
diff --git a/numpy/f2py/tests/test_assumed_shape.py b/numpy/f2py/tests/test_assumed_shape.py
index 725e7f0c1..371aab755 100644
--- a/numpy/f2py/tests/test_assumed_shape.py
+++ b/numpy/f2py/tests/test_assumed_shape.py
@@ -3,7 +3,7 @@ from __future__ import division, absolute_import, print_function
 import os
 
 from numpy.testing import run_module_suite, assert_, dec
-import util
+from . import util
 
 
 def _path(*a):
diff --git a/numpy/f2py/tests/test_block_docstring.py b/numpy/f2py/tests/test_block_docstring.py
index efe2f4b6e..c3f9dc856 100644
--- a/numpy/f2py/tests/test_block_docstring.py
+++ b/numpy/f2py/tests/test_block_docstring.py
@@ -1,7 +1,7 @@
 from __future__ import division, absolute_import, print_function
 
 import textwrap
-import util
+from . import util
 
 from numpy.testing import run_module_suite, assert_equal
 
diff --git a/numpy/f2py/tests/test_callback.py b/numpy/f2py/tests/test_callback.py
index 6824a2042..ea29043ed 100644
--- a/numpy/f2py/tests/test_callback.py
+++ b/numpy/f2py/tests/test_callback.py
@@ -5,7 +5,7 @@ import textwrap
 
 from numpy import array
 from numpy.testing import run_module_suite, assert_, assert_equal, dec
-import util
+from . import util
 
 
 class TestF77Callback(util.F2PyTest):
diff --git a/numpy/f2py/tests/test_common.py b/numpy/f2py/tests/test_common.py
index 027d558aa..aaa35b678 100644
--- a/numpy/f2py/tests/test_common.py
+++ b/numpy/f2py/tests/test_common.py
@@ -4,7 +4,7 @@ import os
 
 from numpy.testing import run_module_suite, assert_array_equal, dec
 import numpy as np
-import util
+from . import util
 
 
 def _path(*a):
diff --git a/numpy/f2py/tests/test_kind.py b/numpy/f2py/tests/test_kind.py
index 2552234a1..7cfe2e977 100644
--- a/numpy/f2py/tests/test_kind.py
+++ b/numpy/f2py/tests/test_kind.py
@@ -7,7 +7,7 @@ from numpy.f2py.crackfortran import (
     _selected_int_kind_func as selected_int_kind,
     _selected_real_kind_func as selected_real_kind
 )
-import util
+from . import util
 
 
 def _path(*a):
diff --git a/numpy/f2py/tests/test_mixed.py b/numpy/f2py/tests/test_mixed.py
index 9055083bf..c145a4b23 100644
--- a/numpy/f2py/tests/test_mixed.py
+++ b/numpy/f2py/tests/test_mixed.py
@@ -4,7 +4,7 @@ import os
 import textwrap
 
 from numpy.testing import run_module_suite, assert_, assert_equal, dec
-import util
+from . import util
 
 
 def _path(*a):
diff --git a/numpy/f2py/tests/test_parameter.py b/numpy/f2py/tests/test_parameter.py
index b6891756d..285b693a1 100644
--- a/numpy/f2py/tests/test_parameter.py
+++ b/numpy/f2py/tests/test_parameter.py
@@ -6,7 +6,7 @@ import math
 import numpy as np
 from numpy.testing import run_module_suite, dec, assert_raises, assert_equal
 
-import util
+from . import util
 
 
 def _path(*a):
diff --git a/numpy/f2py/tests/test_regression.py b/numpy/f2py/tests/test_regression.py
index 43a8de350..c34a5781c 100644
--- a/numpy/f2py/tests/test_regression.py
+++ b/numpy/f2py/tests/test_regression.py
@@ -6,7 +6,7 @@ import math
 import numpy as np
 from numpy.testing import run_module_suite, dec, assert_raises, assert_equal
 
-import util
+from . import util
 
 
 def _path(*a):
diff --git a/numpy/f2py/tests/test_return_character.py b/numpy/f2py/tests/test_return_character.py
index 7704e7d28..217b2c9dd 100644
--- a/numpy/f2py/tests/test_return_character.py
+++ b/numpy/f2py/tests/test_return_character.py
@@ -2,7 +2,7 @@ from __future__ import division, absolute_import, print_function
 
 from numpy import array
 from numpy.testing import run_module_suite, assert_, dec
-import util
+from . import util
 
 
 class TestReturnCharacter(util.F2PyTest):
diff --git a/numpy/f2py/tests/test_return_complex.py b/numpy/f2py/tests/test_return_complex.py
index 88ef83e94..73ced8ed8 100644
--- a/numpy/f2py/tests/test_return_complex.py
+++ b/numpy/f2py/tests/test_return_complex.py
@@ -3,7 +3,7 @@ from __future__ import division, absolute_import, print_function
 from numpy import array
 from numpy.compat import long
 from numpy.testing import run_module_suite, assert_, assert_raises, dec
-import util
+from . import util
 
 
 class TestReturnComplex(util.F2PyTest):
diff --git a/numpy/f2py/tests/test_return_integer.py b/numpy/f2py/tests/test_return_integer.py
index 00033d698..df8fc7c97 100644
--- a/numpy/f2py/tests/test_return_integer.py
+++ b/numpy/f2py/tests/test_return_integer.py
@@ -3,7 +3,7 @@ from __future__ import division, absolute_import, print_function
 from numpy import array
 from numpy.compat import long
 from numpy.testing import run_module_suite, assert_, assert_raises, dec
-import util
+from . import util
 
 
 class TestReturnInteger(util.F2PyTest):
diff --git a/numpy/f2py/tests/test_return_logical.py b/numpy/f2py/tests/test_return_logical.py
index f88a25d7a..221dc3cbd 100644
--- a/numpy/f2py/tests/test_return_logical.py
+++ b/numpy/f2py/tests/test_return_logical.py
@@ -3,7 +3,7 @@ from __future__ import division, absolute_import, print_function
 from numpy import array
 from numpy.compat import long
 from numpy.testing import run_module_suite, assert_, assert_raises, dec
-import util
+from . import util
 
 
 class TestReturnLogical(util.F2PyTest):
diff --git a/numpy/f2py/tests/test_return_real.py b/numpy/f2py/tests/test_return_real.py
index 57aa9badf..a81549083 100644
--- a/numpy/f2py/tests/test_return_real.py
+++ b/numpy/f2py/tests/test_return_real.py
@@ -3,7 +3,7 @@ from __future__ import division, absolute_import, print_function
 from numpy import array
 from numpy.compat import long
 from numpy.testing import run_module_suite, assert_, assert_raises, dec
-import util
+from . import util
 
 
 class TestReturnReal(util.F2PyTest):
diff --git a/numpy/f2py/tests/test_size.py b/numpy/f2py/tests/test_size.py
index aeb70486a..ebf4acda5 100644
--- a/numpy/f2py/tests/test_size.py
+++ b/numpy/f2py/tests/test_size.py
@@ -3,7 +3,7 @@ from __future__ import division, absolute_import, print_function
 import os
 
 from numpy.testing import run_module_suite, assert_equal, dec
-import util
+from . import util
 
 
 def _path(*a):
diff --git a/numpy/f2py/tests/test_string.py b/numpy/f2py/tests/test_string.py
index 10022ebb1..065861c0b 100644
--- a/numpy/f2py/tests/test_string.py
+++ b/numpy/f2py/tests/test_string.py
@@ -4,7 +4,7 @@ import os
 
 from numpy.testing import run_module_suite, assert_array_equal, dec
 import numpy as np
-import util
+from . import util
 
 
 def _path(*a):
diff --git a/numpy/fft/tests/__init__.py b/numpy/fft/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/numpy/fft/tests/__init__.py
diff --git a/numpy/lib/tests/__init__.py b/numpy/lib/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/numpy/lib/tests/__init__.py
diff --git a/numpy/linalg/tests/__init__.py b/numpy/linalg/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/numpy/linalg/tests/__init__.py
diff --git a/numpy/ma/tests/__init__.py b/numpy/ma/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/numpy/ma/tests/__init__.py
diff --git a/numpy/matrixlib/tests/__init__.py b/numpy/matrixlib/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/numpy/matrixlib/tests/__init__.py
diff --git a/numpy/polynomial/tests/__init__.py b/numpy/polynomial/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/numpy/polynomial/tests/__init__.py
diff --git a/numpy/random/tests/__init__.py b/numpy/random/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/numpy/random/tests/__init__.py
diff --git a/numpy/testing/tests/__init__.py b/numpy/testing/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/numpy/testing/tests/__init__.py
diff --git a/numpy/tests/__init__.py b/numpy/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/numpy/tests/__init__.py