Skip to content

Commit

Permalink
Merge branch 'master' of github.com:benbaror/scRRpy
Browse files Browse the repository at this point in the history
  • Loading branch information
benbaror committed Feb 15, 2018
2 parents 7103a11 + ed299d6 commit 575de90
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ matrix:
- python: "3.5"
env: TOXENV=py35
- python: "3.6"
env: TOXENV=py36
env: TOXENV=py36,coveralls
- python: "3.6"
env: TOXENV=docs
- python: "3.6"
Expand Down
6 changes: 5 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Overview
- |docs|
* - tests
- | |travis| |appveyor| |requires|
| |codecov|
| |codecov| |coveralls|
.. |docs| image:: https://readthedocs.org/projects/scrrpy/badge/?style=flat
:target: https://readthedocs.org/projects/scrrpy
Expand All @@ -31,6 +31,10 @@ Overview
.. |codecov| image:: https://codecov.io/github/benbaror/scrrpy/coverage.svg?branch=master
:alt: Coverage Status
:target: https://codecov.io/github/benbaror/scrrpy
.. |coveralls| image:: https://coveralls.io/repos/github/benbaror/scRRpy/badge.svg?branch=master
:target: https://coveralls.io/github/benbaror/scRRpy?branch=master



.. end-badges
Expand Down
5 changes: 5 additions & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
from __future__ import unicode_literals

import os
import sys

sys.path.insert(0, os.path.abspath('../src/'))
sys.path.insert(0, os.path.abspath('./src/'))


extensions = [
'sphinx.ext.autodoc',
Expand Down
4 changes: 4 additions & 0 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,9 @@ dependencies:
- numba
- cython
- h5py
- astropy
- scipy
- progressbar2
- click
- pip:
- vegas
4 changes: 4 additions & 0 deletions readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
conda:
file: environment.yml
python:
setup_py_install: true
python:
version: 3.5

0 comments on commit 575de90

Please sign in to comment.