Skip to content

Commit 5203786

Browse files
authored
Merge branch 'master' into core/deprecate-intersphinx-1-0
2 parents a7efc87 + de4ac2f commit 5203786

File tree

154 files changed

+57103
-53026
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+57103
-53026
lines changed

CHANGES.rst

Lines changed: 139 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,90 @@
1-
Release 7.3.0 (in development)
2-
==============================
1+
Release 7.3.7 (released Apr 19, 2024)
2+
=====================================
3+
4+
Bugs fixed
5+
----------
6+
7+
* #12299: Defer loading themes defined via entry points until
8+
their explicit use by the user or a child theme.
9+
Patch by Adam Turner.
10+
* #12305: Return the default value for ``theme.get_config()`` with
11+
an unsupported theme configuration section.
12+
Patch by Adam Turner.
13+
14+
Release 7.3.6 (released Apr 17, 2024)
15+
=====================================
16+
17+
Bugs fixed
18+
----------
19+
20+
* #12295: Re-export all AST types in the C and C++ domains.
21+
Patch by Adam Turner.
22+
* #12295: Re-export various objects from ``sphinx.domains.python._annotations``
23+
in ``sphinx.domains.python``.
24+
Patch by Jacob Chesslo and Adam Turner.
25+
26+
Release 7.3.5 (released Apr 17, 2024)
27+
=====================================
28+
29+
Bugs fixed
30+
----------
31+
32+
* #12295: Re-export various objects from ``sphinx.domains.python._object``
33+
in ``sphinx.domains.python``.
34+
Patch by Jacob Chesslo and Adam Turner.
35+
36+
Release 7.3.4 (released Apr 17, 2024)
37+
=====================================
38+
39+
Bugs fixed
40+
----------
41+
42+
* Handle cases when ``Any`` is not an instance of ``type``.
43+
Patch by Adam Turner.
44+
45+
Release 7.3.3 (released Apr 17, 2024)
46+
=====================================
47+
48+
Bugs fixed
49+
----------
50+
51+
* #12290: Fix a false-positive warning when setting a configuration value
52+
with ``Any`` as the valid type to a type other than the value's default.
53+
Patch by Adam Turner.
54+
55+
Release 7.3.2 (released Apr 17, 2024)
56+
=====================================
57+
58+
Bugs fixed
59+
----------
60+
61+
* Preload all themes defined via entry points.
62+
Patch by Adam Turner.
63+
* Fix a bad interaction between the ``'Furo'`` theme and the new-style for
64+
configuration values.
65+
Patch by Adam Turner.
66+
67+
Release 7.3.1 (released Apr 17, 2024)
68+
=====================================
369

470
Dependencies
571
------------
672

7-
* #11411: Support `Docutils 0.21`_. Patch by Adam Turner.
73+
* Require ``tomli`` on Python 3.10 and earlier.
74+
Patch by Adam Turner.
875

9-
.. _Docutils 0.21: https://docutils.sourceforge.io/RELEASE-NOTES.html#release-0-21-2024-04-09
76+
Release 7.3.0 (released Apr 16, 2024)
77+
=====================================
1078

11-
Incompatible changes
12-
--------------------
79+
Dependencies
80+
------------
81+
82+
* #11858: Increase the minimum supported version of Alabaster to 0.7.14.
83+
Patch by Adam Turner.
84+
* #11411: Support `Docutils 0.21`_. Patch by Adam Turner.
85+
86+
.. _Docutils 0.21: https://docutils.sourceforge.io/RELEASE-NOTES.html#release-0-21-2024-04-09
87+
* #12012: Use ``types-docutils`` instead of ``docutils-stubs``.
1388

1489
Deprecated
1590
----------
@@ -22,59 +97,57 @@ Deprecated
2297
the public properties :attr:`!sphinx.testing.util.SphinxTestApp.status`
2398
and :attr:`!sphinx.testing.util.SphinxTestApp.warning` instead.
2499
Patch by Bénédikt Tran.
25-
* tests: :func:`!sphinx.testing.util.strip_escseq` is deprecated in favor of
100+
* tests: :func:`!sphinx.testing.util.strip_escseq` is deprecated in favour of
26101
:func:`!sphinx.util.console.strip_colors`.
27102
Patch by Bénédikt Tran.
28103

29104
Features added
30105
--------------
31106

32-
* Add public type alias :class:`sphinx.util.typing.ExtensionMetadata`.
33-
This can be used by extension developers
34-
to annotate the return type of their ``setup`` function.
35-
Patch by Chris Sewell.
36-
37-
* #12193: Improve ``external`` warnings for unknown roles.
38-
In particular, suggest related role names if an object type is mistakenly used.
39-
Patch by Chris Sewell.
40-
41-
* #12131: Added :confval:`show_warning_types` configuration option.
42-
Patch by Chris Sewell.
43-
107+
* #12265: Support theme configuration via ``theme.toml``.
44108
* #11701: HTML Search: Adopt the new `\<search\>`_ element.
45109
Patch by Bénédikt Tran.
46110

47111
.. _`\<search\>`: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/search
48-
112+
* #11776: Add long option names to ``sphinx-build``.
113+
Patch by Hugo van Kemenade, Adam Turner, Bénédikt Tran, and Ezio Melotti.
114+
* Organise the ``sphinx-build`` options into groups.
115+
Patch by Adam Turner.
116+
* #11855: Defer computation of configuration values.
117+
Patch by Adam Turner.
118+
* Add ``:no-search:`` as an alias of the ``:nosearch:`` metadata field.
119+
Patch by Adam Turner.
49120
* #11803: autodoc: Use an overriden ``__repr__()`` function in an enum,
50121
if defined. Patch by Shengyu Zhang.
51-
52-
* #11892: Improved performance when resolving cross references in cpp domain.
122+
* #11825: Allow custom targets in the manpage role.
123+
Patch by Nicolas Peugnet.
124+
* #11892: Improved performance when resolving cross references in the C++ domain.
53125
Patch by Rouslan Korneychuk.
54-
126+
* #11905: Add a :rst:dir:`versionremoved` directive.
127+
Patch by Hugo van Kemenade, Adam Turner, and C.A.M. Gerlach.
55128
* #11981: Improve rendering of signatures using ``slice`` syntax,
56129
e.g., ``def foo(arg: np.float64[:,:]) -> None: ...``.
57-
58130
* The manpage builder now adds `OSC 8`_ anchors to hyperlinks, using
59131
the `groff`_ device control command.
60132

61133
.. _OSC 8: https://gist.github.com/egmontkob/eb114294efbcd5adb1944c9f3cb5feda
62134
.. _groff: https://lists.gnu.org/archive/html/groff/2021-10/msg00000.html
63-
64-
* #11015: :rst:dir:`versionadded` wording changes from ``New in [...]``
65-
to ``Added in [...]``.
135+
* #11015: Change the text of the :rst:dir:`versionadded` directive from
136+
``New in [...]`` to ``Added in [...]``.
66137
Patch by Bénédikt Tran.
67-
138+
* #12131: Added :confval:`show_warning_types` configuration option.
139+
Patch by Chris Sewell.
140+
* #12193: Improve ``external`` warnings for unknown roles.
141+
In particular, suggest related role names if an object type is mistakenly used.
142+
Patch by Chris Sewell.
143+
* Add public type alias :class:`sphinx.util.typing.ExtensionMetadata`.
144+
This can be used by extension developers
145+
to annotate the return type of their ``setup`` function.
146+
Patch by Chris Sewell.
68147

69148
Bugs fixed
70149
----------
71150

72-
* #11959: Fix multiple term matching when word appears in both title and document.
73-
Patch by Will Lachance.
74-
* #11958: HTML Search: Fix partial matches overwriting full matches.
75-
Patch by William Lachance.
76-
* #11944: Use anchor in search preview.
77-
Patch by Will Lachance.
78151
* #11668: Raise a useful error when ``theme.conf`` is missing.
79152
Patch by Vinay Sajip.
80153
* #11622: Ensure that the order of keys in ``searchindex.js`` is deterministic.
@@ -100,9 +173,13 @@ Bugs fixed
100173
* #11675: Fix rendering of progression bars in environments that do not support
101174
ANSI control sequences.
102175
Patch by Bénédikt Tran.
176+
* #11861: Whitelist more types with an incorrect ``__module__`` attribute.
177+
Patch by Adam Turner.
103178
* #11715: Apply ``tls_verify`` and ``tls_cacerts`` config to
104179
``ImageDownloader``.
105180
Patch by Nick Touran.
181+
* Allow hyphens in group names for :rst:dir:`productionlist` cross-references.
182+
Patch by Adam Turner.
106183
* #11433: Added the :confval:`linkcheck_allow_unauthorized` configuration option.
107184
Set this option to ``False`` to report HTTP 401 (unauthorized) server
108185
responses as broken.
@@ -119,25 +196,37 @@ Bugs fixed
119196
Patch by Colin Marquardt.
120197
* #11598: Do not use query components in URLs for assets in EPUB rendering.
121198
Patch by David Runge.
122-
* #11917: Fix rendering of annotated inherited members for Python 3.9.
123-
Patch by Janet Carson.
199+
* #11904: Support unary subtraction when parsing annotations.
200+
Patch by James Addison.
124201
* #11925: Blacklist the ``sphinxprettysearchresults`` extension; the functionality
125202
it provides was merged into Sphinx v2.0.0.
126203
Patch by James Addison.
204+
* #11917: Fix rendering of annotated inherited members for Python 3.9.
205+
Patch by Janet Carson.
206+
* #11935: C Domain: Fix namespace-pop context.
207+
Patch by Frank Dana.
208+
* #11923: Avoid zombie processes when parallel builds fail.
209+
Patch by Felix von Drigalski.
127210
* #11353: Support enumeration classes inheriting from mixin or data types.
128211
Patch by Bénédikt Tran.
129212
* #11962: Fix target resolution when using ``:paramtype:`` fields.
130213
Patch by Bénédikt Tran.
214+
* #11944: Use anchor in search preview.
215+
Patch by Will Lachance.
131216
* #12008: Fix case-sensitive lookup of ``std:label`` names in intersphinx inventory.
132217
Patch by Michael Goerz.
218+
* #11958: HTML Search: Fix partial matches overwriting full matches.
219+
Patch by William Lachance.
220+
* #11959: Fix multiple term matching when word appears in both title and document.
221+
Patch by Will Lachance.
133222
* #11474: Fix doctrees caching causing files not be rebuilt in some cases,
134223
e.g., when :confval:`numfig` is ``True``.
135224
Patch by Bénédikt Tran.
136225
* #11278: autodoc: Fix rendering of :class:`functools.singledispatchmethod`
137226
combined with :func:`@classmethod <classmethod>`.
138227
Patch by Bénédikt Tran.
139228
* #11894: Do not add checksums to css files if building using the htmlhelp builder.
140-
Patch by mkay.
229+
Patch by reduerK akiM.
141230
* #12052: Remove ``<script>`` and ``<style>`` tags from the content of search result
142231
summary snippets.
143232
Patch by James Addison.
@@ -155,26 +244,33 @@ Bugs fixed
155244
Patch by James Addison.
156245
* #11970: singlehtml builder: make target URIs to be same-document references in
157246
the sense of :rfc:`RFC 3986, §4.4 <3986#section-4.4>`, e.g., ``index.html#foo``
158-
becomes ``#foo``. Patch by eanorige.
247+
becomes ``#foo``. Patch by Eric Norige.
159248
* #12271: Partially revert Docutils' r9562__ to fix EPUB files.
160249
Patch by Adam Turner.
161250

162251
__ https://sourceforge.net/p/docutils/code/9562/
252+
* #12253: Escape reserved path characters in the remote images post-transform
253+
download cache.
254+
Patch by James Addison and Adam Turner.
163255

164256
Testing
165257
-------
258+
259+
* Reorganise tests into directories.
260+
Patch by Adam Turner.
261+
* Clean up global state in ``SphinxTestApp``.
262+
Patch by Adam Turner.
166263
* #11285: :func:`!pytest.mark.sphinx` and :class:`!sphinx.testing.util.SphinxTestApp`
167264
accept *warningiserror*, *keep_going* and *verbosity* as keyword arguments.
168265
Patch by Bénédikt Tran.
169266
* #11285: :class:`!sphinx.testing.util.SphinxTestApp` *status* and *warning*
170267
arguments are checked to be :class:`io.StringIO` objects (the public API
171268
incorrectly assumed this without checking it).
172269
Patch by Bénédikt Tran.
173-
174-
* pytest: report the result of ``test_run_epubcheck`` as ``skipped`` instead of
175-
``success`` when Java and/or the ``epubcheck.jar`` code are not available.
176-
* utils: use dynamic allocation of unused port numbers for the test HTTP(S)
177-
servers. As a side-effect, this removes the need for test server lockfiles,
270+
* Report the result of ``test_run_epubcheck`` as ``skipped`` instead of
271+
``success`` when either Java or ``epubcheck`` are not available.
272+
* Use dynamic allocation of unused port numbers for the test HTTP(S) servers.
273+
As a side-effect, this removes the need for test server lockfiles,
178274
meaning that any remaining ``tests/test-server.lock`` files can safely be
179275
deleted.
180276

doc/usage/configuration.rst

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ General configuration
345345
* ``app.add_role``
346346
* ``app.add_generic_role``
347347
* ``app.add_source_parser``
348-
* ``autosectionlabel.*``
348+
* ``config.cache``
349349
* ``download.not_readable``
350350
* ``epub.unknown_project_files``
351351
* ``epub.duplicated_toc_entry``
@@ -367,7 +367,14 @@ General configuration
367367
* ``toc.not_readable``
368368
* ``toc.secnum``
369369

370-
Then extensions can also define their own warning types.
370+
Extensions can also define their own warning types.
371+
Those defined by the first-party ``sphinx.ext`` extensions are:
372+
373+
* ``autodoc``
374+
* ``autodoc.import_object``
375+
* ``autosectionlabel.<document name>``
376+
* ``autosummary``
377+
* ``intersphinx.external``
371378

372379
You can choose from these types. You can also give only the first
373380
component to exclude all warnings attached to it.
@@ -388,7 +395,7 @@ General configuration
388395

389396
.. versionchanged:: 2.1
390397

391-
Added ``autosectionlabel.*``
398+
Added ``autosectionlabel.<document name>``
392399

393400
.. versionchanged:: 3.3.0
394401

@@ -402,9 +409,13 @@ General configuration
402409

403410
Added ``i18n.inconsistent_references``
404411

405-
.. versionadded:: 7.1
412+
.. versionadded:: 7.1
413+
414+
Added ``index`` warning type.
415+
416+
.. versionadded:: 7.3
406417

407-
Added ``index`` warning type.
418+
Added ``config.cache`` warning type.
408419

409420
.. confval:: needs_sphinx
410421

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ dependencies = [
7272
"requests>=2.25.0",
7373
"packaging>=21.0",
7474
"importlib-metadata>=4.8; python_version < '3.10'",
75+
"tomli>=2; python_version < '3.11'",
7576
"colorama>=0.4.5; sys_platform == 'win32'",
7677
]
7778
dynamic = ["version"]

sphinx/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""The Sphinx documentation toolchain."""
22

3-
__version__ = '7.3.0'
3+
__version__ = '7.3.7'
44
__display_version__ = __version__ # used for command line version
55

66
# Keep this file executable as-is in Python 3!
@@ -28,11 +28,11 @@
2828
#:
2929
#: .. versionadded:: 1.2
3030
#: Before version 1.2, check the string ``sphinx.__version__``.
31-
version_info = (7, 3, 0, 'beta', 0)
31+
version_info = (7, 3, 7, 'final', 0)
3232

3333
package_dir = path.abspath(path.dirname(__file__))
3434

35-
_in_development = True
35+
_in_development = False
3636
if _in_development:
3737
# Only import subprocess if needed
3838
import subprocess

0 commit comments

Comments
 (0)