Merge remote-tracking branch 'origin/master'

westernx · Nov 24, 2015 · 02da8c4 · 02da8c4
2 parents b713056 + 9161ccf
commit 02da8c4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,7 @@
 .DS_Store
 pip-log.txt
 ._*
+
 *.egg-info
 /build
+
diff --git a/docs/conf.py b/docs/conf.py
@@ -99,16 +99,14 @@
 
 
 # -- Options for HTML output ---------------------------------------------------
-
-local_theme_path = os.path.abspath('../../docs/_themes/westernx')
-if os.path.exists(local_theme_path):
-    sys.path.append(local_theme_path)
-    html_theme_path = [local_theme_path]
+try:
+    import sphinx_westernx_theme
+    html_theme_path = sphinx_westernx_theme.get_html_path()
     html_theme = 'westernx'
     html_theme_options = {
         'index_logo': None,
     }
-else:
+except ImportError:
     html_theme = 'default'
 
 # The name for this set of Sphinx documents.  If None, it defaults to