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.sch...@cherry.de>
Signed-off-by: Tom Rini <tr...@konsulko.com>
---
.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 9c136513bb9e..15520c4dafd5 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 7aadd5d8b735..49f3c588cfcf 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 16418f286dce..9b6d251b7387 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -22,3 +22,4 @@ formats: []
python:
install:
- requirements: doc/sphinx/requirements.txt
+ - requirements: test/py/requirements.txt
--
2.43.0
