Merge pull request #687 from francisco-dlp/FIX_conf4rtd

Fix read the docs build
hyperspy · Aug 11, 2015 · 73b0b7c · 73b0b7c
2 parents f438573 + 56f27c2
commit 73b0b7c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/doc/conf.py b/doc/conf.py
@@ -31,13 +31,12 @@
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
     'sphinx.ext.autodoc',
-    'gen_rst',
-    'numpydoc',
-    'matplotlib.sphinxext.only_directives',
+    'sphinxcontrib.napoleon',
     'sphinx.ext.intersphinx',
     'sphinx.ext.pngmath',
     'sphinx.ext.autosummary',
-    'ipython_console_highlighting']  # , 'rst2pdf.pdfbuilder']
+]
+
 try:
     import sphinxcontrib.spelling
     extensions.append('sphinxcontrib.spelling')

diff --git a/doc/pip-req.txt b/doc/pip-req.txt
@@ -0,0 +1,2 @@
+sphinxcontrib-napoleon
+
diff --git a/doc/user_guide/conf.py b/doc/user_guide/conf.py
@@ -31,13 +31,10 @@
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
     'sphinx.ext.autodoc',
-    'gen_rst',
-    'numpydoc',
-    'matplotlib.sphinxext.only_directives',
     'sphinx.ext.intersphinx',
     'sphinx.ext.pngmath',
     'sphinx.ext.autosummary',
-    'ipython_console_highlighting']  # , 'rst2pdf.pdfbuilder']
+]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -53,7 +50,7 @@
 
 # General information about the project.
 project = u'HyperSpy User Guide [Draft]'
-copyright = u'2011-2013, The HyperSpy Developers'
+copyright = u'2011-2015, The HyperSpy Developers'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

diff --git a/hyperspy/__init__.py b/hyperspy/__init__.py
@@ -24,7 +24,7 @@
 os.environ['QT_API'] = "pyqt"
 
 
-import Release
+from . import Release
 
 __all__ = ["api"]
 __version__ = Release.version