Merge branch 'master' of https://github.com/neurokernel/neurokernel

neurokernel · Dec 7, 2015 · a6fd015 · a6fd015
2 parents 6012033 + 16f3306
commit a6fd015
Show file tree

Hide file tree

Showing 20 changed files with 146 additions and 4,041 deletions.
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -10,7 +10,7 @@ Computation <http://www.bionet.ee.columbia.edu/courses/EEBM_E9070/2012>`_. The
 Neurokernel Development Team currently comprises the 
 following `Bionet Group <http://www.bionet.ee.columbia.edu/>`_ researchers:
 
-* `Lev Givon <http://www.columbia.edu/~lev/>`_
+* `Lev Givon <http://lebedov.github.io>`_
 * `Konstantinos Psychas <http://gr.linkedin.com/in/kpsychas>`_
 * `Nikul H. Ukani <http://www.linkedin.com/pub/nikul-ukani/16/737/990>`_
 * `Chung-Heng Yeh <http://www.linkedin.com/pub/chung-heng-yeh/5a/7a6/a>`_

diff --git a/README.rst b/README.rst
@@ -139,7 +139,7 @@ Building the Documentation
 To build Neurokerne's HTML documentation locally, you will need to install 
 
 * `mock <http://www.voidspace.org.uk/python/mock/>`_ 1.0 or later.
-* `sphinx <http://sphinx-doc.org>`_ 1.2 or later.
+* `sphinx <http://sphinx-doc.org>`_ 1.3 or later.
 * `sphinx_rtd_theme <https://github.com/snide/sphinx_rtd_theme>`_ 0.1.6 or 
   later.
 

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -45,7 +45,6 @@ def __setitem__(self, k, v):
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.append(os.path.abspath('../sphinxext'))
 sys.path.append(os.path.abspath('../../neurokernel'))
 sys.path.append(os.path.abspath('../../neurokernel/neuroml'))
 sys.path.append(os.path.abspath('../../'))
@@ -62,7 +61,7 @@ def __setitem__(self, k, v):
               'sphinx.ext.intersphinx',
               'sphinx.ext.pngmath',
               'sphinx.ext.viewcode',
-              'numpydoc']
+              'sphinx.ext.napoleon']
 
 # Generate autosummary stubs:
 autosummary_generate = True

diff --git a/docs/source/install.rst b/docs/source/install.rst
@@ -123,7 +123,7 @@ Building the Documentation
 To build Neurokerne's HTML documentation locally, you will need to install 
 
 * `mock <http://www.voidspace.org.uk/python/mock/>`_ 1.0 or later.
-* `sphinx <http://sphinx-doc.org>`_ 1.2 or later.
+* `sphinx <http://sphinx-doc.org>`_ 1.3 or later.
 * `sphinx_rtd_theme <https://github.com/snide/sphinx_rtd_theme>`_ 0.1.6 or 
   later.
 

diff --git a/docs/sphinxext/LICENSE.txt b/docs/sphinxext/LICENSE.txt
diff --git a/docs/sphinxext/__init__.py b/docs/sphinxext/__init__.py
diff --git a/docs/sphinxext/comment_eater.py b/docs/sphinxext/comment_eater.py