summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.com>2016-08-26 17:00:57 +0200
committerAndreas Jaeger <aj@suse.com>2016-08-26 17:13:49 +0200
commitb6b33b4d7b43fc8aefa88e492c8e0cfea21fb17c (patch)
tree8243f1436018cbde953851b519881525f6c49344
parentd4628e2b932033398c15e38650f1b5c7fc491c8c (diff)
Cleanup tox.ini: Remove obsolete constraints
Remove old and unused constraints environments from tox.ini. Those have never been used. Use standard environments as default list. Note that the repo has in the past not used constraints in OpenStack CI, this change keeps the status quo. For more information about constraints see: http://lists.openstack.org/pipermail/openstack-dev/2016-August/101474.html Change-Id: Iade5865825a022cb4802820bfc564433bb976d06
Notes
Notes (review): Code-Review+2: Syd Logan <syd.logan@broadcom.com> Workflow+1: Syd Logan <syd.logan@broadcom.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 07 Sep 2016 06:02:49 +0000 Reviewed-on: https://review.openstack.org/361279 Project: openstack/broadview-ui Branch: refs/heads/master
-rw-r--r--tox.ini29
1 files changed, 2 insertions, 27 deletions
diff --git a/tox.ini b/tox.ini
index d4cd6e3..08ce02a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,56 +1,31 @@
1[tox] 1[tox]
2minversion = 2.0 2minversion = 2.0
3envlist = py34-constraints,py27-constraints,pypy-constraints,pep8-constraints 3envlist = py34,py27,pypy,pep8
4skipsdist = True 4skipsdist = True
5 5
6[testenv] 6[testenv]
7usedevelop = True 7usedevelop = True
8install_command = 8install_command = pip install -U {opts} {packages}
9 constraints: {[testenv:common-constraints]install_command}
10 pip install -U {opts} {packages}
11setenv = 9setenv =
12 VIRTUAL_ENV={envdir} 10 VIRTUAL_ENV={envdir}
13deps = -r{toxinidir}/test-requirements.txt 11deps = -r{toxinidir}/test-requirements.txt
14commands = python setup.py test --slowest --testr-args='{posargs}' 12commands = python setup.py test --slowest --testr-args='{posargs}'
15 13
16[testenv:common-constraints]
17install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
18
19[testenv:pep8] 14[testenv:pep8]
20commands = flake8 {posargs} 15commands = flake8 {posargs}
21 16
22[testenv:pep8-constraints]
23install_command = {[testenv:common-constraints]install_command}
24commands = flake8 {posargs}
25
26[testenv:venv] 17[testenv:venv]
27commands = {posargs} 18commands = {posargs}
28 19
29[testenv:venv-constraints]
30install_command = {[testenv:common-constraints]install_command}
31commands = {posargs}
32
33[testenv:cover] 20[testenv:cover]
34commands = python setup.py test --coverage --testr-args='{posargs}' 21commands = python setup.py test --coverage --testr-args='{posargs}'
35 22
36[testenv:cover-constraints]
37install_command = {[testenv:common-constraints]install_command}
38commands = python setup.py test --coverage --testr-args='{posargs}'
39
40[testenv:docs] 23[testenv:docs]
41commands = python setup.py build_sphinx 24commands = python setup.py build_sphinx
42 25
43[testenv:docs-constraints]
44install_command = {[testenv:common-constraints]install_command}
45commands = python setup.py build_sphinx
46
47[testenv:debug] 26[testenv:debug]
48commands = oslo_debug_helper {posargs} 27commands = oslo_debug_helper {posargs}
49 28
50[testenv:debug-constraints]
51install_command = {[testenv:common-constraints]install_command}
52commands = oslo_debug_helper {posargs}
53
54[flake8] 29[flake8]
55# E123, E125 skipped as they are invalid PEP-8. 30# E123, E125 skipped as they are invalid PEP-8.
56 31