diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-06-04 20:05:50 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-06-07 11:34:45 +0200 |
| commit | 53f6c3948e048fd8c639704a385f4beae01ebfd9 (patch) | |
| tree | 0b5912410d65037322af2e52bb0f9fba825b4a9f /tox.ini | |
| parent | 6c6b03b310cf60b251a52127901431f7d059e45f (diff) | |
Leverage on pbr (Python Build Reasonableness)
pbr can inject requirements into the install_requires, tests_require
and/or dependency_links arguments to setup. They were previously
falsy unset.
It also supports conditional dependencies which can be added to the
requirements (e.g. subprocess32; python_version=='2.7').
Then requirements.py3.txt is removed.
It also removes functest/cli/setup.py which seems false and obsolete.
Dockerfile is updated as well. One temporarily link is created because
of several hardcoded paths in Functest.
Change-Id: I14b3b25e07fbac490dd1d5ce943ec02c5b11f242
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -6,6 +6,9 @@ usedevelop = True deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt + git+https://gerrit.opnfv.org/gerrit/releng#egg=opnfv&subdirectory=modules + git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests + git+https://gerrit.opnfv.org/gerrit/snaps#egg=snaps commands = nosetests --with-xunit \ --with-coverage \ --cover-tests \ @@ -20,14 +23,10 @@ commands = sphinx-build -W -b html api/ api/_build [testenv:pep8] basepython = python2.7 -deps = - {[testenv]deps} commands = flake8 [testenv:pylint] basepython = python2.7 -deps = - {[testenv]deps} whitelist_externals = bash modules = functest.core.feature @@ -51,7 +50,4 @@ dirs = functest/tests/unit/core functest/tests/unit/odl functest/tests/unit/utils/test_decorators.py -deps = - -r{toxinidir}/requirements.py3.txt - -r{toxinidir}/test-requirements.txt commands = nosetests {[testenv:py35]dirs} |