Skip to content

Commit

Permalink
Merge pull request #1327 from gcetusic/hotfix/requirements
Browse files Browse the repository at this point in the history
Hotfix/requirements
  • Loading branch information
Cadair committed Mar 16, 2015
2 parents 9d1781b + bb1a2f2 commit e6cd72c
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ docs
htmlcov
result.xml
sunpy/version.py
sunpy/_compiler.c
sunpy/cython_version.py
sunpy/data/sample/*.fits
sunpy/data/sample/*.csv
Expand Down
5 changes: 0 additions & 5 deletions requirements.txt

This file was deleted.

7 changes: 7 additions & 0 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Base dependencies required to run SunPy

numpy>1.7.1
astropy>=1.0.0
scipy
pandas>=0.12.0
matplotlib>=1.1
15 changes: 15 additions & 0 deletions requirements/extra.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Extra dependencies required for development and tests

-r base.txt

# Pytest and the optional pytest coverage plugin for tests
pytest
pytest-cov

# Optional dependencies for extra functionality
sqlalchemy
scikit-image
glymur
suds
beautifulsoup4
requests

0 comments on commit e6cd72c

Please sign in to comment.