8000 Depend on Astropy instead of PyFITS for FITS support by lpsinger · Pull Request #337 · healpy/healpy · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Depend on Astropy instead of PyFITS for FITS support #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 4, 2016
Merged

Depend on Astropy instead of PyFITS for FITS support #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Requirements
* Python development package is required for some distribution (e.g.,
python-dev package for Ubuntu)

* `PyFITS <http://www.stsci.edu/resources/software_hardware/pyfits>`_
* `Astropy <http://www.astropy.org>`_

Quick installation with Pip
---------------------------
Expand Down
7 changes: 1 addition & 6 deletions healpy/fitsfunc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,7 @@
import shutil
import os
import warnings

try:
import astropy.io.fits as pf
except ImportError:
import pyfits as pf

import astropy.io.fits as pf
import numpy as np

from . import pixelfunc
Expand Down
6 changes: 1 addition & 5 deletions healpy/sphtfunc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,7 @@
import six
pi = np.pi
import warnings

try:
import astropy.io.fits as pf
except ImportError:
import pyfits as pf
import astropy.io.fits as pf

from . import _healpy_sph_transform_lib as sphtlib
from . import _healpy_fitsio_lib as hfitslib
Expand Down
5 changes: 1 addition & 4 deletions healpy/test/test_fitsfunc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import os
try:
import astropy.io.fits as pf
except:
import pyfits as pf
import astropy.io.fits as pf
import unittest
import numpy as np
import gzip
Expand Down
5 changes: 1 addition & 4 deletions healpy/test/test_sphtfunc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
try:
import astropy.io.fits as pf
except:
import pyfits as pf
import astropy.io.fits as pf
import os
import numpy as np
from copy import deepcopy
Expand Down
11 changes: 1 addition & 10 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,15 +432,6 @@ def run_tests(self):
exec(open('healpy/version.py').read())


# Determine dependencies.
install_requires = ['matplotlib', 'numpy', 'six']
# Add install dependency on astropy, unless pyfits is already installed.
try:
import pyfits
except ImportError:
install_requires.append('astropy')


setup(name='healpy',
version=__version__,
description='Healpix tools package for Python',
Expand Down Expand Up @@ -505,7 +496,7 @@ def run_tests(self):
cython_directives=dict(embedsignature=True))
],
package_data = {'healpy': ['data/*.fits', 'data/totcls.dat', 'test/data/*.fits', 'test/data/*.sh']},
install_requires=install_requires,
install_requires=['matplotlib', 'numpy', 'six', 'astropy'],
tests_require=['pytest'],
test_suite='healpy',
license='GPLv2'
Expand Down
0