Merge pull request #7187 from meeseeksmachine/auto-backport-of-pr-718…

…3-on-5.0
sunpy · Sep 9, 2023 · d6924f4 · d6924f4
2 parents 7c32446 + 0fce819
commit d6924f4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -38,9 +38,10 @@
 from sunpy.util.exceptions import SunpyDeprecationWarning, SunpyPendingDeprecationWarning  # NOQA
 from matplotlib import MatplotlibDeprecationWarning  # NOQA
 from astropy.utils.exceptions import AstropyDeprecationWarning  # NOQA
+from sunpy_sphinx_theme import PNG_ICON  # NOQA
 
 # -- Project information -------------------------------------------------------
-project = 'SunPy'
+project = 'sunpy'
 author = 'The SunPy Community'
 copyright = f'{datetime.datetime.now().year}, {author}'
 
@@ -235,16 +236,15 @@
     # Roles within the std domain
     "confval": "tooltip",
     "hoverxref": "tooltip",
-    "ref": "tooltip", # Would be used by hoverxref_auto_ref if we set it to True
+    "ref": "tooltip",  # Would be used by hoverxref_auto_ref if we set it to True
     "term": "tooltip",
 }
 
 # -- Options for HTML output ---------------------------------------------------
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 
-from sunpy_sphinx_theme.conf import *  # NOQA
-from sunpy_sphinx_theme.conf import png_icon  # NOQA
+html_theme = "sunpy"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
@@ -287,7 +287,7 @@
     'gallery_dirs': os.path.join('generated', 'gallery'),
     'matplotlib_animations': True,
     # Comes from the theme.
-    "default_thumb_file": png_icon,
+    "default_thumb_file": PNG_ICON,
     'abort_on_example_error': False,
     'plot_gallery': 'True',
     'remove_config_comments': True,

diff --git a/docs/index.rst b/docs/index.rst
@@ -2,9 +2,6 @@
 sunpy core Documentation
 ************************
 
-.. image:: tour.svg
-  :align: center
-
 ``sunpy`` is a community-developed, free and open-source solar data analysis environment for Python.
 It includes an interface for searching and downloading data from multiple data providers, data containers for image and time series data, commonly used solar coordinate frames and associated transformations, as well as other functionality needed for solar data analysis.
 

diff --git a/docs/tour.svg b/docs/tour.svg
diff --git a/setup.cfg b/setup.cfg
@@ -124,7 +124,7 @@ docs =
   sphinx-design
   sphinx-gallery>=0.13.0 # First to allow us to use a different backend while scraping the images
   sphinxext-opengraph
-  sunpy-sphinx-theme
+  sunpy-sphinx-theme>=2.0.0rc1
   sphinx-hoverxref
 dev =
   %(all)s