Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 45d26c5

Browse filesBrowse files
authored
Merge pull request #22550 from anntzer/sp3
2 parents 7b6f325 + dd41fb8 commit 45d26c5
Copy full SHA for 45d26c5

File tree

3 files changed

+6
-16
lines changed
Filter options

3 files changed

+6
-16
lines changed
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
sphinx>=3.0 and numpydoc>=1.0 are now required for building the docs
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

‎doc/conf.py

Copy file name to clipboardExpand all lines: doc/conf.py
+2-14Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import warnings
2020

2121
import matplotlib
22-
import sphinx
2322

2423
from datetime import datetime
2524
import time
@@ -49,10 +48,6 @@
4948
# usage in the gallery.
5049
warnings.filterwarnings('error', append=True)
5150

52-
# Strip backslashes in function's signature
53-
# To be removed when numpydoc > 0.9.x
54-
strip_signature_backslash = True
55-
5651
# Add any Sphinx extension module names here, as strings. They can be
5752
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
5853
extensions = [
@@ -144,9 +139,7 @@ def _check_dependencies():
144139
warnings.filterwarnings('ignore', category=DeprecationWarning,
145140
module='sphinx.util.inspect')
146141

147-
# missing-references names matches sphinx>=3 behavior, so we can't be nitpicky
148-
# for older sphinxes.
149-
nitpicky = sphinx.version_info >= (3,)
142+
nitpicky = True
150143
# change this to True to update the allowed failures
151144
missing_references_write_json = False
152145
missing_references_warn_unused_ignores = False
@@ -429,7 +422,7 @@ def matplotlib_reduced_latex_scraper(block, block_vars, gallery_conf,
429422
# Sphinx 2.0 adopts GNU FreeFont by default, but it does not have all
430423
# the Unicode codepoints needed for the section about Mathtext
431424
# "Writing mathematical expressions"
432-
fontpkg = r"""
425+
latex_elements['fontpkg'] = r"""
433426
\IfFontExistsTF{XITS}{
434427
\setmainfont{XITS}
435428
}{
@@ -469,12 +462,7 @@ def matplotlib_reduced_latex_scraper(block, block_vars, gallery_conf,
469462
Extension = .otf,
470463
]}
471464
"""
472-
latex_elements['fontpkg'] = fontpkg
473465

474-
# Sphinx <1.8.0 or >=2.0.0 does this by default, but the 1.8.x series
475-
# did not for latex_engine = 'xelatex' (as it used Latin Modern font).
476-
# We need this for code-blocks as FreeMono has wide glyphs.
477-
latex_elements['fvset'] = r'\fvset{fontsize=\small}'
478466
# Fix fancyhdr complaining about \headheight being too small
479467
latex_elements['passoptionstopackages'] = r"""
480468
\PassOptionsToPackage{headheight=14pt}{geometry}

‎requirements/doc/doc-requirements.txt

Copy file name to clipboardExpand all lines: requirements/doc/doc-requirements.txt
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
# Install the documentation requirements with:
88
# pip install -r requirements/doc/doc-requirements.txt
99
#
10-
sphinx>=1.8.1,!=2.0.0
10+
sphinx>=3.0.0
1111
colorspacious
1212
ipython
1313
ipywidgets
14-
numpydoc>=0.8
14+
numpydoc>=1.0
1515
packaging>=20
1616
pydata-sphinx-theme>=0.8.0
1717
mpl-sphinx-theme

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.