Namespace package dependency corrections

17 files changed, 45 insertions, 77 deletions

diff --git a/jwst_lib/jwst_lib.ini b/jwst_lib/jwst_lib.ini
index 279ebe7..8e19364 100644
--- a/jwst_lib/jwst_lib.ini
+++ b/jwst_lib/jwst_lib.ini
@@ -34,7 +34,6 @@ run :
     astropy >=1.1
     crds
     pyasdf
-    stsci.distutils
     numpy
 	python
 
diff --git a/jwst_pipeline/jwst_pipeline.ini b/jwst_pipeline/jwst_pipeline.ini
index 1943ac4..da48e32 100644
--- a/jwst_pipeline/jwst_pipeline.ini
+++ b/jwst_pipeline/jwst_pipeline.ini
@@ -23,6 +23,7 @@ build :
     d2to1
     astropy >=1.1
     jwst_lib
+    stsci.convolve
     stsci.distutils
     numpy
 	setuptools
@@ -30,8 +31,8 @@ build :
 run : 
     astropy >=1.1
     jwst_lib
-    stsci.distutils
     numpy
+    stsci.convolve
 	python
 
 [test]
diff --git a/jwst_tools/jwst_tools.ini b/jwst_tools/jwst_tools.ini
index 1ab248c..a9d57aa 100644
--- a/jwst_tools/jwst_tools.ini
+++ b/jwst_tools/jwst_tools.ini
@@ -23,13 +23,14 @@ build :
     d2to1
     astropy >=1.1
     stsci.distutils
+    stsci.tools
     numpy
 	setuptools
 	python
 run : 
     astropy >=1.1
-    stsci.distutils
     numpy
+    stsci.tools
 	python
 
 [test]
diff --git a/nictools/nictools.ini b/nictools/nictools.ini
index 7571c87..7ea3ef3 100644
--- a/nictools/nictools.ini
+++ b/nictools/nictools.ini
@@ -16,34 +16,32 @@ number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 [requirements]
 build : 
     astropy >=1.1
-	stsci.distutils
-    stsci.ndimage
-    stsci.convolve
-    stsci.tools
     numpy
-	setuptools
-	python
-run : 
-	astropy >=1.1
-    stsci.ndimage
-    stsci.convolve
+    scipy
+    stsci.distutils
     stsci.tools
+    setuptools
+    python
+run :
+    astropy >=1.1
     numpy
-	python
+    scipy
+    stsci.tools
+    python
 
 [test]
 imports : 
-	
+    nictools
+
 commands : 
-	
 
 [cbc_build]
 linux : 
-	pip install --no-deps --upgrade --force d2to1
-	python setup.py install || exit 1
+    pip install --no-deps --upgrade --force d2to1
+    python setup.py install || exit 1
 
 windows : 
-	python setup.py install
+    python setup.py install
     2to3 -w .
-	if errorlevel 1 exit 1
+    if errorlevel 1 exit 1
 
diff --git a/pysynphot/pysynphot.ini b/pysynphot/pysynphot.ini
index e3c6721..b189a30 100644
--- a/pysynphot/pysynphot.ini
+++ b/pysynphot/pysynphot.ini
@@ -28,9 +28,7 @@ build:
     python
 
 run:
-    d2to1
     nose
-    stsci.distutils
     astropy >=1.1
     cython
     numpy
diff --git a/pywcs/pywcs.ini b/pywcs/pywcs.ini
index eb9dd40..edc5c20 100644
--- a/pywcs/pywcs.ini
+++ b/pywcs/pywcs.ini
@@ -25,8 +25,6 @@ build:
     setuptools
     python
 run:
-    d2to1
-    stsci.distutils
     stsci.tools
     numpy
     python
diff --git a/reftools/reftools.ini b/reftools/reftools.ini
index 172f3cd..037b7de 100644
--- a/reftools/reftools.ini
+++ b/reftools/reftools.ini
@@ -18,26 +18,24 @@ preserve_egg_dir: yes
 build:
     d2to1
     stsci.distutils
-    stsci.ndimage
     stsci.imagestats
     stsci.tools
     pywcs
     pysynphot
     stwcs
     calcos
+    scipy
     numpy
     setuptools
     python
 run:
-    d2to1
-    stsci.distutils
-    stsci.ndimage
     stsci.imagestats
     stsci.tools
     pywcs
     pysynphot
     stwcs
     calcos
+    scipy
     numpy
     python
 
diff --git a/stistools/stistools.ini b/stistools/stistools.ini
index 264fc7c..6175475 100644
--- a/stistools/stistools.ini
+++ b/stistools/stistools.ini
@@ -17,18 +17,14 @@ number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 build:
     d2to1
     astropy >=1.1
+    scipy
     stsci.distutils
-    stsci.convolve
-    stsci.ndimage
     stsci.tools
     setuptools
     python
 run:
-    d2to1
     astropy >=1.1
-    stsci.convolve
-    stsci.distutils
-    stsci.ndimage
+    scipy
     stsci.tools
     python
 
diff --git a/stsci.convolve/stsci.convolve.ini b/stsci.convolve/stsci.convolve.ini
index e789d50..52318ee 100644
--- a/stsci.convolve/stsci.convolve.ini
+++ b/stsci.convolve/stsci.convolve.ini
@@ -23,7 +23,6 @@ build:
     python
 
 run:
-    stsci.distutils
     numpy
     python
 
diff --git a/stsci.image/stsci.image.ini b/stsci.image/stsci.image.ini
index 4724efc..4616cad 100644
--- a/stsci.image/stsci.image.ini
+++ b/stsci.image/stsci.image.ini
@@ -19,20 +19,19 @@ preserve_egg_dir: yes
 [requirements]
 build:
     d2to1
+    astropy >=1.1
+    numpy
+    scipy
     stsci.distutils
     stsci.tools
-    stsci.convolve
     setuptools
-    astropy >=1.1
-    numpy
     python
 
 run:
-    stsci.distutils
-    stsci.tools
-    stsci.convolve
     astropy >=1.1
     numpy
+    scipy
+    stsci.tools
     python
 
 [test]
diff --git a/stsci.imagemanip/stsci.imagemanip.ini b/stsci.imagemanip/stsci.imagemanip.ini
index 20b49ee..fb29ca6 100644
--- a/stsci.imagemanip/stsci.imagemanip.ini
+++ b/stsci.imagemanip/stsci.imagemanip.ini
@@ -18,22 +18,15 @@ preserve_egg_dir: yes
 [requirements]
 build:
     d2to1
+    numpy
     stsci.distutils
     stsci.tools
-    stsci.convolve
-    stsci.image
     setuptools
-    astropy >=1.1
-    numpy
     python
 
 run:
-    stsci.distutils
-    stsci.tools
-    stsci.convolve
-    stsci.image
-    astropy >=1.1
     numpy
+    stsci.tools
     python
 
 [test]
diff --git a/stsci.imagestats/stsci.imagestats.ini b/stsci.imagestats/stsci.imagestats.ini
index 783d3e0..106cb5e 100644
--- a/stsci.imagestats/stsci.imagestats.ini
+++ b/stsci.imagestats/stsci.imagestats.ini
@@ -20,22 +20,11 @@ preserve_egg_dir: yes
 build:
     d2to1
     stsci.distutils
-    stsci.tools
-    stsci.convolve
-    stsci.image
-    stsci.imagemanip
     setuptools
-    astropy >=1.1
     numpy
     python
 
 run:
-    stsci.distutils
-    stsci.tools
-    stsci.convolve
-    stsci.image
-    stsci.imagemanip
-    astropy >=1.1
     numpy
     python
 
diff --git a/stsci.numdisplay/stsci.numdisplay.ini b/stsci.numdisplay/stsci.numdisplay.ini
index 7fcdd5a..a2a8aed 100644
--- a/stsci.numdisplay/stsci.numdisplay.ini
+++ b/stsci.numdisplay/stsci.numdisplay.ini
@@ -19,16 +19,14 @@ preserve_egg_dir: yes
 [requirements]
 build:
     d2to1
+    numpy
     stsci.tools
     setuptools
-    astropy >=1.1
-    numpy
     python
 
 run:
-    stsci.tools
-    astropy >=1.1
     numpy
+    stsci.tools
     python
 
 [test]
diff --git a/stsci.sphere/stsci.sphere.ini b/stsci.sphere/stsci.sphere.ini
index ceed749..0c9afb3 100644
--- a/stsci.sphere/stsci.sphere.ini
+++ b/stsci.sphere/stsci.sphere.ini
@@ -18,14 +18,16 @@ preserve_egg_dir: yes
 [requirements]
 build:
     d2to1
-    setuptools
-    stsci.distutils
     astropy >=1.1
+    matplotlib
     numpy
+    setuptools
+    stsci.distutils
     python
 
 run:
     astropy >=1.1
+    matplotlib
     numpy
     python
 
diff --git a/stsci.stimage/stsci.stimage.ini b/stsci.stimage/stsci.stimage.ini
index 4451a75..1c1c061 100644
--- a/stsci.stimage/stsci.stimage.ini
+++ b/stsci.stimage/stsci.stimage.ini
@@ -18,13 +18,12 @@ preserve_egg_dir: yes
 [requirements]
 build:
     d2to1
+    numpy
     stsci.distutils
     setuptools
-    numpy
     python
 
 run:
-    stsci.distutils
     numpy
     python
 
diff --git a/stsci.tools/stsci.tools.ini b/stsci.tools/stsci.tools.ini
index ed1f827..00873a2 100644
--- a/stsci.tools/stsci.tools.ini
+++ b/stsci.tools/stsci.tools.ini
@@ -19,18 +19,18 @@ preserve_egg_dir: yes
 [requirements]
 build:
     d2to1
-    setuptools
-    stsci.distutils
     astropy >=1.1
     pytools
+    setuptools
+    stsci.distutils
     numpy
     python
 
 run:
-    stsci.distutils
     astropy >=1.1
-    pytools
     numpy
+    pytools
+    stsci.distutils
     python
 
 [test]
diff --git a/wfpc2tools/wfpc2tools.ini b/wfpc2tools/wfpc2tools.ini
index 48e5e19..f6240f8 100644
--- a/wfpc2tools/wfpc2tools.ini
+++ b/wfpc2tools/wfpc2tools.ini
@@ -16,18 +16,18 @@ number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 [requirements]
 build : 
 	d2to1
+    astropy >=1.1
+    scipy
 	stsci.distutils
     stsci.imagestats
-    stsci.ndimage
 	stsci.tools
-    astropy >=1.1
 	setuptools
 	python
 run : 
+    astropy >=1.1
+    scipy
     stsci.imagestats
-    stsci.ndimage
 	stsci.tools
-    astropy >=1.1
 	python
 
 [test]