Skip to content

Commit cf22444

Browse files
committed
Merge branch 'doc-add-changelog'
* add release notes to the manual * merge API docs in one page `modules.rst` * silence complaint about missing directory * switch to sphinx_py3doc_enhanced_theme
2 parents 14d45fe + 878bf76 commit cf22444

File tree

5 files changed

+165
-161
lines changed

5 files changed

+165
-161
lines changed

doc/manual/source/api/modules.rst

+132-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,134 @@
1-
pyobjcryst
2-
==========
1+
:tocdepth: 2
32

4-
.. toctree::
5-
:maxdepth: 4
3+
##############
4+
pyobjcryst API
5+
##############
66

7-
pyobjcryst
7+
8+
pyobjcryst module
9+
-----------------
10+
11+
.. automodule:: pyobjcryst
12+
:members:
13+
:undoc-members:
14+
:show-inheritance:
15+
16+
pyobjcryst.atom module
17+
----------------------
18+
19+
.. automodule:: pyobjcryst.atom
20+
:members:
21+
:undoc-members:
22+
:show-inheritance:
23+
24+
pyobjcryst.crystal module
25+
-------------------------
26+
27+
.. automodule:: pyobjcryst.crystal
28+
:members:
29+
:undoc-members:
30+
:show-inheritance:
31+
32+
pyobjcryst.general module
33+
-------------------------
34+
35+
.. automodule:: pyobjcryst.general
36+
:members:
37+
:undoc-members:
38+
:show-inheritance:
39+
40+
pyobjcryst.io module
41+
--------------------
42+
43+
.. automodule:: pyobjcryst.io
44+
:members:
45+
:undoc-members:
46+
:show-inheritance:
47+
48+
pyobjcryst.molecule module
49+
--------------------------
50+
51+
.. automodule:: pyobjcryst.molecule
52+
:members:
53+
:undoc-members:
54+
:show-inheritance:
55+
56+
pyobjcryst.polyhedron module
57+
----------------------------
58+
59+
.. automodule:: pyobjcryst.polyhedron
60+
:members:
61+
:undoc-members:
62+
:show-inheritance:
63+
64+
pyobjcryst.refinableobj module
65+
------------------------------
66+
67+
.. automodule:: pyobjcryst.refinableobj
68+
:members:
69+
:undoc-members:
70+
:show-inheritance:
71+
72+
pyobjcryst.scatterer module
73+
---------------------------
74+
75+
.. automodule:: pyobjcryst.scatterer
76+
:members:
77+
:undoc-members:
78+
:show-inheritance:
79+
80+
pyobjcryst.scatteringpower module
81+
---------------------------------
82+
83+
.. automodule:: pyobjcryst.scatteringpower
84+
:members:
85+
:undoc-members:
86+
:show-inheritance:
87+
88+
pyobjcryst.scatteringpowersphere module
89+
---------------------------------------
90+
91+
.. automodule:: pyobjcryst.scatteringpowersphere
92+
:members:
93+
:undoc-members:
94+
:show-inheritance:
95+
96+
pyobjcryst.spacegroup module
97+
----------------------------
98+
99+
.. automodule:: pyobjcryst.spacegroup
100+
:members:
101+
:undoc-members:
102+
:show-inheritance:
103+
104+
pyobjcryst.unitcell module
105+
--------------------------
106+
107+
.. automodule:: pyobjcryst.unitcell
108+
:members:
109+
:undoc-members:
110+
:show-inheritance:
111+
112+
pyobjcryst.utils module
113+
-----------------------
114+
115+
.. automodule:: pyobjcryst.utils
116+
:members:
117+
:undoc-members:
118+
:show-inheritance:
119+
120+
pyobjcryst.version module
121+
-------------------------
122+
123+
.. automodule:: pyobjcryst.version
124+
:members:
125+
:undoc-members:
126+
:show-inheritance:
127+
128+
pyobjcryst.zscatterer module
129+
----------------------------
130+
131+
.. automodule:: pyobjcryst.zscatterer
132+
:members:
133+
:undoc-members:
134+
:show-inheritance:

doc/manual/source/api/pyobjcryst.rst

-134
This file was deleted.

doc/manual/source/conf.py

+17-8
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,20 @@
1717
# If your documentation needs a minimal Sphinx version, state it here.
1818
# needs_sphinx = '1.0'
1919

20-
# Add any Sphinx extension module names here, as strings. They can be extensions
21-
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
22-
extensions = ['sphinx.ext.ifconfig', 'sphinx.ext.autodoc']
20+
# Add any Sphinx extension module names here, as strings. They can be
21+
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
22+
# ones.
23+
extensions = [
24+
'sphinx.ext.ifconfig',
25+
'sphinx.ext.autodoc',
26+
'm2r',
27+
]
2328

2429
# Add any paths that contain templates here, relative to this directory.
2530
templates_path = ['_templates']
2631

2732
# The suffix of source filenames.
28-
source_suffix = '.rst'
33+
source_suffix = ['.rst', '.md']
2934

3035
# The encoding of source files.
3136
# source_encoding = 'utf-8-sig'
@@ -94,13 +99,17 @@
9499

95100
# The theme to use for HTML and HTML Help pages. See the documentation for
96101
# a list of builtin themes.
97-
html_theme = 'default'
102+
#
103+
html_theme = 'sphinx_py3doc_enhanced_theme'
98104

99105
# Theme options are theme-specific and customize the look and feel of a theme
100106
# further. For a list of options available for each theme, see the
101107
# documentation.
102-
# html_theme_options = {}
103-
html_theme_options = {'collapsiblesidebar' : 'true'}
108+
#
109+
html_theme_options = {
110+
'collapsiblesidebar' : 'true',
111+
'navigation_with_keys' : 'true',
112+
}
104113

105114
# Add any paths that contain custom themes here, relative to this directory.
106115
# html_theme_path = []
@@ -124,7 +133,7 @@
124133
# Add any paths that contain custom static files (such as style sheets) here,
125134
# relative to this directory. They are copied after the builtin static files,
126135
# so a file named "default.css" will overwrite the builtin "default.css".
127-
html_static_path = ['_static']
136+
# html_static_path = ['_static']
128137

129138
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
130139
# using the given strftime format.

doc/manual/source/index.rst

+13-14
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
1-
.. _manual-index:
2-
31
####################################################
42
pyobjcryst documentation
53
####################################################
64

75
pyobjcryst - Python bindings to the ObjCryst++ Object-Oriented
86
Crystallographic Library
97

10-
===================
11-
Disclaimer
12-
===================
13-
14-
.. literalinclude:: ../../../LICENSE.txt
15-
8+
| Software version |release|.
9+
| Last updated |today|.
1610
1711
================
1812
Authors
@@ -32,18 +26,23 @@ https://github.com/diffpy/pyobjcryst/graphs/contributors.
3226
Installation
3327
======================================
3428

35-
See the `README.rst <https://github.com/diffpy/pyobjcryst#requirements>`_
29+
See the `README <https://github.com/diffpy/pyobjcryst#requirements>`_
3630
file included with the distribution.
3731

3832
======================================
39-
API
33+
Table of contents
4034
======================================
4135

4236
.. toctree::
43-
:maxdepth: 3
37+
:titlesonly:
4438

45-
api/modules.rst
39+
license
40+
release
41+
api/modules
4642

47-
* :ref:`genindex`
43+
========================================================================
44+
Indices
45+
========================================================================
4846

49-
Last updated |today|.
47+
* :ref:`genindex`
48+
* :ref:`search`

doc/manual/source/release.rst

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.. index:: release notes
2+
3+
.. mdinclude:: ../../../CHANGELOG.md

0 commit comments

Comments
 (0)