From c67dba3d300041c6b67600f5cd6a9afc3738475e Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 31 May 2023 07:54:59 +0100 Subject: [PATCH] Adjust `tools/docs.py` to work with the new docs requirements definition Signed-off-by: Pedro Algarvio --- .pre-commit-config.yaml | 2 +- requirements/static/ci/py3.10/tools.txt | 2 +- requirements/static/ci/py3.11/tools.txt | 2 +- requirements/static/ci/py3.9/tools.txt | 2 +- requirements/static/ci/tools.in | 2 +- tools/docs.py | 15 ++++++++++++++- 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 441d2b3d89c..d41a013e5bf 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -46,7 +46,7 @@ repos: )$ - repo: https://github.com/s0undt3ch/python-tools-scripts - rev: "0.12.0" + rev: "0.15.0" hooks: - id: tools alias: check-changelog-entries diff --git a/requirements/static/ci/py3.10/tools.txt b/requirements/static/ci/py3.10/tools.txt index 912ef493fab..e1029ccfa76 100644 --- a/requirements/static/ci/py3.10/tools.txt +++ b/requirements/static/ci/py3.10/tools.txt @@ -36,7 +36,7 @@ pygments==2.13.0 # via rich python-dateutil==2.8.2 # via botocore -python-tools-scripts==0.12.0 +python-tools-scripts==0.15.0 # via -r requirements/static/ci/tools.in pyyaml==6.0 # via -r requirements/static/ci/tools.in diff --git a/requirements/static/ci/py3.11/tools.txt b/requirements/static/ci/py3.11/tools.txt index 7bace25840c..1b699c04a60 100644 --- a/requirements/static/ci/py3.11/tools.txt +++ b/requirements/static/ci/py3.11/tools.txt @@ -38,7 +38,7 @@ pygments==2.15.1 # via rich python-dateutil==2.8.2 # via botocore -python-tools-scripts==0.14.0 +python-tools-scripts==0.15.0 # via -r requirements/static/ci/tools.in pyyaml==6.0 # via -r requirements/static/ci/tools.in diff --git a/requirements/static/ci/py3.9/tools.txt b/requirements/static/ci/py3.9/tools.txt index f7f0f839151..4721b368419 100644 --- a/requirements/static/ci/py3.9/tools.txt +++ b/requirements/static/ci/py3.9/tools.txt @@ -36,7 +36,7 @@ pygments==2.13.0 # via rich python-dateutil==2.8.2 # via botocore -python-tools-scripts==0.12.0 +python-tools-scripts==0.15.0 # via -r requirements/static/ci/tools.in pyyaml==6.0 # via -r requirements/static/ci/tools.in diff --git a/requirements/static/ci/tools.in b/requirements/static/ci/tools.in index 7383f25a982..cbcc35234bb 100644 --- a/requirements/static/ci/tools.in +++ b/requirements/static/ci/tools.in @@ -1,4 +1,4 @@ -python-tools-scripts >= 0.12.0 +python-tools-scripts >= 0.15.0 attrs boto3 pyyaml diff --git a/tools/docs.py b/tools/docs.py index 83868d1af7e..5e38583024d 100644 --- a/tools/docs.py +++ b/tools/docs.py @@ -23,12 +23,25 @@ docs = command_group( description=__doc__, venv_config={ "requirements_files": [ + tools.utils.REPO_ROOT / "requirements" / "base.txt", + tools.utils.REPO_ROOT / "requirements" / "zeromq.txt", tools.utils.REPO_ROOT / "requirements" / "static" / "ci" / "py{}.{}".format(*sys.version_info) - / "docs.txt" + / "docs.txt", + ], + "pip_args": [ + "--constraint", + str( + tools.utils.REPO_ROOT + / "requirements" + / "static" + / "pkg" + / "py{}.{}".format(*sys.version_info) + / "linux.txt" + ), ], }, )