From 967a88963fa619c924a76667a4ed13d38b0c1c69 Mon Sep 17 00:00:00 2001 From: Sandra McCann Date: Fri, 17 Feb 2023 13:32:21 -0500 Subject: [PATCH] Update docs requirements to latest package versions (#79930) Co-authored-by: Matt Clay --- .../_data/requirements/sanity.changelog.in | 4 +- .../_data/requirements/sanity.changelog.txt | 6 +- .../code-smell/docs-build.requirements.in | 4 +- .../code-smell/docs-build.requirements.txt | 59 ++++++++++--------- .../code-smell/package-data.requirements.in | 2 +- .../code-smell/package-data.requirements.txt | 4 +- test/sanity/code-smell/rstcheck.py | 2 +- .../code-smell/rstcheck.requirements.in | 4 +- .../code-smell/rstcheck.requirements.txt | 12 ++-- 9 files changed, 54 insertions(+), 43 deletions(-) diff --git a/test/lib/ansible_test/_data/requirements/sanity.changelog.in b/test/lib/ansible_test/_data/requirements/sanity.changelog.in index 7f231827dd2..fb149a0a684 100644 --- a/test/lib/ansible_test/_data/requirements/sanity.changelog.in +++ b/test/lib/ansible_test/_data/requirements/sanity.changelog.in @@ -1,3 +1,3 @@ -rstcheck < 4 # match version used in other sanity tests +rstcheck < 6 # match version used in other sanity tests antsibull-changelog -docutils < 0.18 # match version required by sphinx in the docs-build sanity test +docutils diff --git a/test/lib/ansible_test/_data/requirements/sanity.changelog.txt b/test/lib/ansible_test/_data/requirements/sanity.changelog.txt index ff53adf7b4d..f2779f72148 100644 --- a/test/lib/ansible_test/_data/requirements/sanity.changelog.txt +++ b/test/lib/ansible_test/_data/requirements/sanity.changelog.txt @@ -1,7 +1,9 @@ # edit "sanity.changelog.in" and generate with: hacking/update-sanity-requirements.py --test changelog antsibull-changelog==0.18.0 -docutils==0.17.1 +docutils==0.18.1 packaging==23.0 PyYAML==6.0 -rstcheck==3.5.0 +rstcheck==5.0.0 semantic-version==2.10.0 +types-docutils==0.18.3 +typing_extensions==4.5.0 diff --git a/test/sanity/code-smell/docs-build.requirements.in b/test/sanity/code-smell/docs-build.requirements.in index ca5e176d243..000eed7571d 100644 --- a/test/sanity/code-smell/docs-build.requirements.in +++ b/test/sanity/code-smell/docs-build.requirements.in @@ -1,9 +1,9 @@ jinja2 pyyaml resolvelib < 0.10.0 -sphinx == 4.2.0 +sphinx == 5.3.0 sphinx-notfound-page sphinx-ansible-theme straight.plugin -rstcheck < 4 # match version used in other sanity tests +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 antsibull-docs == 1.9.0 # currently approved version diff --git a/test/sanity/code-smell/docs-build.requirements.txt b/test/sanity/code-smell/docs-build.requirements.txt index 123f24e1f5e..99a41955890 100644 --- a/test/sanity/code-smell/docs-build.requirements.txt +++ b/test/sanity/code-smell/docs-build.requirements.txt @@ -1,50 +1,53 @@ # edit "docs-build.requirements.in" and generate with: hacking/update-sanity-requirements.py --test docs-build -aiofiles==22.1.0 -aiohttp==3.8.3 -aiosignal==1.2.0 -alabaster==0.7.12 +aiofiles==23.1.0 +aiohttp==3.8.4 +aiosignal==1.3.1 +alabaster==0.7.13 ansible-pygments==0.1.1 -antsibull-core==1.2.0 +antsibull-core==1.5.1 antsibull-docs==1.9.0 async-timeout==4.0.2 asyncio-pool==0.6.0 -attrs==22.1.0 -Babel==2.10.3 -certifi==2022.9.14 -charset-normalizer==2.1.1 -docutils==0.17.1 -frozenlist==1.3.1 +attrs==22.2.0 +Babel==2.11.0 +certifi==2022.12.7 +charset-normalizer==3.0.1 +docutils==0.18.1 +frozenlist==1.3.3 idna==3.4 imagesize==1.4.1 +importlib-metadata==6.0.0 Jinja2==3.1.2 -MarkupSafe==2.1.1 -multidict==6.0.2 -packaging==21.3 +MarkupSafe==2.1.2 +multidict==6.0.4 +packaging==23.0 perky==0.5.5 -pydantic==1.10.2 -Pygments==2.13.0 -pyparsing==3.0.9 -pytz==2022.2.1 +pydantic==1.10.5 +Pygments==2.14.0 +pytz==2022.7.1 PyYAML==6.0 -requests==2.28.1 +requests==2.28.2 resolvelib==0.9.0 -rstcheck==3.5.0 +rstcheck==5.0.0 semantic-version==2.10.0 sh==1.14.3 six==1.16.0 snowballstemmer==2.2.0 -Sphinx==4.2.0 -sphinx-ansible-theme==0.9.1 +Sphinx==5.3.0 +sphinx-ansible-theme==0.10.1 sphinx-notfound-page==0.8.3 -sphinx-rtd-theme==1.0.0 -sphinxcontrib-applehelp==1.0.2 +sphinx-rtd-theme==1.2.0 +sphinxcontrib-applehelp==1.0.4 sphinxcontrib-devhelp==1.0.2 -sphinxcontrib-htmlhelp==2.0.0 +sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-jquery==2.0.0 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 straight.plugin==1.5.0 Twiggy==0.5.1 -typing_extensions==4.3.0 -urllib3==1.26.12 -yarl==1.8.1 +types-docutils==0.18.3 +typing_extensions==4.5.0 +urllib3==1.26.14 +yarl==1.8.2 +zipp==3.13.0 diff --git a/test/sanity/code-smell/package-data.requirements.in b/test/sanity/code-smell/package-data.requirements.in index 4d5e0984285..9cb006c72ad 100644 --- a/test/sanity/code-smell/package-data.requirements.in +++ b/test/sanity/code-smell/package-data.requirements.in @@ -2,6 +2,6 @@ docutils < 0.18 # match version required by sphinx in the docs-build sanity tes jinja2 pyyaml # ansible-core requirement resolvelib < 0.10.0 -rstcheck < 4 # match version used in other sanity tests +rstcheck < 6 # match version used in other sanity tests straight.plugin antsibull-changelog diff --git a/test/sanity/code-smell/package-data.requirements.txt b/test/sanity/code-smell/package-data.requirements.txt index 5b9a534d6ad..fc436d67999 100644 --- a/test/sanity/code-smell/package-data.requirements.txt +++ b/test/sanity/code-smell/package-data.requirements.txt @@ -6,6 +6,8 @@ MarkupSafe==2.1.2 packaging==23.0 PyYAML==6.0 resolvelib==0.9.0 -rstcheck==3.5.0 +rstcheck==5.0.0 semantic-version==2.10.0 straight.plugin==1.5.0 +types-docutils==0.18.3 +typing_extensions==4.5.0 diff --git a/test/sanity/code-smell/rstcheck.py b/test/sanity/code-smell/rstcheck.py index 99917ca80ef..4b5a43e69cd 100644 --- a/test/sanity/code-smell/rstcheck.py +++ b/test/sanity/code-smell/rstcheck.py @@ -17,7 +17,7 @@ def main(): cmd = [ sys.executable, - '-m', 'rstcheck', + '-c', 'import rstcheck; rstcheck.main();', '--report', 'warning', '--ignore-substitutions', ','.join(ignore_substitutions), ] + paths diff --git a/test/sanity/code-smell/rstcheck.requirements.in b/test/sanity/code-smell/rstcheck.requirements.in index 5b93841d36b..e50882bd9b1 100644 --- a/test/sanity/code-smell/rstcheck.requirements.in +++ b/test/sanity/code-smell/rstcheck.requirements.in @@ -1,3 +1,3 @@ -sphinx == 4.2.0 # required for full rstcheck functionality, installed first to get the correct docutils version -rstcheck < 4 # match version used in other sanity tests +sphinx == 5.3.0 # required for full rstcheck functionality, installed first to get the correct docutils version +rstcheck < 6 # match version used in other sanity tests - specifically docs-build jinja2 # ansible-core requirement diff --git a/test/sanity/code-smell/rstcheck.requirements.txt b/test/sanity/code-smell/rstcheck.requirements.txt index b51d1f1af81..e2150a2d0da 100644 --- a/test/sanity/code-smell/rstcheck.requirements.txt +++ b/test/sanity/code-smell/rstcheck.requirements.txt @@ -3,22 +3,26 @@ alabaster==0.7.13 Babel==2.11.0 certifi==2022.12.7 charset-normalizer==3.0.1 -docutils==0.17.1 +docutils==0.18.1 idna==3.4 imagesize==1.4.1 +importlib-metadata==6.0.0 Jinja2==3.1.2 MarkupSafe==2.1.2 packaging==23.0 Pygments==2.14.0 pytz==2022.7.1 requests==2.28.2 -rstcheck==3.5.0 +rstcheck==5.0.0 snowballstemmer==2.2.0 -Sphinx==4.2.0 +Sphinx==5.3.0 sphinxcontrib-applehelp==1.0.4 sphinxcontrib-devhelp==1.0.2 -sphinxcontrib-htmlhelp==2.0.0 +sphinxcontrib-htmlhelp==2.0.1 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 +types-docutils==0.18.3 +typing_extensions==4.5.0 urllib3==1.26.14 +zipp==3.13.0