From 66718f6d8ee6a3faa0c051571d8487a876ab71e7 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Mon, 5 Jun 2017 08:09:22 +0100 Subject: [PATCH] [Docs] Remove chardet mock to fix requests version check * chardet is an easily installed pure python module so doesn't need mocking. --- docs/source/conf.py | 2 +- tox.ini | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 6ddcca161..18e7c3f96 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -59,7 +59,7 @@ class Mock(object): MOCK_MODULES = ['deluge.ui.gtkui.gtkui', 'deluge._libtorrent', 'libtorrent', 'psyco', - 'pygtk', 'gtk', 'gobject', 'gtk.gdk', 'pango', 'cairo', 'pangocairo', 'chardet'] + 'pygtk', 'gtk', 'gobject', 'gtk.gdk', 'pango', 'cairo', 'pangocairo'] for mod_name in MOCK_MODULES: sys.modules[mod_name] = Mock() diff --git a/tox.ini b/tox.ini index 693f217d2..2cb527f87 100644 --- a/tox.ini +++ b/tox.ini @@ -177,8 +177,6 @@ deps = {[testenv]deps} sphinx sphinxcontrib-napoleon -# Pin requests version due to bug: https://github.com/requests/requests/issues/4125 - requests==2.15.1 whitelist_externals = {[testenv]whitelist_externals}