From ca2719b32fcae38923d4830963431e54ded69aae Mon Sep 17 00:00:00 2001 From: Eric Holscher <25510+ericholscher@users.noreply.github.com> Date: Mon, 5 Apr 2021 10:14:49 -0700 Subject: [PATCH] Merge Release 0.5.2 Changelog into master (#1114) * Setup: Require docutils<0.17' Docutils 0.17 changes some rendering of properties, until support is added we should probably pin to use an older version. I may not be a bad idea to keep a pinned version in the theme to prevent this issue in the future. * Release 0.5.2 Include a changelog and bump versions * Fix changelog Co-authored-by: Aaron Carlisle --- docs/changelog.rst | 10 ++++++++++ package-lock.json | 2 +- package.json | 2 +- setup.py | 3 ++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 95ded7799..9ef2299ae 100644 --- 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/package-lock.json b/package-lock.json index 38150720e..ab0e53f78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "sphinx_rtd_theme", - "version": "0.5.1", + "version": "0.5.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index d7bfff2a2..1f2b85ce1 100644 --- 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 index 362c81398..788318b3d 100644 --- 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',