Skip to content

Commit 60a094b

Browse files
authored
Merge branch 'master' into Blendify/python-compat
2 parents bba3667 + 9df65f1 commit 60a094b

File tree

5 files changed

+15
-4
lines changed

5 files changed

+15
-4
lines changed

docs/changelog.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,16 @@ Fixes
3939
* Respect tab order for prev/next buttons (#1051)
4040
* Nav: Don't toggle terminal nodes (#1049)
4141

42+
v0.5.2
43+
======
44+
45+
:Date: April 5, 2021
46+
47+
.. note:: This commit will not be in ``master``, but was branched directly off ``0.5.1`` to minimize issues.
48+
The next full release will contain all PR's previously merged.
49+
50+
* Depend on docutils < 0.17 (#1113)
51+
4252
v0.5.1
4353
======
4454

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
intersphinx_mapping = {
4343
'rtd': ('https://docs.readthedocs.io/en/stable/', None),
44-
'sphinx': ('https://www.sphinx-doc.org/en/stable/', None),
44+
'sphinx': ('https://www.sphinx-doc.org/en/master/', None),
4545
}
4646

4747
html_theme = 'sphinx_rtd_theme'

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "sphinx_rtd_theme",
33
"main": "js/theme.js",
4-
"version": "0.5.1",
4+
"version": "0.5.2",
55
"scripts": {
66
"dev": "webpack-dev-server --open --config webpack.dev.js",
77
"build": "webpack --config webpack.prod.js",

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def run(self):
8787

8888
setup(
8989
name='sphinx_rtd_theme',
90-
version='0.5.1',
90+
version='0.5.2',
9191
url='https://github.com/readthedocs/sphinx_rtd_theme',
9292
license='MIT',
9393
author='Dave Snider, Read the Docs, Inc. & contributors',
@@ -119,6 +119,7 @@ def run(self):
119119
python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
120120
install_requires=[
121121
'sphinx>=1.6',
122+
'docutils<0.17', # https://github.com/sphinx-doc/sphinx/issues/9001
122123
],
123124
tests_require=[
124125
'pytest',

0 commit comments

Comments
 (0)