Skip to content

Commit

Permalink
Merge pull request soft-matter#121 from danielballan/fix-readthedocs
Browse files Browse the repository at this point in the history
Fix readthedocs
  • Loading branch information
danielballan committed Jul 9, 2014
2 parents 85c9d90 + 39b6b0a commit bd6a867
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ install:
- source activate testenv
- conda install --yes $DEPS
# TODO Remove these once setup.py handles dependencies correctly.
- pip install -e git+https://github.com/soft-matter/pims#egg=pims
- pip install -e svn+http://pylibtiff.googlecode.com/svn/trunk/
- python setup.py install

Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ def read(fname):
author = "Daniel Allan and Thomas Caswell",
author_email = "[email protected]",
url = "https://github.com/soft-matter/trackpy",
install_requires = ['numpy', 'scipy', 'six', 'pandas'],
install_requires = ['numpy', 'scipy', 'six', 'pandas',
'pyyaml', 'matplotlib', 'pims'],
packages = ['trackpy'],
long_description = read('README.md'),
)
Expand Down

0 comments on commit bd6a867

Please sign in to comment.