Skip to content

Commit 56ea1f0

Browse files
committed
Revert "MAINT: io: move _test_fortran under tests"
This reverts commit cf66469.
1 parent 81385df commit 56ea1f0

File tree

5 files changed

+17
-16
lines changed

5 files changed

+17
-16
lines changed
File renamed without changes.

scipy/io/meson.build

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
py3.extension_module('_test_fortran',
2+
[
3+
f2py_gen.process('test_fortran.pyf'),
4+
'_test_fortran.f'
5+
],
6+
c_args: [Wno_unused_variable],
7+
fortran_args: fortran_ignore_warnings,
8+
link_args: version_link_args,
9+
dependencies: [lapack_dep, fortranobject_dep],
10+
install: true,
11+
link_language: 'fortran',
12+
subdir: 'scipy/io',
13+
install_tag: 'tests'
14+
)
15+
116
py3.install_sources([
217
'__init__.py',
318
'_fortran.py',
File renamed without changes.

scipy/io/tests/meson.build

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
py3.extension_module('_test_fortran',
2-
[
3-
f2py_gen.process('test_fortran.pyf'),
4-
'_test_fortran.f'
5-
],
6-
c_args: [Wno_unused_variable],
7-
fortran_args: fortran_ignore_warnings,
8-
link_args: version_link_args,
9-
dependencies: [lapack_dep, fortranobject_dep],
10-
install: true,
11-
link_language: 'fortran',
12-
subdir: 'scipy/io/tests',
13-
install_tag: 'tests'
14-
)
15-
161
py3.install_sources([
172
'__init__.py',
183
'test_fortran.py',

scipy/io/tests/test_fortran.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111
import pytest
1212

1313
from scipy.io import (FortranFile,
14+
_test_fortran,
1415
FortranEOFError,
1516
FortranFormattingError)
16-
from . import _test_fortran
17+
1718

1819
DATA_PATH = path.join(path.dirname(__file__), 'data')
1920

0 commit comments

Comments
 (0)