Merge branch 'master' into Blendify/fix-1108

readthedocs · Apr 5, 2021 · 4d14428 · 4d14428
2 parents 69f0472 + ca2719b
commit 4d14428
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -39,6 +39,16 @@ Fixes
 * Respect tab order for prev/next buttons (#1051)
 * Nav: Don't toggle terminal nodes (#1049)
 
+v0.5.2
+======
+
+:Date: April 5, 2021
+
+.. note:: This commit will not be in ``master``, but was branched directly off ``0.5.1`` to minimize issues.
+          The next full release will contain all PR's previously merged.
+
+* Depend on docutils < 0.17 (#1113)
+
 v0.5.1
 ======
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -41,7 +41,7 @@
 
 intersphinx_mapping = {
     'rtd': ('https://docs.readthedocs.io/en/stable/', None),
-    'sphinx': ('https://www.sphinx-doc.org/en/stable/', None),
+    'sphinx': ('https://www.sphinx-doc.org/en/master/', None),
 }
 
 html_theme = 'sphinx_rtd_theme'

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sphinx_rtd_theme",
   "main": "js/theme.js",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "scripts": {
     "dev": "webpack-dev-server --open --config webpack.dev.js",
     "build": "webpack --config webpack.prod.js",

diff --git a/setup.py b/setup.py
@@ -87,7 +87,7 @@ def run(self):
 
 setup(
     name='sphinx_rtd_theme',
-    version='0.5.1',
+    version='0.5.2',
     url='https://github.com/readthedocs/sphinx_rtd_theme',
     license='MIT',
     author='Dave Snider, Read the Docs, Inc. & contributors',
@@ -118,6 +118,7 @@ def run(self):
     },
     install_requires=[
         'sphinx>=1.6'
+        'docutils<0.17', # https://github.com/sphinx-doc/sphinx/issues/9001
     ],
     tests_require=[
         'pytest',