Skip to content

Commit

Permalink
Merge 46039a2 into 4d800ab
Browse files Browse the repository at this point in the history
  • Loading branch information
erikbern committed Aug 2, 2019
2 parents 4d800ab + 46039a2 commit 9553e11
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -6,10 +6,10 @@ before_install:
- pip install -U pytest pytest-cov
- pip install coveralls
- pip install sphinx
- python setup.py build_sphinx
install:
- pip install pytest flaky .
script:
- py.test -s -v --cov=convoys .
- sphinx-build -M html docs/ docs/_build/
after_success:
- coveralls
6 changes: 6 additions & 0 deletions docs/conf.py
Expand Up @@ -119,6 +119,12 @@
}


# Mock modules during doc generation
# TODO: would be nice if this is pulled automatically from setup.py
autodoc_mock_imports = ['autograd', 'autograd-gamma', 'emcee', 'matplotlib',
'numpy', 'pandas', 'scipy']


# -- Extension configuration -------------------------------------------------

# -- Options for todo extension ----------------------------------------------
Expand Down
11 changes: 10 additions & 1 deletion setup.py
@@ -1,4 +1,5 @@
from setuptools import setup, find_packages
from sphinx.setup_command import BuildDoc

long_description = '''
For more information, see
Expand Down Expand Up @@ -26,4 +27,12 @@
'pandas',
'numpy',
'scipy',
])
],

# Sphinx-specific setup
cmdclass={'build_sphinx': BuildDoc},
command_options={
'build_sphinx': {
'source_dir': ('setup.py', 'docs'),
'build_dir': ('setup.py', 'docs/_build')}},
)

0 comments on commit 9553e11

Please sign in to comment.