Skip to content

Commit

Permalink
Merge pull request #318 from bsipocz/reproject_as_requirement
Browse files Browse the repository at this point in the history
Adding reproject as requirement
  • Loading branch information
mwcraig committed Mar 2, 2016
2 parents db10268 + e508ccd commit da38a63
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 1 deletion.
12 changes: 12 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@
0.4.0 (unreleased)
------------------

General
^^^^^^^

- ccdproc has now the following requirements:

- Python 2.7 or 3.4 or later.
- astropy 1.0 or later
- numpy 1.9 or later
- scipy
- astroscrappy
- reproject

New Features
^^^^^^^^^^^^

Expand Down
1 change: 1 addition & 0 deletions ccdproc/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
try:
PYTEST_HEADER_MODULES['Astropy'] = 'astropy'
PYTEST_HEADER_MODULES['astroscrappy'] = 'astroscrappy'
PYTEST_HEADER_MODULES['reproject'] = 'reproject'
del PYTEST_HEADER_MODULES['h5py']
except NameError:
pass
1 change: 1 addition & 0 deletions docs/ccdproc/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Ccdproc has the following requirements:
- `Numpy <http://www.numpy.org/>`_
- `Scipy <http://www.scipy.org/>`_
- `astroscrappy <https://github.com/astropy/astroscrappy>`_
- `reproject <https://github.com/astrofrog/reproject>`_

One easy way to get these dependencies is to install a python distribution
like `anaconda <http://continuum.io/>`_.
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@
version=VERSION,
description=DESCRIPTION,
scripts=scripts,
install_requires=['astropy>=1.0', 'numpy', 'scipy', 'astroscrappy'],
install_requires=['astropy>=1.0', 'numpy', 'scipy', 'astroscrappy',
'reproject'],
tests_require=['pytest-capturelog'],
provides=[PACKAGENAME],
author=AUTHOR,
Expand Down

0 comments on commit da38a63

Please sign in to comment.