X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=tox.ini;h=608dc8de56e076f4b8ab545bc13d6781c2f18475;hb=3c1603818230f52cf5102fdfbdd8fd8907062e8d;hp=4f7d8161a8cf4cfe9b7575afaee5f1a79bc6bd1d;hpb=b7463a4821eabd214b2b38d54db38a5a1aae53d6;p=osm%2Fosmclient.git

diff --git a/tox.ini b/tox.ini
index 4f7d816..608dc8d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,35 +15,31 @@
 #    under the License.
 #
 [tox]
-envlist = py27,py35,flake8,pyflakes
+envlist = py36,flakes
 toxworkdir={toxinidir}/.tox
 
 [testenv]
-deps = -r{toxinidir}/test-requirements.txt
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+install_command = python3 -m pip install -U {opts} {packages}
 commands=nosetests
-install_command = python -m pip install -r test-requirements.txt -U {opts} {packages}
 
-[testenv:flake8]
+[testenv:flakes]
 basepython = python3
 deps = flake8
+       pyflakes
+       -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+install_command = python3 -m pip install -U {opts} {packages}
 commands =
     flake8 setup.py
-
-[testenv:pyflakes]
-basepython = python3
-deps = pyflakes
-commands =
     pyflakes osmclient
 
 [testenv:build]
-basepython = python
-deps = stdeb
-       setuptools-version-command
-commands = python setup.py --command-packages=stdeb.command bdist_deb
-
-[testenv:build3]
 basepython = python3
 deps = stdeb
        setuptools-version-command
+       -r{toxinidir}/requirements.txt
+install_command = python3 -m pip install -U {opts} {packages}
 commands = python3 setup.py --command-packages=stdeb.command bdist_deb