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
This commit is contained in:
Jiri Podivin 2021-09-03 13:21:34 +02:00
parent 0c6a43a14b
commit 129ce2d8bc
2 changed files with 2 additions and 5 deletions

View File

@ -2,8 +2,7 @@
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # 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 coverage!=4.4,>=4.0 # Apache-2.0
python-subunit>=1.0.0 # Apache-2.0/BSD python-subunit>=1.0.0 # Apache-2.0/BSD
sphinx>=2.0.0,!=2.1.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 testtools>=2.2.0 # MIT
reno>=3.1.0 # Apache-2.0 reno>=3.1.0 # Apache-2.0
netaddr>=0.7.18 # BSD netaddr>=0.7.18 # BSD
pre-commit # MIT pre-commit>=2.3.0 # MIT
stestr>=3.0.1 # Apache-2.0 stestr>=3.0.1 # Apache-2.0
mock>=4.0.3 # BSD mock>=4.0.3 # BSD
requests-mock>=1.8.0 # Apache-2.0 requests-mock>=1.8.0 # Apache-2.0

View File

@ -34,7 +34,6 @@ deps =
-c {env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -c {env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r {toxinidir}/requirements.txt -r {toxinidir}/requirements.txt
-r {toxinidir}/test-requirements.txt -r {toxinidir}/test-requirements.txt
-r {toxinidir}/molecule-requirements.txt
whitelist_externals = bash whitelist_externals = bash
[testenv:bindep] [testenv:bindep]
@ -119,7 +118,6 @@ commands =
[testenv:docs] [testenv:docs]
deps = deps =
-c {env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r {toxinidir}/doc/requirements.txt -r {toxinidir}/doc/requirements.txt
-r {toxinidir}/molecule-requirements.txt -r {toxinidir}/molecule-requirements.txt
commands= commands=