Browse Source

Clean up tox.ini

* move common commands to [testenv]
* move constraint file to deps
* remove redundant statements

Change-Id: Id6d21e39f2db8a32a479bb6331a25da4c28e7bfd
Witold Bedyk 1 year ago
parent
commit
d64925a889
1 changed files with 6 additions and 36 deletions
  1. 6
    36
      tox.ini

+ 6
- 36
tox.ini View File

@@ -5,66 +5,36 @@ skipsdist = True
5 5
 
6 6
 [testenv]
7 7
 usedevelop = True
8
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
8
+install_command = pip install {opts} {packages}
9 9
 setenv =
10 10
     PYTHONUNBUFFERED=1
11 11
     VIRTUAL_ENV={envdir}
12 12
     OS_TEST_PATH=tests/unit
13
-deps = -r{toxinidir}/requirements.txt
14
-       -r{toxinidir}/test-requirements.txt
15
-       psutil==3.0.1
13
+deps =
14
+  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
15
+  -r{toxinidir}/requirements.txt
16
+  -r{toxinidir}/test-requirements.txt
17
+  psutil==3.0.1
16 18
 whitelist_externals = bash
17 19
                       find
18 20
 commands =
19 21
   find . -type f -name "*.pyc" -delete
20
-
21
-
22
-[testenv:py27]
23
-basepython = python2.7
24
-setenv = {[testenv]setenv}
25
-         OS_TEST_PATH=tests/unit
26
-whitelist_externals =
27
-  {[testenv]whitelist_externals}
28
-deps =
29
-  {[testenv]deps}
30
-commands =
31
-  ostestr {posargs}
32
-
33
-[testenv:py35]
34
-basepython = python3.5
35
-setenv = {[testenv]setenv}
36
-         OS_TEST_PATH=tests/unit
37
-whitelist_externals =
38
-  {[testenv]whitelist_externals}
39
-deps =
40
-  {[testenv]deps}
41
-commands =
42 22
   ostestr {posargs}
43 23
 
44 24
 [testenv:functional]
45 25
 basepython = python2.7
46
-install_command = {[testenv]install_command}
47 26
 setenv = {[testenv]setenv}
48 27
          SPARK_HOME=/opt/spark/current
49 28
          SPARK_SCALA_VERSION=2.10
50 29
          OS_TEST_PATH=tests/functional
51
-whitelist_externals =
52
-  {[testenv]whitelist_externals}
53
-deps =
54
-  {[testenv]deps}
55 30
 commands =
56 31
   ostestr --serial {posargs}
57 32
 
58 33
 [testenv:functional-py35]
59 34
 basepython = python3.5
60
-install_command = {[testenv]install_command}
61 35
 setenv = {[testenv]setenv}
62 36
          SPARK_HOME=/opt/spark/current
63 37
          OS_TEST_PATH=tests/functional
64
-whitelist_externals =
65
-  {[testenv]whitelist_externals}
66
-deps =
67
-  {[testenv]deps}
68 38
 commands =
69 39
   ostestr --serial {posargs}
70 40
 

Loading…
Cancel
Save