diff options
| author | Monty Taylor <mordred@inaugust.com> | 2018-03-08 07:57:56 -0600 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2018-03-08 09:46:24 -0600 |
| commit | 621332cf36d80984d3283b13a6830df6fa16e9f7 (patch) | |
| tree | 66a3402c6d03d3eb484596be2388b72c3b6cf298 /tox.ini | |
| parent | b0574feed0c987183c724d876d117321f0973aa1 (diff) | |
| download | oslo-db-621332cf36d80984d3283b13a6830df6fa16e9f7.tar.gz | |
Remove tox_install.sh and align constraints consumption
As part of removing reliance on the old and deprecated zuul-cloner,
we need to shift constraints declaration to the deps line. This
means we unfortunately have to duplicate the extras declarations
into test-requirements - because otherwise the contraints for
oslo.db conflicts with the installation of itself.
Change-Id: I2b79444a58a9144993131f9cba7494b236d9e950
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -3,7 +3,7 @@ minversion = 2.0 envlist = py35,py27,pep8,pip-missing-reqs [testenv] -install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} +install_command = pip install {opts} {packages} whitelist_externals = bash env setenv = @@ -15,10 +15,10 @@ setenv = {postgresql,all}: PIFPAF_POSTGRESQL=pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run postgresql -- {mysql,all}: PIFPAF_MYSQL=pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql -- {mysql,postgresql,all}: BASECOMMAND={toxinidir}/tools/run-pifpaf-tests.sh - -deps = .[test,fixtures,mysql,postgresql] - {postgresql,mysql,all}: .[pifpaf] - +deps = + -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -r{toxinidir}/test-requirements.txt + -r{toxinidir}/requirements.txt commands = {env:PIFPAF_MYSQL:} {env:PIFPAF_POSTGRESQL:} {env:BASECOMMAND:} '{posargs}' |