summaryrefslogtreecommitdiff
path: root/numpy/f2py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2017-08-06 09:33:40 -0600
committerCharles Harris <charlesr.harris@gmail.com>2017-08-06 16:23:39 -0600
commit62a12d2d6fe9faa88482a49447ebf4ed73a7e3a5 (patch)
tree07bff386f8dd0fa5abd37cd71c0d776a818b07a9 /numpy/f2py
parent91b06c021319faccb008a8ee485d26ae227bf079 (diff)
downloadnumpy-62a12d2d6fe9faa88482a49447ebf4ed73a7e3a5.tar.gz
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.
Diffstat (limited to 'numpy/f2py')
-rw-r--r--numpy/f2py/tests/__init__.py0
-rw-r--r--numpy/f2py/tests/test_array_from_pyobj.py2
-rw-r--r--numpy/f2py/tests/test_assumed_shape.py2
-rw-r--r--numpy/f2py/tests/test_block_docstring.py2
-rw-r--r--numpy/f2py/tests/test_callback.py2
-rw-r--r--numpy/f2py/tests/test_common.py2
-rw-r--r--numpy/f2py/tests/test_kind.py2
-rw-r--r--numpy/f2py/tests/test_mixed.py2
-rw-r--r--numpy/f2py/tests/test_parameter.py2
-rw-r--r--numpy/f2py/tests/test_regression.py2
-rw-r--r--numpy/f2py/tests/test_return_character.py2
-rw-r--r--numpy/f2py/tests/test_return_complex.py2
-rw-r--r--numpy/f2py/tests/test_return_integer.py2
-rw-r--r--numpy/f2py/tests/test_return_logical.py2
-rw-r--r--numpy/f2py/tests/test_return_real.py2
-rw-r--r--numpy/f2py/tests/test_size.py2
-rw-r--r--numpy/f2py/tests/test_string.py2
17 files changed, 16 insertions, 16 deletions
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):