Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit bf5aeb5

Browse files
committed
Merge branch 'v2.x'
2 parents 409d8b7 + 984e9b0 commit bf5aeb5

File tree

5 files changed

+404
-37
lines changed

5 files changed

+404
-37
lines changed

doc-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Install the documentation requirements with:
77
# pip install -r doc-requirements.txt
88
#
9-
sphinx>1.0
9+
sphinx>1.0,!=1.5.0
1010
numpydoc
1111
ipython
1212
mock

doc/conf.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,6 @@
242242
# The paper size ('letter' or 'a4').
243243
latex_paper_size = 'letter'
244244

245-
# The font size ('10pt', '11pt' or '12pt').
246-
latex_font_size = '11pt'
247-
248245
# Grouping the document tree into LaTeX files. List of tuples
249246
# (source start file, target name, title, author, document class [howto/manual]).
250247

@@ -259,8 +256,9 @@
259256
# the title page.
260257
latex_logo = None
261258

259+
latex_elements = {}
262260
# Additional stuff for the LaTeX preamble.
263-
latex_preamble = r"""
261+
latex_elements['preamble'] = r"""
264262
% In the parameters section, place a newline after the Parameters
265263
% header. (This is stolen directly from Numpy's conf.py, since it
266264
% affects Numpy-style docstrings).
@@ -280,14 +278,18 @@
280278
\usepackage{enumitem}
281279
\setlistdepth{2048}
282280
"""
281+
latex_elements['pointsize'] = '11pt'
283282

284283
# Documents to append as an appendix to all manuals.
285284
latex_appendices = []
286285

287286
# If false, no module index is generated.
288287
latex_use_modindex = True
289288

290-
latex_use_parts = True
289+
if hasattr(sphinx, 'version_info') and sphinx.version_info[:2] >= (1, 4):
290+
latex_toplevel_sectioning = 'part'
291+
else:
292+
latex_use_parts = True
291293

292294
# Show both class-level docstring and __init__ docstring in class
293295
# documentation

doc/devel/testing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,4 +305,4 @@ edit this file if you want to add new environments to test (e.g.,
305305
``py33``) or if you want to tweak the dependencies or the way the
306306
tests are run. For more info on the ``tox.ini`` file, see the `Tox
307307
Configuration Specification
308-
<http://tox.testrun.org/latest/config.html>`_.
308+
<https://tox.readthedocs.io/en/latest/config.html>`_.

0 commit comments

Comments
 (0)