Drop pyfits, replace with astropy

17 files changed, 27 insertions, 35 deletions

diff --git a/calcos/calcos.ini b/calcos/calcos.ini
index bf9e215..4a93bec 100644
--- a/calcos/calcos.ini
+++ b/calcos/calcos.ini
@@ -20,13 +20,13 @@ number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 build : 
     d2to1
     numpy
-    pyfits
+    astropy
     stsci.distutils
     setuptools
 	python
 run : 
     numpy
-    pyfits
+    astropy
 	python
 
 [test]
diff --git a/costools/costools.ini b/costools/costools.ini
index 44fd79a..350daf8 100644
--- a/costools/costools.ini
+++ b/costools/costools.ini
@@ -20,7 +20,6 @@ build:
     astropy
     calcos
     stsci.tools
-    pyfits
     python
     setuptools
 run:
diff --git a/deprecated/calacs/calacs.ini b/deprecated/calacs/calacs.ini
index e8845dc..4a1737b 100644
--- a/deprecated/calacs/calacs.ini
+++ b/deprecated/calacs/calacs.ini
@@ -20,13 +20,13 @@ number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 build : 
     d2to1
     numpy
-    pyfits
+    astropy
     stsci.distutils
     setuptools
 	python
 run : 
     numpy
-    pyfits
+    astropy
 	python
 
 [test]
diff --git a/pydrizzle/pydrizzle.ini b/pydrizzle/pydrizzle.ini
index ee4c227..73b96a8 100644
--- a/pydrizzle/pydrizzle.ini
+++ b/pydrizzle/pydrizzle.ini
@@ -21,7 +21,6 @@ build:
     numpy >=1.6.0
     stsci.distutils
     stsci.tools
-    pyfits
     setuptools
     python
 
@@ -30,7 +29,6 @@ run:
     astropy >=1.0
     numpy >=1.6.0
     stsci.tools
-    pyfits
     python
 
 [cbc_build]
diff --git a/pyfits/pyfits.ini b/pyfits/pyfits.ini
index 1d681d6..7e891f9 100644
--- a/pyfits/pyfits.ini
+++ b/pyfits/pyfits.ini
@@ -1,5 +1,5 @@
 [package]
-name: pyfits
+name: astropy
 version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
diff --git a/pysynphot/pysynphot.ini b/pysynphot/pysynphot.ini
index eb1590f..360215f 100644
--- a/pysynphot/pysynphot.ini
+++ b/pysynphot/pysynphot.ini
@@ -23,7 +23,6 @@ build:
     astropy
     cython
     numpy
-    pyfits
     matplotlib
     setuptools
     python
@@ -34,7 +33,6 @@ run:
     stsci.distutils
     astropy
     cython
-    pyfits
     numpy
     matplotlib
     python
diff --git a/stsci-hst/stsci-hst.ini b/stsci-hst/stsci-hst.ini
index a5ae76c..d61445c 100644
--- a/stsci-hst/stsci-hst.ini
+++ b/stsci-hst/stsci-hst.ini
@@ -1,6 +1,6 @@
 [package]
 name : stsci-hst
-version : 1.0
+version : 1.1
 
 [about]
 home : http://www.stsci.edu
@@ -12,7 +12,7 @@ summary : ${package:name} meta-package
 #url : ${about:home}/${fn}
 
 [build]
-number : 1
+number : 0
 
 [requirements]
 build : 
@@ -26,10 +26,6 @@ run :
     acstools [py27]
     astrolib.coords [py3k]
     astrolib.coords [py27]
-    # pyfits MUST come before astropy... dependency nightmare
-    pyfits [py3k]
-    pyfits [py27]
-    # astropy MUST come after pyfits... see also pyfits
     astropy [py3k]
     astropy [py27]
     calcos [py3k]
diff --git a/stsci.image/stsci.image.ini b/stsci.image/stsci.image.ini
index ddf27e6..1a16253 100644
--- a/stsci.image/stsci.image.ini
+++ b/stsci.image/stsci.image.ini
@@ -23,7 +23,7 @@ build:
     stsci.tools
     stsci.convolve
     setuptools
-    pyfits
+    astropy
     numpy
     python
 
@@ -32,7 +32,7 @@ run:
     stsci.distutils
     stsci.tools
     stsci.convolve
-    pyfits
+    astropy
     numpy
     python
 
diff --git a/stsci.imagemanip/stsci.imagemanip.ini b/stsci.imagemanip/stsci.imagemanip.ini
index 25595cc..da79ef4 100644
--- a/stsci.imagemanip/stsci.imagemanip.ini
+++ b/stsci.imagemanip/stsci.imagemanip.ini
@@ -23,7 +23,7 @@ build:
     stsci.convolve
     stsci.image
     setuptools
-    pyfits
+    astropy
     numpy
     python
 
@@ -33,7 +33,7 @@ run:
     stsci.tools
     stsci.convolve
     stsci.image
-    pyfits
+    astropy
     numpy
     python
 
diff --git a/stsci.imagestats/stsci.imagestats.ini b/stsci.imagestats/stsci.imagestats.ini
index 0cda9e0..60bb90c 100644
--- a/stsci.imagestats/stsci.imagestats.ini
+++ b/stsci.imagestats/stsci.imagestats.ini
@@ -25,7 +25,7 @@ build:
     stsci.image
     stsci.imagemanip
     setuptools
-    pyfits
+    astropy
     numpy
     python
 
@@ -36,7 +36,7 @@ run:
     stsci.convolve
     stsci.image
     stsci.imagemanip
-    pyfits
+    astropy
     numpy
     python
 
diff --git a/stsci.ndimage/stsci.ndimage.ini b/stsci.ndimage/stsci.ndimage.ini
index d566326..cc170f2 100644
--- a/stsci.ndimage/stsci.ndimage.ini
+++ b/stsci.ndimage/stsci.ndimage.ini
@@ -19,13 +19,13 @@ preserve_egg_dir: yes
 build:
     d2to1
     setuptools
-    pyfits
+    astropy
     numpy
     python
 
 run:
     d2to1
-    pyfits
+    astropy
     numpy
     python
 
diff --git a/stsci.numdisplay/stsci.numdisplay.ini b/stsci.numdisplay/stsci.numdisplay.ini
index 8905890..f75da01 100644
--- a/stsci.numdisplay/stsci.numdisplay.ini
+++ b/stsci.numdisplay/stsci.numdisplay.ini
@@ -21,14 +21,14 @@ build:
     d2to1
     stsci.tools
     setuptools
-    pyfits
+    astropy
     numpy
     python
 
 run:
     d2to1
     stsci.tools
-    pyfits
+    astropy
     numpy
     python
 
diff --git a/stsci.skypac/stsci.skypac.ini b/stsci.skypac/stsci.skypac.ini
index f52c5a9..9e364a1 100644
--- a/stsci.skypac/stsci.skypac.ini
+++ b/stsci.skypac/stsci.skypac.ini
@@ -21,9 +21,11 @@ preserve_egg_dir: yes
 build : 
 	stsci.distutils
     stsci.sphere
+    astropy
 	setuptools
 	python
 run : 
+    astropy
     stsci.sphere
 	python
 
diff --git a/stsci.sphere/stsci.sphere.ini b/stsci.sphere/stsci.sphere.ini
index 924084a..d3ab28e 100644
--- a/stsci.sphere/stsci.sphere.ini
+++ b/stsci.sphere/stsci.sphere.ini
@@ -20,12 +20,13 @@ build:
     d2to1
     setuptools
     stsci.distutils
+    astropy
     numpy
     python
 
 run:
     d2to1
-    #pyfits
+    astropy
     numpy
     python
 
diff --git a/stsci.tools/stsci.tools.ini b/stsci.tools/stsci.tools.ini
index 1d17051..3b7f637 100644
--- a/stsci.tools/stsci.tools.ini
+++ b/stsci.tools/stsci.tools.ini
@@ -21,17 +21,15 @@ build:
     d2to1
     setuptools
     stsci.distutils
-    pyfits
-    numpy
     astropy
+    numpy
     python
 
 run:
     d2to1
     stsci.distutils
-    pyfits
-    numpy
     astropy
+    numpy
     python
 
 
diff --git a/wfc3tools/wfc3tools.ini b/wfc3tools/wfc3tools.ini
index ac16558..67d7f15 100644
--- a/wfc3tools/wfc3tools.ini
+++ b/wfc3tools/wfc3tools.ini
@@ -18,12 +18,12 @@ build :
 	d2to1
 	stsci.distutils
 	stsci.tools
-    pyfits
+    astropy
 	setuptools
 	python
 run : 
 	stsci.tools
-    pyfits
+    astropy
 	python
 
 [test]
diff --git a/wfpc2tools/wfpc2tools.ini b/wfpc2tools/wfpc2tools.ini
index 512212f..95e0175 100644
--- a/wfpc2tools/wfpc2tools.ini
+++ b/wfpc2tools/wfpc2tools.ini
@@ -20,14 +20,14 @@ build :
     stsci.imagestats
     stsci.ndimage
 	stsci.tools
-    pyfits
+    astropy
 	setuptools
 	python
 run : 
     stsci.imagestats
     stsci.ndimage
 	stsci.tools
-    pyfits
+    astropy
 	python
 
 [test]