Update tox and CI for Python 3

1 files changed, 20 insertions, 7 deletions

diff --git a/tox.ini b/tox.ini
index 25b09b15c..f60321311 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,10 +8,14 @@ envlist = py27, lint, docs
 minversion=2.0
 
 [base]
-deps = -rrequirements.txt
+deps =
+# Minimum pip version and setuptools to fix issue running on travis.
+    pip>=10
+    setuptools
+    -rrequirements.txt
 
 [testenv]
-install_command = pip install --ignore-installed {opts} {packages}
+install_command = {envpython} -m pip install --ignore-installed {opts} {packages}
 passenv = DISPLAY PYTHONPATH
 setenv = PYTHONPATH = {toxinidir}
 sitepackages = True
@@ -23,7 +27,7 @@ whitelist_externals = pytest
 [pytest]
 # Hide logged warnings and errors in test output.
 log_cli_level = CRITICAL
-
+addopts = -p no:warnings
 
 # ==========
 # Unit tests
@@ -64,8 +68,6 @@ commands =
     pytest -v --basetemp=_pytest_temp -s deluge/plugins
 
 [testenv:py27]
-deps =
-    {[testenv]deps}
 basepython = python2.7
 commands = {[testenv:pydef]commands}
 
@@ -194,7 +196,18 @@ commands =
 # ========================
 # Developement Environment
 # ========================
-[testenv:devenv]
-envdir = .venv
+[basedev]
 usedevelop = True
 deps = -rrequirements-dev.txt
+
+[testenv:denv2]
+envdir = .venv2
+basepython = python2.7
+usedevelop = {[basedev]usedevelop}
+deps = {[basedev]deps}
+
+[testenv:denv3]
+basepython = python3
+envdir = .venv3
+usedevelop = {[basedev]usedevelop}
+deps = {[basedev]deps}