Add x.x dependencies, add additional dependencies to recipes

81 files changed, 481 insertions, 436 deletions

diff --git a/acstools/acstools.ini b/acstools/acstools.ini
index 7a9b7b4..1618038 100644
--- a/acstools/acstools.ini
+++ b/acstools/acstools.ini
@@ -18,9 +18,9 @@ number: 0
 build:
     d2to1
     stsci.distutils
-    python
+    python x.x
     astropy >=1.1
-    numpy
+    numpy x.x
     scipy
     scikit-image
     matplotlib
@@ -29,14 +29,14 @@ build:
     setuptools
 run:
     astropy >=1.1
-    numpy
+    numpy x.x
     scipy
     scikit-image
     matplotlib
     stsci.imagestats
     stsci.tools
     setuptools
-    python
+    python x.x
 
 [test]
 imports:
diff --git a/appdirs/appdirs.ini b/appdirs/appdirs.ini
index da62f0b..a499135 100644
--- a/appdirs/appdirs.ini
+++ b/appdirs/appdirs.ini
@@ -17,24 +17,24 @@ number : 0
 
 [requirements]
 build : 
-	setuptools
-	python
+    setuptools
+    python x.x
 
 run : 
-	python
+    python x.x
 
 [test]
 imports : 
     # none
-	
+    
 commands : 
-	# none
+    # none
 
 [cbc_build]
 linux : 
-	python setup.py install || exit 1
+    python setup.py install || exit 1
 
 windows : 
-	python setup.py install
-	if errorlevel 1 exit 1
+    python setup.py install
+    if errorlevel 1 exit 1
 
diff --git a/aprio/aprio.ini b/aprio/aprio.ini
index 2936cfc..f5995ce 100644
--- a/aprio/aprio.ini
+++ b/aprio/aprio.ini
@@ -17,7 +17,7 @@ number: 0
 
 [requirements]
 build:
-    python
+    python x.x
     argparse >=1.1 [py26]
     setuptools
     psutil
@@ -25,7 +25,7 @@ build:
 run:
     psutil
     python-daemon
-    python
+    python x.x
 
 
 [cbc_build]
diff --git a/asdf-standard/asdf-standard.ini b/asdf-standard/asdf-standard.ini
index 57577b6..cf34f3d 100644
--- a/asdf-standard/asdf-standard.ini
+++ b/asdf-standard/asdf-standard.ini
@@ -22,13 +22,13 @@ build:
     mistune
     six [py27|py3k]
     setuptools
-    python
+    python x.x
 
 run:
     nose
     astropy >=1.1
     setuptools
-    python
+    python x.x
 
 [cbc_build]
 linux:
diff --git a/asdf/asdf.ini b/asdf/asdf.ini
index 7b4c4ba..5e32e8d 100644
--- a/asdf/asdf.ini
+++ b/asdf/asdf.ini
@@ -22,7 +22,8 @@ build:
     pytest
     six
     setuptools
-    python
+    numpy x.x
+    python x.x
 
 run:
     astropy >=1.1
@@ -31,7 +32,8 @@ run:
     pytest
     six
     setuptools
-    python
+    numpy x.x
+    python x.x
 
 [test]
 commands:
diff --git a/astroimtools/astroimtools.ini b/astroimtools/astroimtools.ini
index 55db91e..a80623d 100644
--- a/astroimtools/astroimtools.ini
+++ b/astroimtools/astroimtools.ini
@@ -18,12 +18,18 @@ number: 0
 [requirements]
 build:
     astropy >=1.1
+    cython
+    matplotlib
     setuptools
-    python
+    numpy x.x
+    python x.x
 
 run:
     astropy >=1.1
-    python
+    cython
+    matplotlib
+    numpy x.x
+    python x.x
 
 [test]
 imports:
diff --git a/astrolib.coords/astrolib.coords.ini b/astrolib.coords/astrolib.coords.ini
index 69cd261..e187e96 100644
--- a/astrolib.coords/astrolib.coords.ini
+++ b/astrolib.coords/astrolib.coords.ini
@@ -17,14 +17,14 @@ number : 0
 [requirements]
 build : 
     d2to1
-	stsci.distutils
-	setuptools
-    numpy
-	python
+    stsci.distutils
+    setuptools
+    numpy x.x
+    python x.x
 
 run : 
-	numpy
-	python
+    numpy x.x
+    python x.x
 
 [test]
 imports : 
@@ -34,10 +34,10 @@ imports :
 linux : 
     pip install --no-deps --upgrade --force d2to1 || exit 1
     test -f README.md && ln -s README.md README.txt
-	python setup.py install || exit 1
+    python setup.py install || exit 1
 windows : 
-	
+    
     pip install --no-deps --upgrade --force d2to1 || exit 1
-	python setup.py install
-	if errorlevel 1 exit 1
+    python setup.py install
+    if errorlevel 1 exit 1
 
diff --git a/asv/asv.ini b/asv/asv.ini
index b8ee8a1..47360bb 100644
--- a/asv/asv.ini
+++ b/asv/asv.ini
@@ -21,11 +21,14 @@ build:
     six
     sphinx
     setuptools
-    python
+    numpy x.x
+    python x.x
 
 run:
     six
-    python
+    sphinx
+    numpy x.x
+    python x.x
 
 [test]
 commands:
diff --git a/atlas/atlas-generic.ini b/atlas/atlas-generic.ini
index db7ebc3..b48aed1 100644
--- a/atlas/atlas-generic.ini
+++ b/atlas/atlas-generic.ini
@@ -22,9 +22,9 @@ run :
 
 [test]
 imports : 
-	
+    
 commands : 
-	
+    
 
 [cbc_build]
 linux : 
@@ -56,7 +56,7 @@ linux :
 
     mkdir -p build
     pushd ./build
-	../configure --prefix=$$PREFIX \
+    ../configure --prefix=$$PREFIX \
     --with-netlib-lapack-tarfile=../$${LAPACK_TARBALL} \
     "$${OPTIONS}"
     
@@ -66,6 +66,6 @@ linux :
     popd
 
 windows : 
-	echo Not supported
-	if errorlevel 1 exit 1
+    echo Not supported
+    if errorlevel 1 exit 1
 
diff --git a/calcos/calcos.ini b/calcos/calcos.ini
index 8abfaa6..5e41b18 100644
--- a/calcos/calcos.ini
+++ b/calcos/calcos.ini
@@ -17,19 +17,19 @@ number : 0
 [requirements]
 build : 
     d2to1
-    numpy
+    numpy x.x
     astropy >=1.1
     scipy
     stsci.distutils
     stsci.tools
     setuptools
-	python
+    python x.x
 run : 
-    numpy
+    numpy x.x
     astropy >=1.1
     scipy
     stsci.tools
-	python
+    python x.x
 
 [test]
 imports : 
@@ -37,16 +37,16 @@ imports :
 
 commands : 
     calcos --help
-	
+    
 
 [cbc_build]
 linux : 
-	pip install --no-deps --upgrade --force d2to1
+    pip install --no-deps --upgrade --force d2to1
     # Pipeline backwards compat
     sed -i -e 's|pyfits.*|astropy (>=0.3.1)|' setup.cfg
-	python setup.py install || exit 1
+    python setup.py install || exit 1
 windows : 
-	
-	python setup.py install
-	if errorlevel 1 exit 1
+    
+    python setup.py install
+    if errorlevel 1 exit 1
 
diff --git a/cbc-test-package/cbc_test_package.ini b/cbc-test-package/cbc_test_package.ini
index 40e0890..c3daf2c 100644
--- a/cbc-test-package/cbc_test_package.ini
+++ b/cbc-test-package/cbc_test_package.ini
@@ -17,10 +17,10 @@ number: 0
 [requirements]
 build:
     setuptools
-    python
+    python x.x
 
 run:
-    python
+    python x.x
 
 [test]
 imports:
diff --git a/costools/costools.ini b/costools/costools.ini
index b5ef1ad..194465e 100644
--- a/costools/costools.ini
+++ b/costools/costools.ini
@@ -21,14 +21,16 @@ build:
     astropy >=1.1
     calcos
     stsci.tools
-    python
     setuptools
+    numpy x.x
+    python x.x
 run:
     astropy >=1.1
     calcos
     stsci.tools
     setuptools
-    python
+    numpy x.x
+    python x.x
 
 [test]
 imports:
diff --git a/crds/crds.ini b/crds/crds.ini
index 94626a9..efbf06b 100644
--- a/crds/crds.ini
+++ b/crds/crds.ini
@@ -18,27 +18,27 @@ preserve_egg_dir: no
 [requirements]
 build: 
     d2to1
-	astropy >=1.1
-    numpy
-	setuptools
-	python
+    astropy >=1.1
+    numpy x.x
+    setuptools
+    python x.x
 run: 
-	astropy >=1.1
-    numpy
-	python
+    astropy >=1.1
+    numpy x.x
+    python x.x
 
 [test]
 imports: 
     crds
-	
+    
 [cbc_build]
 linux: 
 
     pip install --no-deps --upgrade --force d2to1 || exit 1
-	python setup.py install || exit 1
+    python setup.py install || exit 1
 
 windows: 
-	
-	python setup.py install
-	if errorlevel 1 exit 1
+    
+    python setup.py install
+    if errorlevel 1 exit 1
 
diff --git a/cube-tools/cube-tools.ini b/cube-tools/cube-tools.ini
index 0a93383..ddc3fa6 100644
--- a/cube-tools/cube-tools.ini
+++ b/cube-tools/cube-tools.ini
@@ -18,13 +18,17 @@ number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 build:
     glueviz
     specview
+    pyqtgraph
     setuptools
-    python
+    numpy x.x
+    python x.x
 
 run:
     glueviz
     specview
-    python
+    pyqtgraph
+    numpy x.x
+    python x.x
 
 [test]
 imports:
diff --git a/d2to1/d2to1.ini b/d2to1/d2to1.ini
index 4fe7d21..83c10d7 100644
--- a/d2to1/d2to1.ini
+++ b/d2to1/d2to1.ini
@@ -17,10 +17,10 @@ number: 0
 [requirements]
 build:
     setuptools
-    python
+    python x.x
 run:
     setuptools
-    python
+    python x.x
 
 [cbc_build]
 linux:
diff --git a/decorator/decorator.ini b/decorator/decorator.ini
index 607de4e..d0bfc81 100644
--- a/decorator/decorator.ini
+++ b/decorator/decorator.ini
@@ -17,24 +17,24 @@ number : 0
 
 [requirements]
 build : 
-	setuptools
-	python
+    setuptools
+    python x.x
 
 run : 
-	python
+    python x.x
 
 [test]
 imports : 
     # none
-	
+    
 commands : 
-	# none
+    # none
 
 [cbc_build]
 linux : 
-	python setup.py install || exit 1
+    python setup.py install || exit 1
 
 windows : 
-	python setup.py install
-	if errorlevel 1 exit 1
+    python setup.py install
+    if errorlevel 1 exit 1
 
diff --git a/drizzlepac/drizzlepac.ini b/drizzlepac/drizzlepac.ini
index 78aa787..f2693f9 100644
--- a/drizzlepac/drizzlepac.ini
+++ b/drizzlepac/drizzlepac.ini
@@ -19,7 +19,7 @@ build:
     astropy >=1.1
     fitsblender
     nictools
-    numpy
+    numpy x.x
     scipy
     stsci.convolve
     stsci.distutils
@@ -32,13 +32,13 @@ build:
     stsci.stimage
     stwcs
     pyregion
-    python
+    python x.x
     setuptools
 run:
     astropy >=1.1
     fitsblender
     nictools
-    numpy
+    numpy x.x
     scipy
     stsci.convolve
     stsci.image
@@ -51,7 +51,7 @@ run:
     stwcs
     pyregion
     setuptools
-    python
+    python x.x
 
 [test]
 imports:
diff --git a/ds9/ds9.ini b/ds9/ds9.ini
index b480251..ab60443 100644
--- a/ds9/ds9.ini
+++ b/ds9/ds9.ini
@@ -19,13 +19,13 @@ build :
     gcc >=4.6 [osx]
     #
 run : 
-	#
+    #
 
 [test]
 imports : 
-	
+    
 commands : 
-	
+    
 
 [cbc_build]
 linux : 
@@ -53,5 +53,5 @@ linux :
     cp -a bin/ds9* bin/x* $$PREFIX/bin
 windows : 
     exit 1
-	if errorlevel 1 exit 1
+    if errorlevel 1 exit 1
 
diff --git a/ext_shmht/ext_shmht.ini b/ext_shmht/ext_shmht.ini
index 20a27fb..eedb8ed 100644
--- a/ext_shmht/ext_shmht.ini
+++ b/ext_shmht/ext_shmht.ini
@@ -17,11 +17,11 @@ number: 0
 [requirements]
 build:
     setuptools
-    python
+    python x.x
 
 run:
     six
-    python
+    python x.x
 
 [test]
 imports:
diff --git a/fitsblender/fitsblender.ini b/fitsblender/fitsblender.ini
index d77b85e..3214777 100644
--- a/fitsblender/fitsblender.ini
+++ b/fitsblender/fitsblender.ini
@@ -16,34 +16,38 @@ number : 0
 
 [requirements]
 build : 
-	d2to1
-	stsci.distutils
+    astropy >=1.1
+    d2to1
+    stsci.distutils
     stsci.tools
-	setuptools
-	python
+    setuptools
+    numpy x.x
+    python x.x
 run : 
-	stsci.tools
-	python
+    astropy >=1.1
+    stsci.tools
+    numpy x.x
+    python x.x
 
 [test]
 imports : 
-	fitsblender
+    fitsblender
 commands : 
     #fitsblender --help
-	
+    
 
 [cbc_build]
 linux : 
-	#d2to1 hack active
-	pip install --no-deps --upgrade --force d2to1 || exit 1
-	    
-	python setup.py install || exit 1
+    #d2to1 hack active
+    pip install --no-deps --upgrade --force d2to1 || exit 1
+        
+    python setup.py install || exit 1
 
 windows : 
-	# d2to1 hack active
-	pip install --no-deps --upgrade --force d2to1
-	if errorlevel 1 exit 1
-	    
-	python setup.py install
-	if errorlevel 1 exit 1
+    # d2to1 hack active
+    pip install --no-deps --upgrade --force d2to1
+    if errorlevel 1 exit 1
+        
+    python setup.py install
+    if errorlevel 1 exit 1
 
diff --git a/gcc-4.6/gcc-4.6.ini b/gcc-4.6/gcc-4.6.ini
index c3f62ad..0c1afe6 100644
--- a/gcc-4.6/gcc-4.6.ini
+++ b/gcc-4.6/gcc-4.6.ini
@@ -36,12 +36,12 @@ run :
 #    mpfr >=2.3.1
 #    mpc >=0.8.0
 #    ppl >=0.11,<1
-	
+    
 [test]
 imports : 
-	
+    
 commands : 
-	
+    
 
 [cbc_build]
 linux : 
@@ -56,4 +56,4 @@ linux :
     make install
 
 windows : 
-	echo "Not supported."
+    echo "Not supported."
diff --git a/ginga/ginga.ini b/ginga/ginga.ini
index b521f49..19303f5 100644
--- a/ginga/ginga.ini
+++ b/ginga/ginga.ini
@@ -17,13 +17,13 @@ number: 0
 
 [requirements]
 build:
-    numpy
+    numpy x.x
     setuptools
-    python
+    python x.x
 
 run:
-    numpy
-    python
+    numpy x.x
+    python x.x
 
 [test]
 commands:
diff --git a/hstcal/hstcal.ini b/hstcal/hstcal.ini
index 8a254f2..da6d8e9 100644
--- a/hstcal/hstcal.ini
+++ b/hstcal/hstcal.ini
@@ -22,9 +22,9 @@ run :
 
 [test]
 imports : 
-	
+    
 commands : 
-	
+    
 
 [cbc_build]
 linux : 
diff --git a/htc_utils/htc_utils.ini b/htc_utils/htc_utils.ini
index 7769a75..eb4bf36 100644
--- a/htc_utils/htc_utils.ini
+++ b/htc_utils/htc_utils.ini
@@ -19,10 +19,10 @@ number: 0
 build:
     argparse [py26]
     setuptools
-    python
+    python x.x
 run:
     argparse [py26]
-    python
+    python x.x
 
 [test]
 imports:
diff --git a/imexam/imexam.ini b/imexam/imexam.ini
index bd6beee..aba8c1a 100644
--- a/imexam/imexam.ini
+++ b/imexam/imexam.ini
@@ -20,26 +20,26 @@ build:
     d2to1
     nose
     astropy >=1.1
-    numpy
+    numpy x.x
     scipy
     cython
     matplotlib
     ipython
     setuptools
     mock [py27]
-    python
+    python x.x
     
 run:
     d2to1
     nose
     astropy >=1.1
-    numpy
+    numpy x.x
     scipy
     cython
     matplotlib
     ipython
     mock [py27]
-    python
+    python x.x
 
 [test]
 imports:
diff --git a/jwst_lib/jwst_lib.ini b/jwst_lib/jwst_lib.ini
index c62975c..e8b9e1f 100644
--- a/jwst_lib/jwst_lib.ini
+++ b/jwst_lib/jwst_lib.ini
@@ -26,34 +26,34 @@ build :
     crds
     asdf
     stsci.distutils
-    numpy
-	setuptools
-	python
+    numpy x.x
+    setuptools
+    python x.x
 run : 
     asdf-standard
     astropy >=1.1
     crds
     asdf
-    numpy
-	python
+    numpy x.x
+    python x.x
 
 [test]
 imports : 
     jwst_lib
-	
+    
 commands : 
-	
+    
 
 [cbc_build]
 linux : 
     pip install --no-deps --force --upgrade d2to1
     for d in jwst_lib/*
     do
-	    ( cd $$d && python setup.py install || exit 1 )
+        ( cd $$d && python setup.py install || exit 1 )
     done
 
 windows : 
     echo "Unsupported (yet?)"
-	#python setup.py install
-	#if errorlevel 1 exit 1
+    #python setup.py install
+    #if errorlevel 1 exit 1
 
diff --git a/jwst_pipeline/jwst_pipeline.ini b/jwst_pipeline/jwst_pipeline.ini
index 376fd8d..37c9261 100644
--- a/jwst_pipeline/jwst_pipeline.ini
+++ b/jwst_pipeline/jwst_pipeline.ini
@@ -25,22 +25,22 @@ build :
     jwst_lib
     stsci.convolve
     stsci.distutils
-    numpy
-	setuptools
-	python
+    numpy x.x
+    setuptools
+    python x.x
 run : 
     astropy >=1.1
     jwst_lib
-    numpy
+    numpy x.x
     stsci.convolve
-	python
+    python x.x
 
 [test]
 imports : 
     jwst_pipeline
-	
+    
 commands : 
-	
+    
 
 [cbc_build]
 linux : 
@@ -51,11 +51,11 @@ linux :
 
     for d in jwst_pipeline/*
     do
-	    ( cd $$d && python setup.py install || exit 1 )
+        ( cd $$d && python setup.py install || exit 1 )
     done
 
 windows : 
     echo "Unsupported (yet?)"
-	#python setup.py install
-	#if errorlevel 1 exit 1
+    #python setup.py install
+    #if errorlevel 1 exit 1
 
diff --git a/jwst_tools/jwst_tools.ini b/jwst_tools/jwst_tools.ini
index c779997..78a1865 100644
--- a/jwst_tools/jwst_tools.ini
+++ b/jwst_tools/jwst_tools.ini
@@ -24,21 +24,21 @@ build :
     astropy >=1.1
     stsci.distutils
     stsci.tools
-    numpy
-	setuptools
-	python
+    numpy x.x
+    setuptools
+    python x.x
 run : 
     astropy >=1.1
-    numpy
+    numpy x.x
     stsci.tools
-	python
+    python x.x
 
 [test]
 imports : 
     jwst_tools
-	
+    
 commands : 
-	
+    
 
 [cbc_build]
 linux : 
@@ -49,11 +49,11 @@ linux :
 
     for d in jwst_tools/*
     do
-	    ( cd $$d && python setup.py install || exit 1 )
+        ( cd $$d && python setup.py install || exit 1 )
     done
 
 windows : 
     echo "Unsupported (yet?)"
-	#python setup.py install
-	#if errorlevel 1 exit 1
+    #python setup.py install
+    #if errorlevel 1 exit 1
 
diff --git a/lapack/lapack.ini b/lapack/lapack.ini
index 8b9abae..e44e635 100644
--- a/lapack/lapack.ini
+++ b/lapack/lapack.ini
@@ -20,16 +20,16 @@ build :
 
 [test]
 imports : 
-	
+    
 commands : 
-	
+    
 
 [cbc_build]
 linux : 
-	
-	mkdir BUILD_DIR
-	cd BUILD_DIR
-	cmake \
+    
+    mkdir BUILD_DIR
+    cd BUILD_DIR
+    cmake \
         -DCMAKE_INSTALL_PREFIX=$$PREFIX \
         -DBUILD_TESTING=OFF \
         -DBUILD_SHARED_LIBS=ON \
@@ -40,10 +40,10 @@ linux :
     make install
 
 windows : 
-	
-	mkdir BUILD_DIR
-	cd BUILD_DIR
-	cmake -DCMAKE_INSTALL_PREFIX=%PREFIX% 
+    
+    mkdir BUILD_DIR
+    cd BUILD_DIR
+    cmake -DCMAKE_INSTALL_PREFIX=%PREFIX% 
     # There's PROBABLY more to this on windows
     make
     make install
diff --git a/linecache2/linecache2.ini b/linecache2/linecache2.ini
index 449f9b5..e72ba0a 100644
--- a/linecache2/linecache2.ini
+++ b/linecache2/linecache2.ini
@@ -18,25 +18,25 @@ number : 0
 [requirements]
 build : 
     pbr
-	setuptools
-	python
+    setuptools
+    python x.x
 
 run : 
     pbr
-	python
+    python x.x
 
 [test]
 imports : 
-	linecache2
-	
+    linecache2
+    
 commands : 
 
 [cbc_build]
 linux : 
     find . -name "inspect_fodder2.py" -delete
-	python setup.py install || exit 1
+    python setup.py install || exit 1
 
 windows : 
-	python setup.py install
-	if errorlevel 1 exit 1
+    python setup.py install
+    if errorlevel 1 exit 1
 
diff --git a/mechanize/mechanize.ini b/mechanize/mechanize.ini
index ccf9fd5..f799b5d 100644
--- a/mechanize/mechanize.ini
+++ b/mechanize/mechanize.ini
@@ -17,23 +17,23 @@ number : 0
 
 [requirements]
 build : 
-	setuptools
-	python
+    setuptools
+    python x.x
 
 run : 
-	python
+    python x.x
 
 [test]
 imports : 
-	mechanize
-	
+    mechanize
+    
 commands : 
 
 [cbc_build]
 linux : 
-	python setup.py install || exit 1
+    python setup.py install || exit 1
 
 windows : 
-	python setup.py install
-	if errorlevel 1 exit 1
+    python setup.py install
+    if errorlevel 1 exit 1
 
diff --git a/nictools/nictools.ini b/nictools/nictools.ini
index 91e5abd..0dd43e7 100644
--- a/nictools/nictools.ini
+++ b/nictools/nictools.ini
@@ -17,18 +17,18 @@ number : 0
 [requirements]
 build : 
     astropy >=1.1
-    numpy
+    numpy x.x
     scipy
     stsci.distutils
     stsci.tools
     setuptools
-    python
+    python x.x
 run :
     astropy >=1.1
-    numpy
+    numpy x.x
     scipy
     stsci.tools
-    python
+    python x.x
 
 [test]
 imports : 
diff --git a/pandeia-thirdparty/pandeia-thirdparty.ini b/pandeia-thirdparty/pandeia-thirdparty.ini
index 8c24210..9ab8d2a 100644
--- a/pandeia-thirdparty/pandeia-thirdparty.ini
+++ b/pandeia-thirdparty/pandeia-thirdparty.ini
@@ -42,12 +42,12 @@ run :
     jupyter
     jupyter_client
     ipython-notebook
-    python
+    python x.x
     
 [test]
 imports : 
     # Nothing to test
-	
+    
 
 [cbc_build]
 linux : 
diff --git a/pandeia.engine/pandeia.engine.ini b/pandeia.engine/pandeia.engine.ini
index c4cdbeb..d60da13 100644
--- a/pandeia.engine/pandeia.engine.ini
+++ b/pandeia.engine/pandeia.engine.ini
@@ -23,11 +23,11 @@ build :
     stsci.distutils
     tornado
     setuptools
-    python
+    python x.x
 
 run : 
     tornado
-    python
+    python x.x
 
 [test]
 imports : 
diff --git a/pandeia_data/pandeia_data.ini b/pandeia_data/pandeia_data.ini
index bd978c6..bc59686 100644
--- a/pandeia_data/pandeia_data.ini
+++ b/pandeia_data/pandeia_data.ini
@@ -20,11 +20,11 @@ preserve_egg_dir : yes
 [requirements]
 build : 
     setuptools
-    python
+    python x.x
 
 run : 
     pandeia
-    python
+    python x.x
 
 [test]
 imports : 
diff --git a/pandokia/pandokia.ini b/pandokia/pandokia.ini
index bf6de2b..33e5faf 100644
--- a/pandokia/pandokia.ini
+++ b/pandokia/pandokia.ini
@@ -22,13 +22,13 @@ build :
     pytest
     shunit2
     setuptools
-    python
+    python x.x
 
 run : 
     nose
     shunit2
     pytest
-    python
+    python x.x
 
 [test]
 imports : 
diff --git a/parsley/parsley.ini b/parsley/parsley.ini
index fa12aa5..64e7a63 100644
--- a/parsley/parsley.ini
+++ b/parsley/parsley.ini
@@ -17,24 +17,24 @@ number : 0
 
 [requirements]
 build : 
-	
-	setuptools
-	python
+    
+    setuptools
+    python x.x
 run : 
-	
-	python
+    
+    python x.x
 
 [test]
 imports : 
-	parsley
+    parsley
 
 commands : 
 
 [cbc_build]
 linux : 
-	python setup.py install || exit 1
+    python setup.py install || exit 1
 
 windows : 
-	python setup.py install
-	if errorlevel 1 exit 1
+    python setup.py install
+    if errorlevel 1 exit 1
 
diff --git a/photutils/photutils.ini b/photutils/photutils.ini
index a4805d7..eebb7c4 100644
--- a/photutils/photutils.ini
+++ b/photutils/photutils.ini
@@ -20,14 +20,22 @@ build:
     nose
     astropy >=1.1
     cython
+    matplotlib
+    numpy x.x
+    scikit-learn
+    scipy
     setuptools
-    python
+    python x.x
     
 run:
     astropy >=1.1
     cython
+    matplotlib
+    numpy x.x
+    scikit-learn
+    scipy
     setuptools
-    python
+    python x.x
 
 [test]
 imports:
diff --git a/poppy/poppy.ini b/poppy/poppy.ini
index 939c801..2a0a14d 100644
--- a/poppy/poppy.ini
+++ b/poppy/poppy.ini
@@ -18,26 +18,26 @@ number: 0
 build:
     nose
     astropy >=1.1
-    numpy
+    numpy x.x
     scipy
     matplotlib
     six [py27]
     mock [py27]
     enum34 [py27]
     setuptools
-    python
+    python x.x
     
 run:
     nose
     astropy >=1.1
-    numpy
+    numpy x.x
     scipy
     matplotlib
     six [py27]
     mock [py27]
     enum34 [py27]
     setuptools
-    python
+    python x.x
 
 [test]
 imports:
diff --git a/purge_path/purge_path.ini b/purge_path/purge_path.ini
index 1454a51..3a51a3d 100644
--- a/purge_path/purge_path.ini
+++ b/purge_path/purge_path.ini
@@ -16,10 +16,10 @@ number: 0
 
 [requirements]
 build:
-    python
+    python x.x
     setuptools
 run:
-    python
+    python x.x
 
 
 [cbc_build]
diff --git a/pyds9/pyds9.ini b/pyds9/pyds9.ini
index 13e6307..83e08d5 100644
--- a/pyds9/pyds9.ini
+++ b/pyds9/pyds9.ini
@@ -20,13 +20,15 @@ build :
     ds9
     six
     setuptools
-    python
+    numpy x.x
+    python x.x
 
 run : 
     xpa
     ds9
     six
-    python
+    numpy x.x
+    python x.x
 
 [test]
 imports : 
diff --git a/pyfftw/pyfftw.ini b/pyfftw/pyfftw.ini
index dcf17ed..2bf3092 100644
--- a/pyfftw/pyfftw.ini
+++ b/pyfftw/pyfftw.ini
@@ -22,11 +22,11 @@ build :
     cython
     pkg-config [osx]
     setuptools
-    python
+    python x.x
 run :
     numpy >=1.9
     fftw
-    python
+    python x.x
 
 [test]
 imports:
diff --git a/pyneb/pyneb.ini b/pyneb/pyneb.ini
index 6e91048..ec6bbd8 100644
--- a/pyneb/pyneb.ini
+++ b/pyneb/pyneb.ini
@@ -21,14 +21,14 @@ build :
     numpy >=1.5.1
     scipy
     setuptools
-    python
+    python x.x
 
 run : 
     astropy
     matplotlib
     numpy >=1.5.1
     scipy
-    python
+    python x.x
 
 [test]
 imports : 
diff --git a/pyqtgraph/pyqtgraph.ini b/pyqtgraph/pyqtgraph.ini
index d3057d7..444c618 100644
--- a/pyqtgraph/pyqtgraph.ini
+++ b/pyqtgraph/pyqtgraph.ini
@@ -19,13 +19,13 @@ number: 0
 [requirements]
 build:
     setuptools
-    python
+    python x.x
 
 run:
     pyqt
     pyopengl
-    numpy
-    python
+    numpy x.x
+    python x.x
 
 [test]
 imports:
diff --git a/pyraf/pyraf.ini b/pyraf/pyraf.ini
index 373072e..3900b98 100644
--- a/pyraf/pyraf.ini
+++ b/pyraf/pyraf.ini
@@ -9,48 +9,52 @@ summary : ${package:name}
 
 [source]
 git_url: ${about:home}
-git_tag: 
+git_tag: ${package:version}
 
 [build]
 number : 0
 
 [requirements]
 build : 
-	d2to1
+    d2to1
     astropy >=1.1
+    ipython
     #pyobjc-core [osx]
     #pyobjc-cocoa [osx]
     #pyobjc-quartz [osx]
     stsci.distutils
     stsci.tools
-	setuptools
-	python
+    setuptools
+    numpy x.x
+    python x.x
 run : 
     astropy >=1.1
+    ipython
     #pyobjc-core [osx]
     #pyobjc-cocoa [osx]
     #pyobjc-quartz [osx]
     stsci.distutils
     stsci.tools
-	python
+    numpy x.x
+    python x.x
 
 [test]
 imports : 
-	
+    
 commands : 
-	pyraf --help
+    pyraf --help
 
 [cbc_build]
 linux : 
-	#d2to1 hack active
-	pip install --no-deps --upgrade --force d2to1 || exit 1
-	    
-	python setup.py install || exit 1
+    #d2to1 hack active
+    pip install --no-deps --upgrade --force d2to1 || exit 1
+        
+    python setup.py install || exit 1
 windows : 
-	# d2to1 hack active
-	pip install --no-deps --upgrade --force d2to1
-	if errorlevel 1 exit 1
-	    
-	python setup.py install
-	if errorlevel 1 exit 1
+    # d2to1 hack active
+    pip install --no-deps --upgrade --force d2to1
+    if errorlevel 1 exit 1
+        
+    python setup.py install
+    if errorlevel 1 exit 1
 
diff --git a/pyregion/pyregion.ini b/pyregion/pyregion.ini
index 91428be..1cce25a 100644
--- a/pyregion/pyregion.ini
+++ b/pyregion/pyregion.ini
@@ -17,15 +17,15 @@ number: 0
 [requirements]
 build:
     d2to1
-    numpy
+    numpy x.x
     pyparsing
-    python
+    python x.x
     setuptools
 run:
-    numpy
+    numpy x.x
     pyparsing
     setuptools
-    python
+    python x.x
 
 [test]
 imports:
diff --git a/pysynphot/pysynphot.ini b/pysynphot/pysynphot.ini
index a96212e..3a09abe 100644
--- a/pysynphot/pysynphot.ini
+++ b/pysynphot/pysynphot.ini
@@ -22,18 +22,18 @@ build:
     stsci.distutils
     astropy >=1.1
     cython
-    numpy
+    numpy x.x
     matplotlib
     setuptools
-    python
+    python x.x
 
 run:
     nose
     astropy >=1.1
     cython
-    numpy
+    numpy x.x
     matplotlib
-    python
+    python x.x
 
 [test]
 imports:
diff --git a/python-daemon/python-daemon.ini b/python-daemon/python-daemon.ini
index 7a48174..c1ca819 100644
--- a/python-daemon/python-daemon.ini
+++ b/python-daemon/python-daemon.ini
@@ -19,10 +19,10 @@ number: 0
 build:
     docutils
     lockfile
-    python
+    python x.x
 run:
     lockfile
-    python
+    python x.x
 
 [cbc_build]
 linux:
diff --git a/pytools/pytools.ini b/pytools/pytools.ini
index 0fc29c8..7ed9a8f 100644
--- a/pytools/pytools.ini
+++ b/pytools/pytools.ini
@@ -17,32 +17,32 @@ number : 0
 
 [requirements]
 build : 
-	decorator >=3.2.0
+    decorator >=3.2.0
     appdirs >=1.4.0
     six >=1.8.0
     numpy >=1.6.0
-	setuptools
-	python
+    setuptools
+    python x.x
 
 run : 
-	decorator >=3.2.0
+    decorator >=3.2.0
     appdirs >=1.4.0
     six >=1.8.0
     numpy >=1.6.0
-	python
+    python x.x
 
 [test]
 imports : 
     pytools
-	
+    
 commands : 
-	# none
+    # none
 
 [cbc_build]
 linux : 
-	python setup.py install || exit 1
+    python setup.py install || exit 1
 
 windows : 
-	python setup.py install
-	if errorlevel 1 exit 1
+    python setup.py install
+    if errorlevel 1 exit 1
 
diff --git a/pywcs/pywcs.ini b/pywcs/pywcs.ini
index e74918c..19fb6d1 100644
--- a/pywcs/pywcs.ini
+++ b/pywcs/pywcs.ini
@@ -19,13 +19,13 @@ build:
     d2to1
     stsci.distutils
     stsci.tools
-    numpy
+    numpy x.x
     setuptools
-    python
+    python x.x
 run:
     stsci.tools
-    numpy
-    python
+    numpy x.x
+    python x.x
 
 [test]
 imports:
diff --git a/reftools/reftools.ini b/reftools/reftools.ini
index 98cd464..28ad330 100644
--- a/reftools/reftools.ini
+++ b/reftools/reftools.ini
@@ -26,9 +26,9 @@ build:
     stwcs
     calcos
     scipy
-    numpy
+    numpy x.x
     setuptools
-    python
+    python x.x
 run:
     stsci.imagestats
     stsci.tools
@@ -37,8 +37,8 @@ run:
     stwcs
     calcos
     scipy
-    numpy
-    python
+    numpy x.x
+    python x.x
 
 [test]
 imports:
diff --git a/selenium/selenium.ini b/selenium/selenium.ini
index 3a14f32..ea64fe5 100644
--- a/selenium/selenium.ini
+++ b/selenium/selenium.ini
@@ -17,23 +17,23 @@ number : 0
 
 [requirements]
 build : 
-	setuptools
-	python
+    setuptools
+    python x.x
 
 run : 
-	python
+    python x.x
 
 [test]
 imports : 
-	selenium
+    selenium
 
 commands : 
 
 [cbc_build]
 linux : 
-	python setup.py install || exit 1
+    python setup.py install || exit 1
 
 windows : 
-	python setup.py install
-	if errorlevel 1 exit 1
+    python setup.py install
+    if errorlevel 1 exit 1
 
diff --git a/specview/specview.ini b/specview/specview.ini
index 620ece1..8e78b53 100644
--- a/specview/specview.ini
+++ b/specview/specview.ini
@@ -18,18 +18,18 @@ number: 0
 [requirements]
 build:
     astropy >=1.1
-    numpy
+    numpy x.x
     scipy
     pyqtgraph
     setuptools
-    python
+    python x.x
 
 run:
     astropy >=1.1
-    numpy
+    numpy x.x
     scipy
     pyqtgraph
-    python
+    python x.x
 
 [test]
 imports:
diff --git a/sphinx_rtd_theme/sphinx_rtd_theme.ini b/sphinx_rtd_theme/sphinx_rtd_theme.ini
index 92bfef5..655c429 100644
--- a/sphinx_rtd_theme/sphinx_rtd_theme.ini
+++ b/sphinx_rtd_theme/sphinx_rtd_theme.ini
@@ -18,24 +18,24 @@ number : 0
 [requirements]
 build : 
     sphinx
-	setuptools
-	python
-	
+    setuptools
+    python x.x
+    
 run : 
     sphinx
-	python
+    python x.x
 
 [test]
 imports : 
-	sphinx_rtd_theme
-	
+    sphinx_rtd_theme
+    
 commands : 
 
 [cbc_build]
 linux : 
-	python setup.py install || exit 1
+    python setup.py install || exit 1
 
 windows : 
-	python setup.py install
-	if errorlevel 1 exit 1
+    python setup.py install
+    if errorlevel 1 exit 1
 
diff --git a/sphinxcontrib-programoutput/sphinxcontrib-programoutput.ini b/sphinxcontrib-programoutput/sphinxcontrib-programoutput.ini
index 2c699ee..218d156 100644
--- a/sphinxcontrib-programoutput/sphinxcontrib-programoutput.ini
+++ b/sphinxcontrib-programoutput/sphinxcontrib-programoutput.ini
@@ -18,24 +18,24 @@ number : 0
 [requirements]
 build : 
     sphinx
-	setuptools
-	python
-	
+    setuptools
+    python x.x
+    
 run : 
     sphinx
-	python
+    python x.x
 
 [test]
 imports : 
     # can't test this
-	
+    
 commands : 
 
 [cbc_build]
 linux : 
-	python setup.py install || exit 1
+    python setup.py install || exit 1
 
 windows : 
-	python setup.py install
-	if errorlevel 1 exit 1
+    python setup.py install
+    if errorlevel 1 exit 1
 
diff --git a/stginga/stginga.ini b/stginga/stginga.ini
index b4e977f..308fa36 100644
--- a/stginga/stginga.ini
+++ b/stginga/stginga.ini
@@ -20,17 +20,17 @@ number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 build:
     ginga
     astropy >=1.1
-    numpy
+    numpy x.x
     scipy
     setuptools
-    python
+    python x.x
 
 run:
     ginga
     astropy >=1.1
-    numpy
+    numpy x.x
     scipy
-    python
+    python x.x
 
 [test]
 imports:
diff --git a/stistools/stistools.ini b/stistools/stistools.ini
index e5cae11..d798db2 100644
--- a/stistools/stistools.ini
+++ b/stistools/stistools.ini
@@ -22,12 +22,14 @@ build:
     stsci.distutils
     stsci.tools
     setuptools
-    python
+    numpy x.x
+    python x.x
 run:
     astropy >=1.1
     scipy
     stsci.tools
-    python
+    numpy x.x
+    python x.x
 
 [test]
 imports:
diff --git a/stsci-data-analysis/stsci-data-analysis.ini b/stsci-data-analysis/stsci-data-analysis.ini
index d211ed8..9e2ee21 100644
--- a/stsci-data-analysis/stsci-data-analysis.ini
+++ b/stsci-data-analysis/stsci-data-analysis.ini
@@ -33,7 +33,7 @@ run :
 imports : 
 
 commands : 
-	
+    
 
 [cbc_build]
 linux : 
diff --git a/stsci-hst/stsci-hst.ini b/stsci-hst/stsci-hst.ini
index c2b6061..0d7819e 100644
--- a/stsci-hst/stsci-hst.ini
+++ b/stsci-hst/stsci-hst.ini
@@ -59,9 +59,9 @@ run :
 
 [test]
 imports : 
-	
+    
 commands : 
-	
+    
 
 [cbc_build]
 linux : 
diff --git a/stsci.convolve/stsci.convolve.ini b/stsci.convolve/stsci.convolve.ini
index d72e9a0..313cd90 100644
--- a/stsci.convolve/stsci.convolve.ini
+++ b/stsci.convolve/stsci.convolve.ini
@@ -20,12 +20,12 @@ preserve_egg_dir: yes
 build:
     d2to1
     stsci.distutils
-    numpy
-    python
+    numpy x.x
+    python x.x
 
 run:
-    numpy
-    python
+    numpy x.x
+    python x.x
 
 [test]
 imports:
diff --git a/stsci.distutils/stsci.distutils.ini b/stsci.distutils/stsci.distutils.ini
index 69b544d..ac91d12 100644
--- a/stsci.distutils/stsci.distutils.ini
+++ b/stsci.distutils/stsci.distutils.ini
@@ -18,10 +18,12 @@ number: 0
 build:
     d2to1
     setuptools
-    python
+    numpy x.x
+    python x.x
 run:
     nose
-    python
+    numpy x.x
+    python x.x
 
 [test]
 imports:
diff --git a/stsci.image/stsci.image.ini b/stsci.image/stsci.image.ini
index da341d3..3e218a7 100644
--- a/stsci.image/stsci.image.ini
+++ b/stsci.image/stsci.image.ini
@@ -21,19 +21,19 @@ preserve_egg_dir: yes
 build:
     d2to1
     astropy >=1.1
-    numpy
+    numpy x.x
     scipy
     stsci.distutils
     stsci.tools
     setuptools
-    python
+    python x.x
 
 run:
     astropy >=1.1
-    numpy
+    numpy x.x
     scipy
     stsci.tools
-    python
+    python x.x
 
 [test]
 imports:
diff --git a/stsci.imagemanip/stsci.imagemanip.ini b/stsci.imagemanip/stsci.imagemanip.ini
index 9cb41ac..ca5d47b 100644
--- a/stsci.imagemanip/stsci.imagemanip.ini
+++ b/stsci.imagemanip/stsci.imagemanip.ini
@@ -19,16 +19,16 @@ preserve_egg_dir: yes
 [requirements]
 build:
     d2to1
-    numpy
+    numpy x.x
     stsci.distutils
     stsci.tools
     setuptools
-    python
+    python x.x
 
 run:
-    numpy
+    numpy x.x
     stsci.tools
-    python
+    python x.x
 
 [test]
 imports:
diff --git a/stsci.imagestats/stsci.imagestats.ini b/stsci.imagestats/stsci.imagestats.ini
index 191d65e..2a05887 100644
--- a/stsci.imagestats/stsci.imagestats.ini
+++ b/stsci.imagestats/stsci.imagestats.ini
@@ -22,12 +22,12 @@ build:
     d2to1
     stsci.distutils
     setuptools
-    numpy
-    python
+    numpy x.x
+    python x.x
 
 run:
-    numpy
-    python
+    numpy x.x
+    python x.x
 
 [test]
 imports:
diff --git a/stsci.ndimage/stsci.ndimage.ini b/stsci.ndimage/stsci.ndimage.ini
index 33f74d9..919d578 100644
--- a/stsci.ndimage/stsci.ndimage.ini
+++ b/stsci.ndimage/stsci.ndimage.ini
@@ -22,13 +22,13 @@ build:
     stsci.distutils
     setuptools
     astropy >=1.1
-    numpy
-    python
+    numpy x.x
+    python x.x
 
 run:
     astropy >=1.1
-    numpy
-    python
+    numpy x.x
+    python x.x
 
 [test]
 imports:
diff --git a/stsci.numdisplay/stsci.numdisplay.ini b/stsci.numdisplay/stsci.numdisplay.ini
index 7545a92..7b0ad23 100644
--- a/stsci.numdisplay/stsci.numdisplay.ini
+++ b/stsci.numdisplay/stsci.numdisplay.ini
@@ -20,15 +20,15 @@ preserve_egg_dir: yes
 [requirements]
 build:
     d2to1
-    numpy
+    numpy x.x
     stsci.tools
     setuptools
-    python
+    python x.x
 
 run:
-    numpy
+    numpy x.x
     stsci.tools
-    python
+    python x.x
 
 [test]
 imports:
diff --git a/stsci.skypac/stsci.skypac.ini b/stsci.skypac/stsci.skypac.ini
index 9e487c5..60e9e4e 100644
--- a/stsci.skypac/stsci.skypac.ini
+++ b/stsci.skypac/stsci.skypac.ini
@@ -9,7 +9,7 @@ summary : ${package:name}
 
 [source]
 git_url : ${about:home}
-git_tag: 
+git_tag: 0.9
 
 [build]
 number : 0
@@ -23,22 +23,24 @@ build :
     stsci.sphere
     stsci.tools
     stwcs
-	setuptools
-	python
+    setuptools
+    numpy x.x
+    python x.x
 run : 
     astropy >=1.1
     stsci.imagestats
     stsci.sphere
     stsci.tools
     stwcs
-	python
+    python x.x
+    python x.x
 
 [test]
 imports : 
     stsci.skypac
-	
+    
 commands : 
-	
+    
 
 [cbc_build]
 linux : 
@@ -63,12 +65,12 @@ linux :
     set_py3k
 
 
-	pip install --no-deps --upgrade --force d2to1
+    pip install --no-deps --upgrade --force d2to1
     if [ $$PY3K -ne 0 ] ; then
         sed -i -e "s|stsci.distutils.hooks.tag_svn_revision|#removed|" setup.cfg 
         2to3 -w .
     fi
-	python setup.py install || exit 1
+    python setup.py install || exit 1
 
 windows : 
     python setup.py install
diff --git a/stsci.sphere/stsci.sphere.ini b/stsci.sphere/stsci.sphere.ini
index 6837ce2..df6e04c 100644
--- a/stsci.sphere/stsci.sphere.ini
+++ b/stsci.sphere/stsci.sphere.ini
@@ -21,16 +21,16 @@ build:
     d2to1
     astropy >=1.1
     matplotlib
-    numpy
+    numpy x.x
     setuptools
     stsci.distutils
-    python
+    python x.x
 
 run:
     astropy >=1.1
     matplotlib
-    numpy
-    python
+    numpy x.x
+    python x.x
 
 [test]
 imports:
diff --git a/stsci.sphinxext/stsci.sphinxext.ini b/stsci.sphinxext/stsci.sphinxext.ini
index a9f49ba..d28fc0e 100644
--- a/stsci.sphinxext/stsci.sphinxext.ini
+++ b/stsci.sphinxext/stsci.sphinxext.ini
@@ -20,13 +20,15 @@ preserve_egg_dir: yes
 [requirements]
 build:
     d2to1
+    numpydoc
     stsci.distutils
     setuptools
-    python
+    python x.x
 
 run:
+    numpydoc
     stsci.distutils
-    python
+    python x.x
 
 [test]
 imports:
diff --git a/stsci.stimage/stsci.stimage.ini b/stsci.stimage/stsci.stimage.ini
index d59bd65..367e118 100644
--- a/stsci.stimage/stsci.stimage.ini
+++ b/stsci.stimage/stsci.stimage.ini
@@ -19,14 +19,14 @@ preserve_egg_dir: yes
 [requirements]
 build:
     d2to1
-    numpy
+    numpy x.x
     stsci.distutils
     setuptools
-    python
+    python x.x
 
 run:
-    numpy
-    python
+    numpy x.x
+    python x.x
 
 [test]
 imports:
diff --git a/stsci.tools/stsci.tools.ini b/stsci.tools/stsci.tools.ini
index dba0cb8..3f93669 100644
--- a/stsci.tools/stsci.tools.ini
+++ b/stsci.tools/stsci.tools.ini
@@ -24,15 +24,15 @@ build:
     pytools
     setuptools
     stsci.distutils
-    numpy
-    python
+    numpy x.x
+    python x.x
 
 run:
     astropy >=1.1
-    numpy
+    numpy x.x
     pytools
     stsci.distutils
-    python
+    python x.x
 
 [test]
 imports:
diff --git a/stsci/stsci.ini b/stsci/stsci.ini
index 71fc728..58ca017 100644
--- a/stsci/stsci.ini
+++ b/stsci/stsci.ini
@@ -51,9 +51,9 @@ run :
 
 [test]
 imports : 
-	
+    
 commands : 
-	
+    
 
 [cbc_build]
 linux : 
diff --git a/stwcs/stwcs.ini b/stwcs/stwcs.ini
index 68a3d9e..08ad406 100644
--- a/stwcs/stwcs.ini
+++ b/stwcs/stwcs.ini
@@ -17,21 +17,23 @@ number : 0
 [requirements]
 build : 
     astropy >=1.1
-	stsci.distutils
+    stsci.distutils
     stsci.tools
-	setuptools
-	python
+    setuptools
+    numpy x.x
+    python x.x
 run : 
-	astropy >=1.1
+    astropy >=1.1
     stsci.tools
-	python
+    numpy x.x
+    python x.x
 
 [test]
 imports : 
     stwcs
-	
+    
 commands : 
-	
+    
 
 [cbc_build]
 linux : 
@@ -56,16 +58,16 @@ linux :
     set_py3k
 
 
-	pip install --no-deps --upgrade --force d2to1
+    pip install --no-deps --upgrade --force d2to1
 
     sed -i -e "s|use_2to3=True|use_2to3=False|" setup.py
     if [ $$PY3K -ne 0 ] ; then
         sed -i -e "s|stsci.distutils.hooks.tag_svn_revision|#removed|" setup.cfg 
     fi
 
-	python setup.py install || exit 1
+    python setup.py install || exit 1
 
 windows : 
-	python setup.py install
-	if errorlevel 1 exit 1
+    python setup.py install
+    if errorlevel 1 exit 1
 
diff --git a/threading2/threading2.ini b/threading2/threading2.ini
index 50d20fe..5a81737 100644
--- a/threading2/threading2.ini
+++ b/threading2/threading2.ini
@@ -17,23 +17,23 @@ number : 0
 
 [requirements]
 build : 
-	setuptools
-	python
+    setuptools
+    python x.x
 
 run : 
-	python
+    python x.x
 
 [test]
 imports : 
-	threading2
-	
+    threading2
+    
 commands : 
 
 [cbc_build]
 linux : 
-	python setup.py install || exit 1
+    python setup.py install || exit 1
 
 windows : 
-	python setup.py install
-	if errorlevel 1 exit 1
+    python setup.py install
+    if errorlevel 1 exit 1
 
diff --git a/traceback2/traceback2.ini b/traceback2/traceback2.ini
index 5afaaec..d6ddcec 100644
--- a/traceback2/traceback2.ini
+++ b/traceback2/traceback2.ini
@@ -20,26 +20,26 @@ build :
     pbr
     linecache2
     six
-	setuptools
-	python
+    setuptools
+    python x.x
 
 run : 
     pbr
     linecache2
     six
-	python
+    python x.x
 
 [test]
 imports : 
-	traceback2
-	
+    traceback2
+    
 commands : 
 
 [cbc_build]
 linux : 
-	python setup.py install || exit 1
+    python setup.py install || exit 1
 
 windows : 
-	python setup.py install
-	if errorlevel 1 exit 1
+    python setup.py install
+    if errorlevel 1 exit 1
 
diff --git a/webbpsf/webbpsf.ini b/webbpsf/webbpsf.ini
index 979ec9d..a4c8f00 100644
--- a/webbpsf/webbpsf.ini
+++ b/webbpsf/webbpsf.ini
@@ -19,26 +19,26 @@ preserve_egg_dir: True
 build:
     nose
     astropy >=1.1
-    numpy
+    numpy x.x
     scipy
     matplotlib
     poppy
     six [py27]
     webbpsf-data ==0.4.0
     setuptools
-    python
+    python x.x
     
 run:
     nose
     astropy >=1.1
-    numpy
+    numpy x.x
     scipy
     matplotlib
     poppy
     six [py27]
     webbpsf-data ==0.4.0
     setuptools
-    python
+    python x.x
 
 [test]
 imports:
diff --git a/wfc3tools/wfc3tools.ini b/wfc3tools/wfc3tools.ini
index 85a2f85..893b114 100644
--- a/wfc3tools/wfc3tools.ini
+++ b/wfc3tools/wfc3tools.ini
@@ -16,42 +16,42 @@ number : 0
 
 [requirements]
 build : 
-	d2to1
-	stsci.distutils
-	stsci.tools
+    d2to1
+    stsci.distutils
+    stsci.tools
     astropy >=1.1
     matplotlib
-    numpy
+    numpy x.x
     scipy
-	setuptools
-	python
+    setuptools
+    python x.x
 run : 
-	stsci.tools
+    stsci.tools
     astropy >=1.1
     matplotlib
-    numpy
+    numpy x.x
     scipy
-	python
+    python x.x
 
 [test]
 imports : 
     wfc3tools
-	
+    
 commands : 
-	
+    
 
 [cbc_build]
 linux : 
-	#d2to1 hack active
-	pip install --no-deps --upgrade --force d2to1 || exit 1
-	    
-	python setup.py install || exit 1
+    #d2to1 hack active
+    pip install --no-deps --upgrade --force d2to1 || exit 1
+        
+    python setup.py install || exit 1
 
 windows : 
-	# d2to1 hack active
-	pip install --no-deps --upgrade --force d2to1
-	if errorlevel 1 exit 1
-	    
-	python setup.py install
-	if errorlevel 1 exit 1
+    # d2to1 hack active
+    pip install --no-deps --upgrade --force d2to1
+    if errorlevel 1 exit 1
+        
+    python setup.py install
+    if errorlevel 1 exit 1
 
diff --git a/wfpc2tools/wfpc2tools.ini b/wfpc2tools/wfpc2tools.ini
index 8c57bdd..46f5388 100644
--- a/wfpc2tools/wfpc2tools.ini
+++ b/wfpc2tools/wfpc2tools.ini
@@ -16,27 +16,29 @@ number : 0
 
 [requirements]
 build : 
-	d2to1
+    d2to1
     astropy >=1.1
     scipy
-	stsci.distutils
+    stsci.distutils
     stsci.imagestats
-	stsci.tools
-	setuptools
-	python
+    stsci.tools
+    setuptools
+    numpy x.x
+    python x.x
 run : 
     astropy >=1.1
     scipy
     stsci.imagestats
-	stsci.tools
-	python
+    stsci.tools
+    numpy x.x
+    python x.x
 
 [test]
 imports : 
     wfpc2tools
-	
+    
 commands : 
-	
+    
 
 [cbc_build]
 linux : 
@@ -60,22 +62,22 @@ linux :
 
     set_py3k
 
-	#d2to1 hack active
-	pip install --no-deps --upgrade --force d2to1 || exit 1
+    #d2to1 hack active
+    pip install --no-deps --upgrade --force d2to1 || exit 1
 
     echo "This doesn't work. Why conda why? --python 2.7 is useless here"
     if [ $$PY3K -ne 0 ] ; then
         sed -i -e "s|stsci.distutils.hooks.tag_svn_revision|#removed|" setup.cfg 
         2to3 -w .
     fi
-	    
-	python setup.py install || exit 1
+        
+    python setup.py install || exit 1
 
 windows : 
-	# d2to1 hack active
-	pip install --no-deps --upgrade --force d2to1
-	if errorlevel 1 exit 1
-	    
-	python setup.py install
-	if errorlevel 1 exit 1
+    # d2to1 hack active
+    pip install --no-deps --upgrade --force d2to1
+    if errorlevel 1 exit 1
+        
+    python setup.py install
+    if errorlevel 1 exit 1
 
diff --git a/ws4py/ws4py.ini b/ws4py/ws4py.ini
index b01afa8..c334183 100644
--- a/ws4py/ws4py.ini
+++ b/ws4py/ws4py.ini
@@ -17,23 +17,23 @@ number : 0
 
 [requirements]
 build : 
-	setuptools
-	python
+    setuptools
+    python x.x
 
 run : 
-	python
+    python x.x
 
 [test]
 imports : 
-	ws4py
-	
+    ws4py
+    
 commands : 
 
 [cbc_build]
 linux : 
-	python setup.py install || exit 1
+    python setup.py install || exit 1
 
 windows : 
-	python setup.py install
-	if errorlevel 1 exit 1
+    python setup.py install
+    if errorlevel 1 exit 1
 
diff --git a/xpa/xpa.ini b/xpa/xpa.ini
index f0e031e..3946d6c 100644
--- a/xpa/xpa.ini
+++ b/xpa/xpa.ini
@@ -16,10 +16,8 @@ number : 0
 
 [requirements]
 build : 
-    python
 
 run : 
-    python
 
 [test]
 imports : 
diff --git a/yolk/yolk.ini b/yolk/yolk.ini
index 4a2a3ae..94b97aa 100644
--- a/yolk/yolk.ini
+++ b/yolk/yolk.ini
@@ -17,24 +17,24 @@ number : 0
 
 [requirements]
 build : 
-	
-	setuptools
-	python
+    
+    setuptools
+    python x.x
 run : 
-	
-	python
+    
+    python x.x
 
 [test]
 imports : 
-	
+    
 commands : 
-	yolk
+    yolk
 
 [cbc_build]
 linux : 
-	python setup.py install || exit 1
+    python setup.py install || exit 1
 
 windows : 
-	python setup.py install
-	if errorlevel 1 exit 1
+    python setup.py install
+    if errorlevel 1 exit 1