Skip to content

Commit

Permalink
BUG: numpydocs build correction
Browse files Browse the repository at this point in the history
  • Loading branch information
dgursoy committed Apr 15, 2015
1 parent 0b023c2 commit 6bc6aca
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
11 changes: 2 additions & 9 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,13 @@
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
try:
import sphinxcontrib.bibtex
extensions = [
extensions = [
'sphinx.ext.autodoc',
'sphinx.ext.mathjax',
'sphinx.ext.todo',
'numpydoc',
'sphinxcontrib.napoleon',
'sphinxcontrib.bibtex']
except ImportError:
extensions = [
'sphinx.ext.autodoc',
'sphinx.ext.mathjax',
'sphinx.ext.todo',
'numpydoc']

[extensions]
todo_include_todos=True
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
from setuptools import setup, Extension
from setuptools import setup, Extension, find_packages

prep = Extension(
name='tomopy.lib.libtomopy_prep',
Expand Down Expand Up @@ -38,7 +38,7 @@

setup(
name='tomopy',
packages=['tomopy'],
packages=find_packages(),
package_data={'tomopy': ['data/*.tif']},
version=open('VERSION').read().strip(),
ext_modules=[prep, recon, misc],
Expand Down

0 comments on commit 6bc6aca

Please sign in to comment.