Skip to content

Commit

Permalink
Trac #34615: Update to sphinx 5.2
Browse files Browse the repository at this point in the history
New changes in sphinx requires new attributes to be defined. Supporting
this change introduces non fatal error and warnings when building with
older version of sphinx.

Therefore we think it is time to upgrade sphinx in sage.

The ticket update
* sphinx to 5.2.3
* sphinxcontrib_websupport to 1.2.4 (no other sphinxcontrib package seem
out of date)
* imagesize to 1.4.1 (required dependency)

URL: https://trac.sagemath.org/34615
Reported by: arojas
Ticket author(s): Antonio Rojas, François Bissey
Reviewer(s): Kwankyu Lee
  • Loading branch information
Release Manager committed Oct 11, 2022
2 parents 685a07c + 8f8af65 commit 7563675
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 13 deletions.
6 changes: 3 additions & 3 deletions build/pkgs/imagesize/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=imagesize-VERSION.tar.gz
sha1=b88a92cabe93b5a53faacb1cff4e50f8a2d9427a
md5=3a1e124594183778a8f87e4bcdb6dca9
cksum=2804705518
sha1=89627e703f80c3ad2a77cc8168d85d119e71dcbe
md5=5a40586a25c07e1a8f16f6267252c321
cksum=3711184129
upstream_url=https://pypi.io/packages/source/i/imagesize/imagesize-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/imagesize/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.0
1.4.1
6 changes: 3 additions & 3 deletions build/pkgs/sphinx/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=Sphinx-VERSION.tar.gz
sha1=c0aa13911c331244877fc3947c0e7cec10d9e72b
md5=663e2f2ee9219ef4913831950825f68b
cksum=1902891868
sha1=bef629b31b868d3b031050bd36653696f6b73d8e
md5=327ae7af29b3f08f059b52a4b9ed98cb
cksum=2569899835
upstream_url=https://pypi.io/packages/source/s/sphinx/Sphinx-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/sphinx/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sphinx >=4.3, <4.5
sphinx >=5.2, <6
2 changes: 1 addition & 1 deletion build/pkgs/sphinx/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.4.0
5.2.3
6 changes: 3 additions & 3 deletions build/pkgs/sphinxcontrib_websupport/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=sphinxcontrib-websupport-VERSION.tar.gz
sha1=313f4b764872d36f890e76579985e6aaa732f4ca
md5=4fe4d07afe1556c65182d0437228d7bb
cksum=1830011133
sha1=39f6170825895ffeb0e06d52e351932b5f0c0147
md5=eecfd8dc4933bd28c07ffb5e64fa2444
cksum=431532871
upstream_url=https://pypi.io/packages/source/s/sphinxcontrib-websupport/sphinxcontrib-websupport-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/sphinxcontrib_websupport/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.1
1.2.4
4 changes: 4 additions & 0 deletions src/sage_docbuild/ext/multidocs.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,10 @@ def merge_js_index(app):
titles = app.builder.indexer._titles
for (res, title) in index._titles.items():
titles[fixpath(res)] = title
# merge the alltitles
alltitles = app.builder.indexer._all_titles
for (res, alltitle) in index._all_titles.items():
alltitles[fixpath(res)] = alltitle
# merge the filenames
filenames = app.builder.indexer._filenames
for (res, filename) in index._filenames.items():
Expand Down

0 comments on commit 7563675

Please sign in to comment.