Updated Dockerfile for 18.04; added python-magic dependency, minor fixes in build process
Change-Id: Id9bfc1745349124e61e59fecb90bdb5b1d61ea3e
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
diff --git a/tox.ini b/tox.ini
index 4f7d816..b02cab2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,35 +15,39 @@
# 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
+ -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