[Docs] More fixes for testing with tox

valychbreak · Sep 25, 2014 · fedca31 · fedca31
1 parent 6a5982f
commit fedca31
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -51,18 +51,15 @@ def __getattr__(cls, name):
         else:
             return Mock()
 
-MOCK_MODULES = ['deluge.ui.languages', 'deluge.ui.countries', 'deluge.ui.gtkui.gtkui',
-                'psyco', 'rencode', 'win32file', 'win32event',
+MOCK_MODULES = ['deluge.ui.languages', 'deluge.ui.countries', 'deluge.ui.gtkui.gtkui', 'deluge._libtorrent',
+                'libtorrent', 'psyco', 'rencode',
                 'twisted.web', 'twisted.web.client', 'twisted.web.error',
-                'win32gui', 'win32api', 'win32con', '_winreg']
-
-if on_rtd or on_travis:
-    MOCK_MODULES += ['libtorrent', 'pygtk', "gtk", "gobject", "gtk.gdk", "pango", "cairo", "pangocairo"]
+                'win32file', 'win32event', 'win32gui', 'win32api', 'win32con', '_winreg',
+                'pygtk', "gtk", "gobject", "gtk.gdk", "pango", "cairo", "pangocairo"]
 
 for mod_name in MOCK_MODULES:
     sys.modules[mod_name] = Mock()
 
-
 # General configuration
 # ---------------------
 
@@ -110,7 +107,7 @@ def __getattr__(cls, name):
 # List of directories, relative to source directories, that shouldn't be searched
 # for source files.
 # exclude_dirs = []
-exclude_patterns = ['deluge/_libtorrent.py', 'deluge/__rpcapi.py']
+# exclude_patterns = []
 
 # The reST default role (used for this markup: `text`) to use for all documents.
 # default_role = None

diff --git a/tox.ini b/tox.ini
@@ -137,5 +137,4 @@ deps =
     sphinxcontrib-napoleon
     PIL
 commands=
-    python -c "import sphinxcontrib.napoleon"
     sphinx-build -E -W -b html -d build/doctrees source build/html