From dc9ab52d0d7c441d082852fe5123741463469731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Thu, 29 Sep 2022 16:37:39 +0200 Subject: [PATCH] [tox] Fix installation of requirements Both venv and linters (and its children) environments install kolla-ansible and thus also install the requirements. However, they were doing this post-factum and thus without the constraints pin. This patch also removes the installation of test-requirements in venv as it is meant to be used for running the software and we already have environments for unit tests. The doc requirements are left in place because docs mention that ``tox -e venv -- reno`` should work. They should be harmless but I am open to removing them as well. Change-Id: I15f1ecc216c9ba81dad740c372d297adf279a945 --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 1f85daf106..9296f48de3 100644 --- a/tox.ini +++ b/tox.ini @@ -41,7 +41,7 @@ commands = [testenv:venv] deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} - -r{toxinidir}/test-requirements.txt + -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt commands = {posargs} @@ -93,6 +93,7 @@ setenv = ANSIBLE_FILTER_PLUGINS = {toxinidir}/ansible/filter_plugins deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/requirements.txt -r{toxinidir}/lint-requirements.txt allowlist_externals = bash find