diff --git a/hacking/build_library/build_ansible/command_plugins/docs_build.py b/hacking/build_library/build_ansible/command_plugins/docs_build.py index bb25fbc7bee..e064bfdddad 100644 --- a/hacking/build_library/build_ansible/command_plugins/docs_build.py +++ b/hacking/build_library/build_ansible/command_plugins/docs_build.py @@ -10,6 +10,7 @@ import os.path import pathlib import shutil +import subprocess from tempfile import TemporaryDirectory import yaml @@ -148,11 +149,14 @@ def generate_core_docs(args): def generate_full_docs(args): """Regenerate the documentation for all plugins listed in the plugin_to_collection_file.""" # imports here so that they don't cause unnecessary deps for all of the plugins - import sh from antsibull_docs.cli import antsibull_docs with TemporaryDirectory() as tmp_dir: - sh.git(['clone', 'https://github.com/ansible-community/ansible-build-data'], _cwd=tmp_dir) + subprocess.run( + ['git', 'clone', 'https://github.com/ansible-community/ansible-build-data'], + check=True, + cwd=tmp_dir, + ) # If we want to validate that the ansible version and ansible-core branch version match, # this would be the place to do it. diff --git a/tests/constraints.in b/tests/constraints.in index f5214993ae2..522d65804a4 100644 --- a/tests/constraints.in +++ b/tests/constraints.in @@ -2,4 +2,4 @@ # and antsibull-docs that production builds rely upon. sphinx == 7.2.5 -antsibull-docs == 2.7.0 # currently approved version +antsibull-docs == 2.10.0 # currently approved version diff --git a/tests/requirements-relaxed.txt b/tests/requirements-relaxed.txt index 450d3bd83f5..a1428bb532d 100644 --- a/tests/requirements-relaxed.txt +++ b/tests/requirements-relaxed.txt @@ -20,9 +20,11 @@ ansible-pygments==0.1.1 # via # antsibull-docs # sphinx-ansible-theme +antsibull-changelog==0.26.0 + # via antsibull-docs antsibull-core==3.0.0 # via antsibull-docs -antsibull-docs==2.9.0 +antsibull-docs==2.10.0 # via -r tests/requirements-relaxed.in antsibull-docs-parser==1.0.1 # via antsibull-docs @@ -46,6 +48,7 @@ click==8.1.7 # via sphinx-intl docutils==0.18.1 # via + # antsibull-changelog # antsibull-docs # rstcheck # sphinx @@ -73,6 +76,7 @@ multidict==6.0.5 # yarl packaging==24.0 # via + # antsibull-changelog # antsibull-core # antsibull-docs # build @@ -94,6 +98,7 @@ pyproject-hooks==1.0.0 pyyaml==6.0.1 # via # -r tests/requirements-relaxed.in + # antsibull-changelog # antsibull-core # antsibull-docs requests==2.31.0 @@ -104,9 +109,11 @@ rstcheck==5.0.0 # via # -c tests/constraints-base.in # -r tests/requirements-relaxed.in + # antsibull-changelog # antsibull-docs semantic-version==2.10.0 # via + # antsibull-changelog # antsibull-core # antsibull-docs six==1.16.0 diff --git a/tests/requirements.txt b/tests/requirements.txt index f431085e085..f8adba5be81 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -14,13 +14,17 @@ aiosignal==1.3.1 # via aiohttp alabaster==0.7.16 # via sphinx +annotated-types==0.6.0 + # via pydantic ansible-pygments==0.1.1 # via # antsibull-docs # sphinx-ansible-theme -antsibull-core==2.2.0 +antsibull-changelog==0.26.0 # via antsibull-docs -antsibull-docs==2.7.0 +antsibull-core==3.0.0 + # via antsibull-docs +antsibull-docs==2.10.0 # via # -c tests/constraints.in # -r tests/requirements-relaxed.in @@ -46,6 +50,7 @@ click==8.1.7 # via sphinx-intl docutils==0.18.1 # via + # antsibull-changelog # antsibull-docs # rstcheck # sphinx @@ -73,16 +78,19 @@ multidict==6.0.5 # yarl packaging==24.0 # via + # antsibull-changelog # antsibull-core # antsibull-docs # build # sphinx perky==0.9.2 # via antsibull-core -pydantic==1.10.15 +pydantic==2.7.0 # via # antsibull-core # antsibull-docs +pydantic-core==2.18.1 + # via pydantic pygments==2.17.2 # via # ansible-pygments @@ -92,6 +100,7 @@ pyproject-hooks==1.0.0 pyyaml==6.0.1 # via # -r tests/requirements-relaxed.in + # antsibull-changelog # antsibull-core # antsibull-docs requests==2.31.0 @@ -102,13 +111,13 @@ rstcheck==5.0.0 # via # -c tests/constraints-base.in # -r tests/requirements-relaxed.in + # antsibull-changelog # antsibull-docs semantic-version==2.10.0 # via + # antsibull-changelog # antsibull-core # antsibull-docs -sh==1.14.3 - # via antsibull-core six==1.16.0 # via twiggy snowballstemmer==2.2.0 @@ -163,6 +172,7 @@ types-docutils==0.18.3 typing-extensions==4.11.0 # via # pydantic + # pydantic-core # rstcheck urllib3==2.2.1 # via requests