[Install] Update and fix python optional requirements

* Added required dependency setuptools to install_requires
* Remove optional dependency ipaddress from install_requires
* Created extras_require in setup.py. The optional dependencies should
not be included in install_requires so that users can either install
forked dependencies or remove problematic ones. Updated documentation to
detail how to install these optional dependencies.
* Fixed README badge

Refs:
 * https://dev.deluge-torrent.org/ticket/3470
 * https://dev.deluge-torrent.org/ticket/3282
 * https://dev.deluge-torrent.org/ticket/3353

1 files changed, 9 insertions, 6 deletions

diff --git a/setup.py b/setup.py
index 184a29a25..4727417b3 100755
--- a/setup.py
+++ b/setup.py
@@ -543,17 +543,20 @@ install_requires = [
     'rencode',
     'pyopenssl',
     'pyxdg',
-    'pillow',
     'mako',
-    'chardet',
     'six',
-    'setproctitle',
+    'setuptools',
     "pywin32; sys_platform == 'win32'",
-    "py2-ipaddress; sys_platform == 'win32' and python_version == '2'",
     "certifi; sys_platform == 'win32'",
     'zope.interface',
 ]
-tests_require = ['pytest', 'pytest-twisted']
+extras_require = {
+    'all': [
+        'setproctitle',
+        'pillow',
+        'chardet',
+    ]
+}
 
 # Main setup
 setup(
@@ -597,7 +600,7 @@ setup(
     cmdclass=cmdclass,
     setup_requires=setup_requires,
     install_requires=install_requires,
-    tests_require=tests_require,
+    extras_require=extras_require,
     data_files=_data_files,
     package_data=_package_data,
     exclude_package_data=_exclude_package_data,