Skip to content

merge queue: embarking master (9f004e7), #11379 and #11378 together #11400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mergify wants to merge 4 commits into from
+12 −15
Closed

merge queue: embarking master (9f004e7), #11379 and #11378 together #11400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
07bcf69
Bump sphinx, rtd theme & python version
philderbeast Jan 2, 2026
9f85732
Don't use lists in footnotes
philderbeast Jan 2, 2026
134057e
Merge of #11379
mergify[bot] Jan 9, 2026
8ff3650
Merge of #11378
mergify[bot] Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/users-guide.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.10']
python-version: ['3.13']

steps:
- uses: actions/checkout@v6
Expand Down
4 changes: 2 additions & 2 deletions .readthedocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 7 additions & 5 deletions doc/cabal-package-description-file.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
3 changes: 0 additions & 3 deletions doc/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# "<project> v<release> documentation".
Expand Down
6 changes: 2 additions & 4 deletions doc/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Loading