Fix conflict with docs requirements.txt

pydantic and rstcheck didn't work Signed-off-by: Justin Cinkelj <[email protected]>
ScaleComputing · Jul 26, 2024 · fc18506 · fc18506
1 parent 51c3304
commit fc18506
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -71,8 +71,7 @@ integration:  ## Run integration tests
 
 .PHONY: docs
 docs:  ## Build collection documentation
-	pip install -r docs.requirements
-	pip install -r docs/requirements.txt
+	pip install -r docs.requirements -r docs/requirements.txt
 	cd docs && ANSIBLE_COLLECTIONS_PATH=${PWD}/../../.. ./build.sh
 
 .PHONY: mypy

diff --git a/ci-infra/docker-image/build.sh b/ci-infra/docker-image/build.sh
@@ -24,7 +24,7 @@ fi
 THIS_SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
 REPO_DIR="$(realpath "$THIS_SCRIPT_DIR/../.." )"
 
-cat "$REPO_DIR"/{docs,test,sanity,mypy}.requirements > all.requirements
+cat "$REPO_DIR"/{docs,test,sanity,mypy}.requirements "$REPO_DIR/docs/requirements.txt" > all.requirements
 # TODO but is ghrc.io feature available/enabled?
 # Or push to quay.io?
 docker build $DOCKER_BUILD_OPT -t "$DOCKER_REGISTRY_REPO:$DOCKER_IMAGE_TAG" .