diff --git a/.github/workflows/users-guide.yml b/.github/workflows/users-guide.yml index bf2c95bfa13..a6cf5d8ca2f 100644 --- a/.github/workflows/users-guide.yml +++ b/.github/workflows/users-guide.yml @@ -44,7 +44,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.10'] + python-version: ['3.13'] steps: - uses: actions/checkout@v6 diff --git a/.readthedocs.yml b/.readthedocs.yml index 31bb9507b4f..bd8bb032821 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -4,9 +4,9 @@ sphinx: configuration: doc/conf.py build: - os: "ubuntu-22.04" + os: "ubuntu-24.04" tools: - python: "3.8" + python: "3.13" jobs: post_create_environment: - pip install pip-tools diff --git a/doc/cabal-package-description-file.rst b/doc/cabal-package-description-file.rst index 9ebfe0c9333..a5e87c065af 100644 --- a/doc/cabal-package-description-file.rst +++ b/doc/cabal-package-description-file.rst @@ -3455,8 +3455,10 @@ a few options: .. rubric:: Footnotes .. [#old-style-build-tool-depends] - Some packages (ab)use :pkg-field:`build-depends` on old-style builds, but this has a few major drawbacks: - - - using Nix-style builds it's considered an error if you depend on a exe-only package via build-depends: the solver will refuse it. - - it may or may not place the executable on ``PATH``. - - it does not ensure the correct version of the package is installed, so you might end up overwriting versions with each other. + Some packages (ab)use :pkg-field:`build-depends` on old-style builds, but + this has a few major drawbacks. First, with Nix-style builds it's considered + an error if you depend on a exe-only package via ``build-depends``: the + solver will refuse it. Next, ``build-depends`` may or may not place the + executable on ``PATH``. Finally, ``build-depends`` does not ensure the + correct version of the package is installed, so you might end up overwriting + versions with each other. diff --git a/doc/conf.py b/doc/conf.py index aa5325655a8..8a6ea4a837c 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -63,9 +63,6 @@ if on_rtd: html_style = None using_rtd_theme = True -else: - import sphinx_rtd_theme - html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". diff --git a/doc/requirements.in b/doc/requirements.in index f7a6f7143cf..ae615c4e76a 100644 --- a/doc/requirements.in +++ b/doc/requirements.in @@ -1,5 +1,5 @@ -sphinx == 5.3.0 -sphinx_rtd_theme >= 1.2 +sphinx == 8.2.3 +sphinx_rtd_theme >= 3.0.2 sphinx-jsonschema sphinxnotes-strike # Pygments>=2.7.4 suggested by CVE-2021-20270 CVE-2021-27291 @@ -14,5 +14,3 @@ jinja2 >= 3.1.4 idna >= 3.7 # CVE-2024-35195 requests >= 2.32.0 -# https://github.com/haskell/cabal/issues/11246 -docutils <0.18