From 3962c4478d7d6688b42bec39520fefbc10b2fb0d Mon Sep 17 00:00:00 2001 From: Don Naro Date: Wed, 15 Jan 2025 10:50:06 +0000 Subject: [PATCH] tidy up pins and reqs --- tests/constraints.in | 3 +++ tests/requirements.in | 15 +++++---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/tests/constraints.in b/tests/constraints.in index bf2979578a..4a3094843a 100644 --- a/tests/constraints.in +++ b/tests/constraints.in @@ -1,5 +1,8 @@ # This constraints file contains pins for the stable, tested versions of sphinx # and antsibull-docs that production builds rely upon. +# This constraint file also pins other versions for which there are known limitations. sphinx == 7.2.5 antsibull-docs == 2.16.2 # currently approved version +sphinx-rtd-theme >= 2.0.0 # Fix 404 pages with new sphinx -- https://github.com/ansible/ansible-documentation/issues/678 +rstcheck < 6 # rstcheck 6.x has problem with rstcheck.core triggered by include files w/ sphinx directives https://github.com/rstcheck/rstcheck-core/issues/3 diff --git a/tests/requirements.in b/tests/requirements.in index 77dbff0cfb..d407c10deb 100644 --- a/tests/requirements.in +++ b/tests/requirements.in @@ -1,22 +1,17 @@ # This requirements file is used for doc builds -# It depends on specific, tested antsibull-docs and sphinx versions -c constraints.in # <-- contains known limitations # Base set of dependencies. +antsibull-docs sphinx sphinx-intl # translation utility used by docs/docsite/Makefile -sphinx-notfound-page -sphinx-ansible-theme -antsibull-docs +sphinx-notfound-page # extension used for the custom 404 page (cowsay) +sphinx-ansible-theme # extension used for the custom docs theme +sphinx-rtd-theme +rstcheck sphinx-copybutton - -# Known limitations for indirect/transitive dependencies. - jinja2 >= 3.0.0 # used by hacking/build_library/build_ansible/command_plugins/generate_man.py and dump_keywords.py pyyaml >= 5.1 # used by ansible-core resolvelib >= 0.5.3, < 1.1.0 # used by ansible-core -sphinx-rtd-theme>=2.0.0 # Fix 404 pages with new sphinx -- https://github.com/ansible/ansible-documentation/issues/678 -rstcheck < 6 # rstcheck 6.x has problem with rstcheck.core triggered by include files w/ sphinx directives https://github.com/rstcheck/rstcheck-core/issues/3 -