diff options
| author | Rohit Goswami <rog32@hi.is> | 2022-06-05 19:45:04 +0000 |
|---|---|---|
| committer | Rohit Goswami <rog32@hi.is> | 2022-06-05 19:50:03 +0000 |
| commit | 5c0ecb52890f92d43cf70519cd5491b8415b3710 (patch) | |
| tree | 300b1efd7f5ddb03ea0a6ae4bf572a4ff24cde5a | |
| parent | f20d90cc2598c95dbcf7e0246f83499f4f4c5c27 (diff) | |
| download | numpy-5c0ecb52890f92d43cf70519cd5491b8415b3710.tar.gz | |
MAINT,DOC: Fix doc fragments and tests
| -rw-r--r-- | doc/source/f2py/advanced.rst | 12 | ||||
| -rw-r--r-- | doc/source/f2py/code/asterisk1.f90 (renamed from doc/source/f2py/asterisk1.f90) | 0 | ||||
| -rw-r--r-- | doc/source/f2py/code/asterisk2.f90 (renamed from doc/source/f2py/asterisk2.f90) | 0 | ||||
| -rw-r--r-- | doc/source/f2py/code/results/asterisk1_session.dat (renamed from doc/source/f2py/asterisk1_session.dat) | 0 | ||||
| -rw-r--r-- | doc/source/f2py/code/results/asterisk2_session.dat (renamed from doc/source/f2py/asterisk2_session.dat) | 0 | ||||
| -rw-r--r-- | numpy/f2py/tests/test_docs.py | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/doc/source/f2py/advanced.rst b/doc/source/f2py/advanced.rst index b310172e2..3ba913c83 100644 --- a/doc/source/f2py/advanced.rst +++ b/doc/source/f2py/advanced.rst @@ -103,7 +103,7 @@ For more information, see F2Py source code ``numpy/f2py/capi_maps.py``. Character strings ================= -Assumed length chararacter strings +Assumed length character strings ----------------------------------- In Fortran, assumed length character string arguments are declared as @@ -125,12 +125,12 @@ extra declaration for the corresponding argument that specifies the length in character selector part. For example, consider a Fortran file ``asterisk1.f90``: -.. include:: asterisk1.f90 +.. include:: ./code/asterisk1.f90 :literal: Compile it with ``f2py -c asterisk1.f90 -m asterisk1`` and then in Python: -.. include:: asterisk1_session.dat +.. include:: ./code/results/asterisk1_session.dat :literal: Notice that the extra declaration ``character(f2py_len=12) s`` is @@ -139,11 +139,11 @@ can use C-expressions as a length value. In the following example: -.. include:: asterisk2.f90 +.. include:: ./code/asterisk2.f90 :literal: -the lenght of output assumed length string depends on an input +the length of the output assumed length string depends on an input argument ``n``, after wrapping with F2PY, in Python: -.. include:: asterisk2_session.dat +.. include:: ./code/results/asterisk2_session.dat :literal: diff --git a/doc/source/f2py/asterisk1.f90 b/doc/source/f2py/code/asterisk1.f90 index 2631490d0..2631490d0 100644 --- a/doc/source/f2py/asterisk1.f90 +++ b/doc/source/f2py/code/asterisk1.f90 diff --git a/doc/source/f2py/asterisk2.f90 b/doc/source/f2py/code/asterisk2.f90 index 278e02b4a..278e02b4a 100644 --- a/doc/source/f2py/asterisk2.f90 +++ b/doc/source/f2py/code/asterisk2.f90 diff --git a/doc/source/f2py/asterisk1_session.dat b/doc/source/f2py/code/results/asterisk1_session.dat index 8aa9c5ba0..8aa9c5ba0 100644 --- a/doc/source/f2py/asterisk1_session.dat +++ b/doc/source/f2py/code/results/asterisk1_session.dat diff --git a/doc/source/f2py/asterisk2_session.dat b/doc/source/f2py/code/results/asterisk2_session.dat index 5fb8bef8b..5fb8bef8b 100644 --- a/doc/source/f2py/asterisk2_session.dat +++ b/doc/source/f2py/code/results/asterisk2_session.dat diff --git a/numpy/f2py/tests/test_docs.py b/numpy/f2py/tests/test_docs.py index 4aa5f5f5c..6631dd82c 100644 --- a/numpy/f2py/tests/test_docs.py +++ b/numpy/f2py/tests/test_docs.py @@ -11,7 +11,7 @@ def get_docdir(): return os.path.abspath(os.path.join( os.path.dirname(__file__), '..', '..', '..', - 'doc', 'source', 'f2py')) + 'doc', 'source', 'f2py', 'code')) pytestmark = pytest.mark.skipif( |