Skip to content

Commit b94a3a9

Browse files
authored
Merge pull request #125 from ycexiao/fix-docstring
style: use numpy docstring and fix documentation rendering
2 parents 6863ba0 + 6e882b9 commit b94a3a9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+3003
-1646
lines changed

CHANGELOG.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Release notes
99

1010

1111
Version 3.0.0 – 2019-03-14
12-
==========================
12+
--------------------------
1313

1414
**Added:**
1515

docs/source/api/.placeholder

Whitespace-only changes.

docs/source/api/diffpy.srfit.example_package.rst

Lines changed: 0 additions & 31 deletions
This file was deleted.

docs/source/api/diffpy.srfit.rst

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,12 @@ Subpackages
1414
-----------
1515

1616
.. toctree::
17-
diffpy.srfit.example_package
18-
19-
Submodules
20-
----------
21-
22-
|module|
23-
--------
24-
25-
.. |module| replace:: diffpy.srfit.example_submodule module
26-
27-
.. automodule:: diffpy.srfit.example_submodule
28-
:members:
29-
:undoc-members:
30-
:show-inheritance:
17+
diffpy.srfit.equation
18+
diffpy.srfit.equation.literals
19+
diffpy.srfit.equation.visitors
20+
diffpy.srfit.fitbase
21+
diffpy.srfit.interface
22+
diffpy.srfit.pdf
23+
diffpy.srfit.sas
24+
diffpy.srfit.structure
25+
diffpy.srfit.util

docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"sphinx.ext.intersphinx",
5353
"sphinx_rtd_theme",
5454
"sphinx_copybutton",
55-
"m2r",
55+
"m2r2",
5656
]
5757

5858
# Add any paths that contain templates here, relative to this directory.

docs/source/examples/coreshellnp.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
coreshellnp.py
55
========================
66

7-
.. literalinclude:: ../../../examples/coreshellnp.py
7+
.. literalinclude:: ../../examples/coreshellnp.py

docs/source/examples/crystalpdf.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
crystalpdf.py
55
========================
66

7-
.. literalinclude:: ../../../examples/crystalpdf.py
7+
.. literalinclude:: ../../examples/crystalpdf.py

docs/source/examples/crystalpdfall.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
crystalpdfall.py
55
========================
66

7-
.. literalinclude:: ../../../examples/crystalpdfall.py
7+
.. literalinclude:: ../../examples/crystalpdfall.py

docs/source/examples/crystalpdfobjcryst.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
crystalpdfobjcryst.py
55
========================
66

7-
.. literalinclude:: ../../../examples/crystalpdfobjcryst.py
7+
.. literalinclude:: ../../examples/crystalpdfobjcryst.py

docs/source/examples/crystalpdftwodata.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
crystalpdftwodata.py
55
========================
66

7-
.. literalinclude:: ../../../examples/crystalpdftwodata.py
7+
.. literalinclude:: ../../examples/crystalpdftwodata.py

0 commit comments

Comments
 (0)