update Makefile and conf.py for current version of sphinx

murrayrm · murrayrm · commit 3692ef4ee7e7 · 2025-02-02T20:39:22.000-08:00
diff --git a/doc/Makefile b/doc/Makefile
@@ -38,5 +38,5 @@ ctrlplot-servomech.png: ../control/tests/ctrlplot_test.py
 
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
-html pdf clean doctest: Makefile $(FIGS)
+html latexpdf clean doctest: Makefile $(FIGS)
 	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/doc/conf.py b/doc/conf.py
@@ -23,7 +23,6 @@
     try:
         import sphinx_rtd_theme
         html_theme = 'sphinx_rtd_theme'
-        html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
     except ImportError:
         html_theme = 'default'
 
@@ -49,13 +48,13 @@
 
 # If your documentation needs a minimal Sphinx version, state it here.
 #
-needs_sphinx = '3.1'
+needs_sphinx = '3.4'
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.napoleon',
+    'sphinx.ext.autodoc', 'sphinx.ext.todo',
     'sphinx.ext.intersphinx', 'sphinx.ext.imgmath',
     'sphinx.ext.autosummary', 'nbsphinx', 'numpydoc',
     'sphinx.ext.linkcode', 'sphinx.ext.doctest'
