Skip to content

Commit

Permalink
Update Sphinx version
Browse files Browse the repository at this point in the history
  • Loading branch information
Piralein committed Oct 31, 2024
1 parent d904c1d commit 3b58268
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 90 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ concurrency:

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
6 changes: 0 additions & 6 deletions _static/css/algolia.css

This file was deleted.

60 changes: 0 additions & 60 deletions _templates/versions.html

This file was deleted.

14 changes: 6 additions & 8 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

# -- General configuration ------------------------------------------------

needs_sphinx = "1.3"
needs_sphinx = "8.1"

# Sphinx extension module names and templates location
sys.path.append(os.path.abspath("_extensions"))
Expand Down Expand Up @@ -63,6 +63,9 @@

# Specify the site name for the Open Graph extension.
ogp_site_name = "Godot Engine documentation"
ogp_social_cards = {
"enable": False
}

if not os.getenv("SPHINX_NO_GDSCRIPT"):
extensions.append("gdscript")
Expand Down Expand Up @@ -158,7 +161,6 @@
# -- Options for HTML output ----------------------------------------------

html_theme = "sphinx_rtd_theme"
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
if on_rtd:
using_rtd_theme = True

Expand All @@ -168,8 +170,6 @@
"logo_only": True,
# Collapse navigation (False makes it tree-like)
"collapse_navigation": False,
# Hide the documentation version name/number under the logo
"display_version": False,
}

html_title = supported_languages[language] % ( "(" + version + ")" )
Expand Down Expand Up @@ -211,16 +211,14 @@
# These paths are either relative to html_static_path
# or fully qualified paths (e.g. https://...)
html_css_files = [
'css/algolia.css',
'https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css',
"css/custom.css?10", # Increment the number at the end when the file changes to bust the cache.
"css/custom.css",
]

if not on_rtd:
html_css_files.append("css/dev.css")

html_js_files = [
"js/custom.js?7", # Increment the number at the end when the file changes to bust the cache.
"js/custom.js",
]

# Output file base name for HTML help builder
Expand Down
23 changes: 8 additions & 15 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,22 @@
# https://github.com/readthedocs/readthedocs.org/blob/master/requirements/docs.txt

# Base dependencies
pygments==2.15.1
pygments==2.18.0

# Sphinx base and RTD theme.
sphinx==4.4.0
sphinx_rtd_theme==1.1.1
sphinx==8.1.3
sphinx_rtd_theme==3.0.1

# Sphinx extensions.

# Code tabs extension to display codeblocks in different languages as tabs.
sphinx-tabs==3.4.0
sphinx-tabs==3.4.7
# Adds a 'copy' button to the right of codeblocks.
sphinx-copybutton==0.5.1
sphinx-copybutton==0.5.2
# Custom 404 error page (more useful than the default).
sphinx-notfound-page==0.8.3
sphinx-notfound-page==1.0.4
# Adds Open Graph tags in the HTML `<head>` tag.
sphinxext-opengraph==0.7.5

# These get pulled in by Sphinx, we need to pin these as higher versions require Sphinx 5.0+.
sphinxcontrib-applehelp==1.0.4
sphinxcontrib-htmlhelp==2.0.1
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-serializinghtml==1.1.5
sphinxcontrib-devhelp==1.0.2
sphinxext-opengraph==0.9.1

# `.. video::` directive support to embed videos in documentation pages.
sphinxcontrib-video==0.2.1rc0
sphinxcontrib-video==0.2.1

0 comments on commit 3b58268

Please sign in to comment.