From f60242a69d6541e7b6fa789e9821fb5d62227774 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 12 May 2025 15:51:23 -0600 Subject: [PATCH] CI, docs: Install test/py/requirements.txt as well As noted by Quentin, in CI we should be at least versioning the pytest that we install. To avoid problems later, go with the whole requirements file being used. Furthermore, our documentation building for readthedocs must also have pytest so install the requirements file there as well. Reported-by: Quentin Schulz Signed-off-by: Tom Rini --- .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- .readthedocs.yml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 5e1938b0526..15520c4dafd 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -92,7 +92,7 @@ stages: set -e python3 -m venv /tmp/venvhtml . /tmp/venvhtml/bin/activate - pip install -r doc/sphinx/requirements.txt + pip install -r doc/sphinx/requirements.txt -r test/py/requirements.txt make htmldocs KDOC_WERROR=1 make infodocs diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2e905c94b5..a2de07e106d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -219,7 +219,7 @@ docs: script: - python3 -m venv /tmp/venvhtml - . /tmp/venvhtml/bin/activate - - pip install -r doc/sphinx/requirements.txt + - pip install -r doc/sphinx/requirements.txt -r test/py/requirements.txt - make htmldocs KDOC_WERROR=1 - make infodocs diff --git a/.readthedocs.yml b/.readthedocs.yml index 16418f286dc..9b6d251b738 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -22,3 +22,4 @@ formats: [] python: install: - requirements: doc/sphinx/requirements.txt + - requirements: test/py/requirements.txt