From ce8595e8dd1631ac0e80045893018fcc9be39bcd Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind+deluge@gmail.com>
Date: Wed, 5 Jun 2019 19:25:53 +0100
Subject: [PATCH] [Tests] Remove python2 from tox config

---
 DEPENDS.md       |  1 -
 requirements.txt |  1 -
 tox.ini          | 18 +++---------------
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/DEPENDS.md b/DEPENDS.md
index 057f14f8e..4895b0c1b 100644
--- a/DEPENDS.md
+++ b/DEPENDS.md
@@ -38,7 +38,6 @@ All modules will require the [common](#common) section dependencies.
 
 - [pywin32]
 - [certifi]
-- [py2-ipaddress] - Optional: Add IPv6 lookup for Python 2.
 
 ## Core (deluged daemon)
 
diff --git a/requirements.txt b/requirements.txt
index aa52595f3..89ca5b167 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,6 @@ chardet
 six
 setproctitle
 pywin32; sys_platform == 'win32'
-py2-ipaddress; sys_platform == 'win32' and python_version == '2'
 certifi; sys_platform == 'win32'
 zope.interface>=4.4.2
 distro; 'win' not in sys_platform
diff --git a/tox.ini b/tox.ini
index 1adf80c3e..6286578d6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -119,7 +119,6 @@ deps = {[baselint]deps}
 commands = flake8 --exit-zero --max-complexity 15 deluge
 
 [testenv:pylint]
-
 sitepackages = False
 ignore_errors = True
 deps = {[baselint]deps}
@@ -157,33 +156,22 @@ commands =
     sphinx-build -v -j auto -E -T -b html -d docs/build/doctrees docs/source docs/build/html
 
 [testenv:docscoverage]
-basepython = python2.7
 sitepackages = False
 skip_install = True
-changedir = docs
 deps =
     {[basedocs]deps}
     pytest-cov
-whitelist_externals = mkdir
 commands =
-    mkdir -p build/doccoverage
-    sphinx-build -W -b coverage -d build/doctrees source build/doccoverage
+    sphinx-build -W -b coverage -d docs/build/doctrees docs/source docs/build/doccoverage
     pytest --doctest-glob='*.rst'
 
 # ========================
 # Development Environment
 # ========================
 
-[testenv:denv2]
-basepython = python2.7
-envdir = .venv2
-usedevelop = True
-deps = {[basedev]deps}
-commands =
-
-[testenv:denv3]
+[testenv:denv]
 basepython = python3
-envdir = .venv3
+envdir = .venv
 usedevelop = True
 deps = {[basedev]deps}
 commands =