Merge pull request #1 from arokem/mtrumpis-mt-fixups

Mtrumpis mt fixups

.travis.yml

@@ -0,0 +1,34 @@
+# vim ft=yaml
+# travis-ci.org definition for nipy build
+#
+# We pretend to be erlang because we need can't use the python support in
+# travis-ci; it uses virtualenvs, they do not have numpy, scipy, matplotlib,
+# and it is impractical to build them
+language: erlang
+env:
+    # Enable python 2 for now, we will add python3 later
+    - PYTHON=python PYSUF=''
+install:
+    - sudo apt-get update
+    - sudo apt-get install $PYTHON-dev
+    - sudo apt-get install $PYTHON-numpy
+    - sudo apt-get install $PYTHON-scipy
+    - sudo apt-get install $PYTHON-setuptools
+    - sudo apt-get install $PYTHON-nose
+    - sudo easy_install$PYSUF nibabel # Latest pypi
+    # Cython easy_install breaks with error about refnanny.c; maybe something
+    # to do with having a previous cython version;
+    # http://mail.python.org/pipermail//cython-devel/2012-April/002344.html
+    - curl -O http://www.cython.org/release/Cython-0.18.zip
+    - unzip Cython-0.18.zip
+    - cd Cython-0.18
+    - sudo python$PYSUF setup.py install
+    - cd ..
+    # NITIME:
+    - $PYTHON setup.py build
+    - sudo $PYTHON setup.py install
+script:
+    # Change into an innocuous directory and find tests from installation
+    - mkdir for_test
+    - cd for_test
+    - nosetests$PYSUF --with-doctest `$PYTHON -c "import os; import nitime; print(os.path.dirname(nitime.__file__))"`

doc/conf.py

@@ -75,7 +75,7 @@
               'sphinx.ext.todo',
               'sphinx.ext.pngmath',
               'numpydoc',
-              'inheritance_diagram',
+              'sphinx.ext.inheritance_diagram',
               'ipython_console_highlighting',
               'only_directives',
               'math_dollar',  # Support for $x$ math

doc/sphinxext/README.txt

@@ -20,6 +20,5 @@ base.
   * numpydoc.py
 
 * From matplotlib:
-  * inheritance_diagram.py
   * ipython_console_highlighting.py
   * only_directives.py