-
-
Notifications
You must be signed in to change notification settings - Fork 453
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Trac #26451: Upgrade to Sphinx 1.8.5
This ticket upgrades Sphinx to version 1.8.5. Our previous upgrade was to Sphinx 1.7.6 in #26033. '''Tarball''': https://files.pythonhosted.org/packages/2a/86/8e1e8400bb6 eca5ed960917952600fce90599e1cb0d20ddedd81ba163370/Sphinx-1.8.5.tar.gz URL: https://trac.sagemath.org/26451 Reported by: saraedum Ticket author(s): Julian Rüth, Jeroen Demeyer, John Palmieri, Tobias Hansen Reviewer(s): Dima Pasechnik
- Loading branch information
Showing
11 changed files
with
69 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
tarball=Sphinx-VERSION.tar.gz | ||
sha1=3caa8c2d3f9b283e32df259baee885c0340c5d02 | ||
md5=8fbd77d80c8e0966964751ab31a0204a | ||
cksum=1266150694 | ||
sha1=93e715cb5d16d981698caa2d54b3b58596798f5d | ||
md5=554f7a4e752f48b2601e5ef5ab463346 | ||
cksum=2134440192 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
1.7.6.p1 | ||
1.8.5.p0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,16 @@ | ||
Prevent Sphinx from rebuilding documentation that is already built | ||
|
||
diff -ru a/sphinx/environment/__init__.py b/sphinx/environment/__init__.py | ||
--- a/sphinx/environment/__init__.py 2017-05-15 19:15:50.000000000 +0200 | ||
+++ b/sphinx/environment/__init__.py 2017-05-18 13:42:40.871043207 +0200 | ||
@@ -512,8 +512,11 @@ | ||
--- a/sphinx/environment/__init__.py 2017-05-15 19:15:50.000000000 +0200 | ||
+++ b/sphinx/environment/__init__.py 2017-05-18 13:42:40.871043207 +0200 | ||
@@ -251,7 +251,10 @@ | ||
else: | ||
# check if a config value was changed that affects how | ||
# doctrees are read | ||
+ import inspect | ||
for confval in config.filter('env'): | ||
if self.config[confval.name] != confval.value: | ||
+ if inspect.isfunction(confval.value): | ||
+ continue | ||
msg = '[config changed] ' | ||
config_changed = True | ||
for item in config.filter('env'): | ||
+ if inspect.isfunction(item.value): | ||
+ continue | ||
if self.config[item.name] != item.value: | ||
self.config_status = CONFIG_CHANGED | ||
break |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters