Merge branch 'master' of https://github.com/baccuslab/pyret

.readthedocs.yml

@@ -0,0 +1,3 @@
+python:
+  version: 3
+  pip_install: true

README.md

@@ -6,7 +6,7 @@
 [![PyPi version](https://img.shields.io/pypi/v/pyret.svg)](https://pypi.python.org/pypi/pyret)
 
 ### A Python package for analyzing retinal data
-Benjamin Naecker, Niru Maheswaranthan, Pablo Jadzinsky
+Benjamin Naecker, Niru Maheswaranthan
 
 <img src="https://cloud.githubusercontent.com/assets/904854/11761236/e77e2bd2-a06e-11e5-8b54-0c70f40089ab.gif" height="256">
 
@@ -21,10 +21,6 @@ Documentation
 -------------
 For more info and documentation, see the [pyret documentation](http://pyret.readthedocs.org/en/master/).
 
-Demo
-----
-(coming soon) For a demo of how to do analysis using `pyret`, check out the html file and corresponding ipython notebook in the `demo/` folder.
-
 Contributing
 ------------
 Pull requests are welcome! We follow the [Numpy/Scipy documentation standards](https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt#docstring-standard), and [Sphinx](http://sphinx-doc.org/index.html) for generating documentation.

docs/conf.py

@@ -56,7 +56,7 @@
 
 # General information about the project.
 project = u'pyret'
-copyright = u'2014-2015, Ben Naecker, Niru Maheswaranathan, Pablo Jadzinsky'
+copyright = u'2014-2016, Benjamin Naecker, Niru Maheswaranathan'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -65,7 +65,7 @@
 # The short X.Y version.
 version = '0.4'
 # The full version, including alpha/beta/rc tags.
-release = '0.4.0'
+release = '0.4.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -209,7 +209,7 @@
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
   ('index', 'pyret.tex', u'pyret Documentation',
-   u'Ben Naecker, Niru Maheswaranathan, Pablo Jadzinsky', 'manual'),
+   u'Benjamin Naecker, Niru Maheswaranathan', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -239,7 +239,7 @@
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'pyret', u'pyret Documentation',
-     [u'Ben Naecker, Niru Maheswaranathan, Pablo Jadzinsky'], 1)
+     [u'Ben Naecker, Niru Maheswaranathan'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -253,7 +253,7 @@
 #  dir menu entry, description, category)
 texinfo_documents = [
   ('index', 'pyret', u'pyret Documentation',
-   u'Ben Naecker, Niru Maheswaranathan, Pablo Jadzinsky', 'pyret', 'One line description of project.',
+   u'Ben Naecker, Niru Maheswaranathan', 'pyret', 'Python tools for neural data analysis.',
    'Miscellaneous'),
 ]