numpy · charris · Feb 25, 2024 · Feb 25, 2024 · Feb 25, 2024 · Feb 25, 2024
diff --git a/.gitattributes b/.gitattributes
@@ -54,7 +54,6 @@ numpy/version.py linguist-generated
 # F2py
 ./doc/source/f2py/*.pyf text
 ./doc/source/f2py/*.dat text
-./numpy/f2py/tests/src/module_data/mod.mod binary
 
 # Documents
 *.md    text diff=markdown

diff --git a/.gitignore b/.gitignore
@@ -41,6 +41,7 @@ GTAGS
 *.o.d
 *.py[ocd]
 *.so
+*.mod
 
 # Packages #
 ############

diff --git a/numpy/f2py/f90mod_rules.py b/numpy/f2py/f90mod_rules.py
@@ -97,6 +97,9 @@ def dadd(line, s=doc):
 
     usenames = getuseblocks(pymod)
     for m in findf90modules(pymod):
+        contains_functions_or_subroutines = any(
+            item for item in m["body"] if item["block"] in ["function", "subroutine"]
+        )
         sargs, fargs, efargs, modobjs, notvars, onlyvars = [], [], [], [], [
             m['name']], []
         sargsp = []
@@ -112,7 +115,7 @@ def dadd(line, s=doc):
                 mfargs.append(n)
         outmess('\t\tConstructing F90 module support for "%s"...\n' %
                 (m['name']))
-        if m['name'] in usenames and not onlyvars:
+        if m['name'] in usenames and not contains_functions_or_subroutines:
             outmess(f"\t\t\tSkipping {m['name']} since it is in 'use'...\n")
             continue
         if onlyvars:

diff --git a/numpy/f2py/tests/src/module_data/mod.mod b/numpy/f2py/tests/src/module_data/mod.mod
diff --git a/...2py/tests/src/regression/gh25337/data.f90 → ...y/f2py/tests/src/modules/gh25337/data.f90 b/...2py/tests/src/regression/gh25337/data.f90 → ...y/f2py/tests/src/modules/gh25337/data.f90
diff --git a/...tests/src/regression/gh25337/use_data.f90 → ...py/tests/src/modules/gh25337/use_data.f90 b/...tests/src/regression/gh25337/use_data.f90 → ...py/tests/src/modules/gh25337/use_data.f90
diff --git a/...src/module_data/module_data_docstring.f90 → ...sts/src/modules/module_data_docstring.f90 b/...src/module_data/module_data_docstring.f90 → ...sts/src/modules/module_data_docstring.f90
diff --git a/numpy/f2py/tests/src/modules/use_modules.f90 b/numpy/f2py/tests/src/modules/use_modules.f90
@@ -0,0 +1,20 @@
+module mathops
+  implicit none
+contains
+  function add(a, b) result(c)
+    integer, intent(in) :: a, b
+    integer :: c
+    c = a + b
+  end function add
+end module mathops
+
+module useops
+  use mathops, only: add
+  implicit none
+contains
+  function sum_and_double(a, b) result(d)
+    integer, intent(in) :: a, b
+    integer :: d
+    d = 2 * add(a, b)
+  end function sum_and_double
+end module useops
diff --git a/numpy/f2py/tests/test_module_doc.py b/numpy/f2py/tests/test_module_doc.py
diff --git a/numpy/f2py/tests/test_modules.py b/numpy/f2py/tests/test_modules.py
@@ -0,0 +1,50 @@
+import pytest
+import textwrap
+
+from . import util
+from numpy.testing import IS_PYPY
+
+
+@pytest.mark.slow
+class TestModuleDocString(util.F2PyTest):
+    sources = [util.getpath("tests", "src", "modules", "module_data_docstring.f90")]
+
+    @pytest.mark.xfail(IS_PYPY, reason="PyPy cannot modify tp_doc after PyType_Ready")
+    def test_module_docstring(self):
+        assert self.module.mod.__doc__ == textwrap.dedent(
+            """\
+                     i : 'i'-scalar
+                     x : 'i'-array(4)
+                     a : 'f'-array(2,3)
+                     b : 'f'-array(-1,-1), not allocated\x00
+                     foo()\n
+                     Wrapper for ``foo``.\n\n"""
+        )
+
+
+@pytest.mark.slow
+class TestModuleAndSubroutine(util.F2PyTest):
+    module_name = "example"
+    sources = [
+        util.getpath("tests", "src", "modules", "gh25337", "data.f90"),
+        util.getpath("tests", "src", "modules", "gh25337", "use_data.f90"),
+    ]
+
+    def test_gh25337(self):
+        self.module.data.set_shift(3)
+        assert "data" in dir(self.module)
+
+
+@pytest.mark.slow
+class TestUsedModule(util.F2PyTest):
+    module_name = "fmath"
+    sources = [
+        util.getpath("tests", "src", "modules", "use_modules.f90"),
+    ]
+
+    def test_gh25867(self):
+        compiled_mods = [x for x in dir(self.module) if "__" not in x]
+        assert "useops" in compiled_mods
+        assert self.module.useops.sum_and_double(3, 7) == 20
+        assert "mathops" in compiled_mods
+        assert self.module.mathops.add(3, 7) == 10
diff --git a/numpy/f2py/tests/test_regression.py b/numpy/f2py/tests/test_regression.py
@@ -66,17 +66,6 @@ def test_include_path():
         assert fname in fnames_in_dir
 
 
-class TestModuleAndSubroutine(util.F2PyTest):
-    module_name = "example"
-    sources = [util.getpath("tests", "src", "regression", "gh25337", "data.f90"),
-               util.getpath("tests", "src", "regression", "gh25337", "use_data.f90")]
-
-    @pytest.mark.slow
-    def test_gh25337(self):
-        self.module.data.set_shift(3)
-        assert "data" in dir(self.module)
-
-
 class TestIncludeFiles(util.F2PyTest):
     sources = [util.getpath("tests", "src", "regression", "incfile.f90")]
     options = [f"-I{util.getpath('tests', 'src', 'regression')}",
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,6 +41,7 @@ GTAGS @@
     *.o.d
     *.py[ocd]
     *.so
+    *.mod
     # Packages #
     ############
@@ Expand Down @@