From 129ce2d8bc49a53da93920cc51810313a1e0740f Mon Sep 17 00:00:00 2001
From: Jiri Podivin <jpodivin@redhat.com>
Date: Fri, 3 Sep 2021 13:21:34 +0200
Subject: [PATCH] Dependency reorganization

The constraints are now only used in cases where they do not conflict
with requirements for molecule tests.

The general test dependency list was changed to include ansible,
to allow running of the tests without installation of other,
tangentially related, dependencies from molecule requirements list.

Closes-Bug: #1942508

Signed-off-by: Jiri Podivin <jpodivin@redhat.com>
Change-Id: I7cd1b93eedc64c90fe0863e57871378388c2ee85
---
 test-requirements.txt | 5 ++---
 tox.ini               | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index fbb1c7e1c..77fda492e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,8 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-openstackdocstheme>=2.2.1 # Apache-2.0
-
+ansible>=2.8,!=2.8.9,!=2.9.12,<2.10.0  # GPLv3+
 coverage!=4.4,>=4.0 # Apache-2.0
 python-subunit>=1.0.0 # Apache-2.0/BSD
 sphinx>=2.0.0,!=2.1.0 # BSD
@@ -13,7 +12,7 @@ testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 reno>=3.1.0 # Apache-2.0
 netaddr>=0.7.18 # BSD
-pre-commit # MIT
+pre-commit>=2.3.0 # MIT
 stestr>=3.0.1 # Apache-2.0
 mock>=4.0.3 # BSD
 requests-mock>=1.8.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 5680862aa..d6dd02065 100644
--- a/tox.ini
+++ b/tox.ini
@@ -34,7 +34,6 @@ deps =
     -c {env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -r {toxinidir}/requirements.txt
     -r {toxinidir}/test-requirements.txt
-    -r {toxinidir}/molecule-requirements.txt
 whitelist_externals = bash
 
 [testenv:bindep]
@@ -119,7 +118,6 @@ commands =
 
 [testenv:docs]
 deps =
-  -c {env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r {toxinidir}/doc/requirements.txt
   -r {toxinidir}/molecule-requirements.txt
 commands=