Merge branch 'master' into v7.0

Change-Id: I0b8da73514a19adcfe8fd9e5d1a2e1b24f40a6f8
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

diff --git a/tox.ini b/tox.ini
index b02cab2..6fdc825 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -36,7 +36,7 @@ commands =
     pyflakes osmclient
 
 [testenv:build]
-basepython = python
+basepython = python3
 deps = stdeb
        setuptools-version-command
        -r{toxinidir}/requirements.txt