Merge branch 'master' into v7.0

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

diff --combined tox.ini
index a09288a,b02cab2..6fdc825
--- 1/tox.ini
--- 2/tox.ini
+++ b/tox.ini
@@@ -15,35 -15,39 +15,39 @@@
  #    under the License.
  #
  [tox]
- envlist = 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
 +basepython = python3
  deps = stdeb
         setuptools-version-command
- commands = python setup.py --command-packages=stdeb.command bdist_deb
+        -r{toxinidir}/requirements.txt
+ install_command = python2 -m pip install -U {opts} {packages}
+ commands = python2 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