diff --git a/dev-requirements.txt b/dev-requirements.txt index 65843441a..685ebda78 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -76,7 +76,10 @@ tox>=2.5.0 # Python 2.7, so we can no longer build the docs on Python 2.7. # Note: The docs build tools from Ansible 2.10 (in ../ansible) require # antsibull, which supports only py>=3.6. -Sphinx>=3.0.0; python_version >= '3.6' +# Note: Sphinx 4.0 removed the deprecated Sphinx.add_stylesheet() which causes +# sphinx-versions to fail that uses it. A circumvention is to pin +# Sphinx to <4.0. +Sphinx>=3.0.0,<4.0.0; python_version >= '3.6' sphinxcontrib-fulltoc>=1.2.0; python_version >= '3.6' sphinxcontrib-websupport>=1.1.2; python_version >= '3.6' Pygments>=2.1.3; python_version >= '3.6' diff --git a/docs/source/release_notes.rst b/docs/source/release_notes.rst index 4d1c28a5a..c26b2f133 100644 --- a/docs/source/release_notes.rst +++ b/docs/source/release_notes.rst @@ -53,6 +53,10 @@ Released: not yet version instead of the latest version. Added a bibliography entry for the Ansible Collection Index for Ansible 2.10 and later. +* Docs: Pinned Sphinx to <4.0 to circumvent the issue that sphinx-versions + uses the deprecated Sphinx.add_stylesheet() method that was removed in + Sphinx 4.0. (issue #402) + **Enhancements:** * Docs: The idempotency of each module and possible limitations are now