summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2025-05-12 15:51:23 -0600
committerHeinrich Schuchardt <heinrich.schuchardt@canonical.com>2025-05-18 08:51:36 +0200
commit9effbe1548f5ede3901832c747ea2b48ba8f847e (patch)
tree5b1f3f8b2bf9fc7f2c8af4105d0c3a81190c95e7
parent4cb72436403069baf58c0d5187149db7ab76fb85 (diff)
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 <quentin.schulz@cherry.de> Signed-off-by: Tom Rini <trini@konsulko.com>
-rw-r--r--.azure-pipelines.yml2
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--.readthedocs.yml1
3 files changed, 3 insertions, 2 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 9c136513bb9..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 pytest
+ 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 7aadd5d8b73..49f3c588cfc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -164,7 +164,7 @@ docs:
script:
- python3 -m venv /tmp/venvhtml
- . /tmp/venvhtml/bin/activate
- - pip install -r doc/sphinx/requirements.txt pytest
+ - 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