Begin prepping for internal testing

63 files changed, 283 insertions, 327 deletions

diff --git a/acstools/acstools.ini b/acstools/acstools.ini
index ccdd831..7a9b7b4 100644
--- a/acstools/acstools.ini
+++ b/acstools/acstools.ini
@@ -1,6 +1,6 @@
 [package]
 name: acstools
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 2.0.0
 
 [about]
 home: http://www.stsci.edu/institute/software_hardware/pyraf/stsci_python
@@ -9,9 +9,10 @@ summary: ${package:name}
 
 [source]
 git_url: https://github.com/spacetelescope/${package:name}
+git_tag: ${package:version}
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 
 [requirements]
 build:
diff --git a/aprio/aprio.ini b/aprio/aprio.ini
index 4a2937d..2936cfc 100644
--- a/aprio/aprio.ini
+++ b/aprio/aprio.ini
@@ -1,6 +1,6 @@
 [package]
 name: aprio
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 1.0
 
 [about]
 home: http://bitbucket.org/jhunkeler/${package:name}
@@ -9,10 +9,11 @@ summary: ${package:name} is an automatic renice daemon.
 readme: README.md
 
 [source]
-git_url: https://bitbucket.org/jhunkeler/${package:name}.git
+git_url: https://bitbucket.org/jhunkeler/${package:name}
+git_tag: v${package:version}
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 
 [requirements]
 build:
diff --git a/asdf-standard/asdf-standard.ini b/asdf-standard/asdf-standard.ini
index fb811a2..57577b6 100644
--- a/asdf-standard/asdf-standard.ini
+++ b/asdf-standard/asdf-standard.ini
@@ -1,6 +1,6 @@
 [package]
 name: asdf-standard
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 1.0.0
 
 [about]
 home: https://github.com/spacetelescope/${package:name}
@@ -8,13 +8,11 @@ license: BSD
 summary: ${package:name}
 
 [source]
-#fn: ${package:name}-${package:version}.tar.gz
-#url: ${cbc_cgi:url}/${fn}
-git_url: ${about:home}.git
-#git_tag:
+git_url: ${about:home}
+git_tag: v${package:version}
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 
 [requirements]
 build:
diff --git a/asdf/asdf.ini b/asdf/asdf.ini
index b01dfeb..7b4c4ba 100644
--- a/asdf/asdf.ini
+++ b/asdf/asdf.ini
@@ -1,6 +1,6 @@
 [package]
 name: asdf
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 1.0.2
 
 [about]
 home: https://github.com/spacetelescope/pyasdf
@@ -9,9 +9,10 @@ summary: ${package:name}
 
 [source]
 git_url: ${about:home}
+git_tag: v${package:version}
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 
 [requirements]
 build:
diff --git a/astroimtools/astroimtools.ini b/astroimtools/astroimtools.ini
index 372c1b9..55db91e 100644
--- a/astroimtools/astroimtools.ini
+++ b/astroimtools/astroimtools.ini
@@ -1,6 +1,6 @@
 [package]
 name: astroimtools
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 0.1
 
 [about]
 home: https://github.com/spacetelescope/${package:name}
@@ -9,12 +9,11 @@ summary: ${package:name}
 readme: README.rst
 
 [source]
-#fn: ${package:name}-${package:version}.tar.gz
-#url: ${cbc_cgi:url}/${fn}
 git_url: ${about:home}
+git_tag: v${package:version}
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 
 [requirements]
 build:
diff --git a/astrolib.coords/astrolib.coords.ini b/astrolib.coords/astrolib.coords.ini
index c97a710..69cd261 100644
--- a/astrolib.coords/astrolib.coords.ini
+++ b/astrolib.coords/astrolib.coords.ini
@@ -1,17 +1,18 @@
 [package]
 name : astrolib.coords
-version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version : 0.39.6
 
 [about]
 home : https://github.com/spacetelescope/astrolib.coords.git
-license : 
+license : BSD
 summary : ${package:name}
 
 [source]
 git_url : ${about:home}/${fn}
+git_tag: ${package:version}
 
 [build]
-number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number : 0
 
 [requirements]
 build : 
@@ -32,6 +33,7 @@ imports :
 [cbc_build]
 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
 windows : 
 	
diff --git a/asv/asv.ini b/asv/asv.ini
index f9030d0..b8ee8a1 100644
--- a/asv/asv.ini
+++ b/asv/asv.ini
@@ -1,6 +1,6 @@
 [package]
 name: asv
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 0.1.1
 
 [about]
 home: https://github.com/spacetelescope/${package:name}
@@ -11,9 +11,10 @@ summary: ${package:name}
 #fn: ${package:name}-${package:version}.tar.gz
 #url: ${cbc_cgi:url}/${fn}
 git_url: ${about:home}
+git_tag: v${package:version}
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 
 [requirements]
 build:
diff --git a/calcos/calcos.ini b/calcos/calcos.ini
index 0b939d0..8abfaa6 100644
--- a/calcos/calcos.ini
+++ b/calcos/calcos.ini
@@ -1,20 +1,18 @@
 [package]
 name : calcos
-version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version : 3.1.3
 
 [about]
-home : https://github.com/spacetelescope/${package:name}.git
+home : https://github.com/spacetelescope/${package:name}
 license : 
 summary : ${package:name}
 
 [source]
-#fn : ${package:name}-${package:version}.tar.gz
-#url : ${about:home}/${fn}
 git_url : ${about:home}
-#git_tag : 
+git_tag: ${package:version}
 
 [build]
-number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number : 0
 
 [requirements]
 build : 
diff --git a/cbc-test-package/cbc_test_package.ini b/cbc-test-package/cbc_test_package.ini
index 37491e4..40e0890 100644
--- a/cbc-test-package/cbc_test_package.ini
+++ b/cbc-test-package/cbc_test_package.ini
@@ -1,36 +1,36 @@
-[package]

-name: cbc_test_package

-version: 1.0.0

-

-[about]

-home: http://example.com/${package:name}

-license: GPL

-summary: ${package:name} is a test package

-

-[source]

-fn: ${package:name}-${package:version}.tar.gz

-url: https://bitbucket.org/jhunkeler/cbc-recipes/downloads/${fn}

-

-[build]

-number: 1

-

-[requirements]

-build:

-    setuptools

-    python

-

-run:

-    python

-

-[test]

-imports:

-    cbc_test_package

-

-[cbc_build]

-linux:

-    python setup.py install || exit 1

-

-windows:

-    python setup.py install

-    if errorlevel 1 exit 1

-

+[package]
+name: cbc_test_package
+version: 1.0.0
+
+[about]
+home: http://example.com/${package:name}
+license: GPL
+summary: ${package:name} is a test package
+
+[source]
+fn: ${package:name}-${package:version}.tar.gz
+url: https://bitbucket.org/jhunkeler/cbc-recipes/downloads/${fn}
+
+[build]
+number: 0
+
+[requirements]
+build:
+    setuptools
+    python
+
+run:
+    python
+
+[test]
+imports:
+    cbc_test_package
+
+[cbc_build]
+linux:
+    python setup.py install || exit 1
+
+windows:
+    python setup.py install
+    if errorlevel 1 exit 1
+
diff --git a/costools/costools.ini b/costools/costools.ini
index 91b1a82..b5ef1ad 100644
--- a/costools/costools.ini
+++ b/costools/costools.ini
@@ -1,6 +1,6 @@
 [package]
 name: costools
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 1.2.1
 
 [about]
 home: http://www.stsci.edu/institute/software_hardware
@@ -9,9 +9,10 @@ summary: ${package:name}
 
 [source]
 git_url: https://github.com/spacetelescope/${package:name}
+git_tag: ${package:version}
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 
 [requirements]
 build:
diff --git a/crds/crds.ini b/crds/crds.ini
index 807c253..94626a9 100644
--- a/crds/crds.ini
+++ b/crds/crds.ini
@@ -1,6 +1,6 @@
 [package]
 name: crds
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}
 
 [about]
 home: http://www.stsci.edu/hst/observatory/crds/
@@ -8,7 +8,8 @@ license: AURA
 summary: ${package:name}
 
 [source]
-git_url: https://github.com/spacetelescope/${package:name}.git
+git_url: https://github.com/spacetelescope/${package:name}
+#git_tag: 
 
 [build]
 number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
diff --git a/cube-tools/cube-tools.ini b/cube-tools/cube-tools.ini
index 01da8ba..0a93383 100644
--- a/cube-tools/cube-tools.ini
+++ b/cube-tools/cube-tools.ini
@@ -1,6 +1,6 @@
 [package]
 name: cube-tools
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}
 
 [about]
 home: https://github.com/spacetelescope/${package:name}
@@ -8,9 +8,8 @@ license: BSD
 summary: ${package:name}
 
 [source]
-#fn: ${package:name}-${package:version}.tar.gz
-#url: ${cbc_cgi:url}/${fn}
 git_url: ${about:home}
+#git_tag: 
 
 [build]
 number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
diff --git a/d2to1/d2to1.ini b/d2to1/d2to1.ini
index 608518d..4fe7d21 100644
--- a/d2to1/d2to1.ini
+++ b/d2to1/d2to1.ini
@@ -1,6 +1,6 @@
 [package]
 name: d2to1
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 0.2.12
 
 [about]
 home: https://github.com/embray/${package:name}
@@ -8,11 +8,11 @@ license: GPL
 summary: ${package:name}
 
 [source]
-git_url: https://github.com/embray/${package:name}.git
-git_tag: 0.2.12
+git_url: https://github.com/embray/${package:name}
+git_tag: ${package:version}
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 
 [requirements]
 build:
diff --git a/drizzlepac/drizzlepac.ini b/drizzlepac/drizzlepac.ini
index 9d85ab2..78aa787 100644
--- a/drizzlepac/drizzlepac.ini
+++ b/drizzlepac/drizzlepac.ini
@@ -1,6 +1,6 @@
 [package]
 name: drizzlepac
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 2.1.3
 
 [about]
 home: http://www.stsci.edu/institute/software_hardware/pyraf/stsci_python
@@ -9,9 +9,10 @@ summary: ${package:name}
 
 [source]
 git_url: https://github.com/spacetelescope/${package:name}
+git_tag: ${package:version}
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 
 [requirements]
 build:
diff --git a/ext_shmht/ext_shmht.ini b/ext_shmht/ext_shmht.ini
index d6c0f8e..20a27fb 100644
--- a/ext_shmht/ext_shmht.ini
+++ b/ext_shmht/ext_shmht.ini
@@ -1,6 +1,6 @@
 [package]
 name: ext_shmht
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 0.1
 
 [about]
 home: https://github.com/stsci-ssb/${package:name}
@@ -8,12 +8,11 @@ license: BSD
 summary: ${package:name}
 
 [source]
-#fn: ${package:name}-${package:version}.tar.gz
-#url: ${cbc_cgi:url}/${fn}
 git_url: ${about:home}
+#git_tag: 
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 
 [requirements]
 build:
diff --git a/fftw/fftw.ini b/fftw/fftw.ini
index 6d9519f..2edc7e5 100644
--- a/fftw/fftw.ini
+++ b/fftw/fftw.ini
@@ -12,7 +12,7 @@ fn : ${package:name}-${package:version}.tar.gz
 url : ${about:home}/${fn}
 
 [build]
-number : 4
+number : 0
 
 [requirements]
 build :
diff --git a/fitsblender/fitsblender.ini b/fitsblender/fitsblender.ini
index 875db9d..d77b85e 100644
--- a/fitsblender/fitsblender.ini
+++ b/fitsblender/fitsblender.ini
@@ -1,6 +1,6 @@
 [package]
 name : fitsblender
-version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version : 0.2.6
 
 [about]
 home : http://github.com/spacetelescope/${package:name}
@@ -9,9 +9,10 @@ summary : ${package:name}
 
 [source]
 git_url : https://github.com/spacetelescope/${package:name}
+git_tag: ${package:version}
 
 [build]
-number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number : 0
 
 [requirements]
 build : 
diff --git a/hstcal/hstcal.ini b/hstcal/hstcal.ini
index 15de81b..8a254f2 100644
--- a/hstcal/hstcal.ini
+++ b/hstcal/hstcal.ini
@@ -1,20 +1,18 @@
 [package]
 name : hstcal
-version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version : 1.0.0
 
 [about]
-home : https://github.com/spacetelescope/${package:name}.git
+home : https://github.com/spacetelescope/${package:name}
 license : BSD
 summary : ${package:name}
 
 [source]
-#fn : ${package:name}-${package:version}.tar.gz
-#url : ${about:home}/${fn}
 git_url : ${about:home}
-#git_tag : 
+git_tag: ${package:version}
 
 [build]
-number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number : 0
 
 [requirements]
 build : 
diff --git a/htc_utils/htc_utils.ini b/htc_utils/htc_utils.ini
index 0e640ae..7769a75 100644
--- a/htc_utils/htc_utils.ini
+++ b/htc_utils/htc_utils.ini
@@ -1,6 +1,6 @@
 [package]
 name: htc_utils
-version: 1.0
+version: 0.1
 
 [about]
 home: http://bitbucket.org/jhunkeler/${package:name}
@@ -10,9 +10,10 @@ readme: README.md
 
 [source]
 git_url: https://bitbucket.org/jhunkeler/${package:name}
+#git_tag: ${package:version}
 
 [build]
-number: 2
+number: 0
 
 [requirements]
 build:
@@ -21,7 +22,6 @@ build:
     python
 run:
     argparse [py26]
-    setuptools
     python
 
 [test]
diff --git a/imexam/imexam.ini b/imexam/imexam.ini
index 15eb3a7..bd6beee 100644
--- a/imexam/imexam.ini
+++ b/imexam/imexam.ini
@@ -1,6 +1,6 @@
 [package]
 name: imexam
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 0.5.2
 
 [about]
 home: https://github.com/spacetelescope/${package:name}
@@ -9,12 +9,11 @@ summary: ${package:name}
 readme: README.rst
 
 [source]
-#fn: ${package:name}-${package:version}.tar.gz
-#url: ${cbc_cgi:url}/${fn}
 git_url: ${about:home}
+#git_tag: v${package:version}
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 
 [requirements]
 build:
diff --git a/iraf/iraf.ini b/iraf/iraf.ini
index a56730d..20ae588 100644
--- a/iraf/iraf.ini
+++ b/iraf/iraf.ini
@@ -14,6 +14,7 @@ url:
     http://ssb.stsci.edu/stripped/osx/${fn}   [osx]
 
 #git_url: ssh://git@bitbucket.org/jhunkeler/${package:name}-combined
+#git_tag: 
 
 [build]
 number: 12
diff --git a/jwst_lib/jwst_lib.ini b/jwst_lib/jwst_lib.ini
index b3680be..f3c564e 100644
--- a/jwst_lib/jwst_lib.ini
+++ b/jwst_lib/jwst_lib.ini
@@ -1,6 +1,6 @@
 [package]
 name : jwst_lib 
-version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }
 
 [about]
 # The JWST repo layout is different: One repo for many packages.
diff --git a/jwst_pipeline/jwst_pipeline.ini b/jwst_pipeline/jwst_pipeline.ini
index da48e32..6cfe3c6 100644
--- a/jwst_pipeline/jwst_pipeline.ini
+++ b/jwst_pipeline/jwst_pipeline.ini
@@ -1,6 +1,6 @@
 [package]
 name : jwst_pipeline
-version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }
 
 [about]
 # The JWST repo layout is different: One repo for many packages.
diff --git a/jwst_tools/jwst_tools.ini b/jwst_tools/jwst_tools.ini
index a9d57aa..bde24f9 100644
--- a/jwst_tools/jwst_tools.ini
+++ b/jwst_tools/jwst_tools.ini
@@ -1,6 +1,6 @@
 [package]
 name : jwst_tools
-version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }
 
 [about]
 # The JWST repo layout is different: One repo for many packages.
diff --git a/nictools/nictools.ini b/nictools/nictools.ini
index ea50fdb..91e5abd 100644
--- a/nictools/nictools.ini
+++ b/nictools/nictools.ini
@@ -1,6 +1,6 @@
 [package]
 name : nictools
-version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version : 1.1.3
 
 [about]
 home : https://github.com/spacetelescope/${package:name}
@@ -9,9 +9,10 @@ summary : ${package:name}
 
 [source]
 git_url : ${about:home}
+git_tag: ${package:version}
 
 [build]
-number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number : 0
 
 [requirements]
 build : 
diff --git a/pandeia.engine/pandeia.engine.ini b/pandeia.engine/pandeia.engine.ini
index 468d17b..c4cdbeb 100644
--- a/pandeia.engine/pandeia.engine.ini
+++ b/pandeia.engine/pandeia.engine.ini
@@ -1,6 +1,6 @@
 [package]
 name : pandeia-engine
-version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }
 
 [about]
 home : https://github.com:stsci-ssb/pandeia
diff --git a/pandeia_data/pandeia_data.ini b/pandeia_data/pandeia_data.ini
index a3ae279..bd978c6 100644
--- a/pandeia_data/pandeia_data.ini
+++ b/pandeia_data/pandeia_data.ini
@@ -1,6 +1,6 @@
 [package]
 name : pandeia_data
-version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }
 
 [about]
 home : https://github.com:stsci-ssb/pandeia_data
diff --git a/pandokia/pandokia.ini b/pandokia/pandokia.ini
index a48cb10..bf6de2b 100644
--- a/pandokia/pandokia.ini
+++ b/pandokia/pandokia.ini
@@ -1,6 +1,6 @@
 [package]
 name : pandokia
-version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version : 1.3.11
 
 [about]
 home : http://ssb.stsci.edu/testing/pandokia
@@ -10,7 +10,7 @@ summary : ${package:name}
 [source]
 #fn : ${package:name}-${package:version}.tar.gz
 #url : ${about:home}/${fn}
-git_url : git@github.com:spacetelescope/${package:name}.git
+git_url : git@github.com:spacetelescope/${package:name}
 #git_tag : 
 
 [build]
diff --git a/photutils/photutils.ini b/photutils/photutils.ini
index e510cdd..a4805d7 100644
--- a/photutils/photutils.ini
+++ b/photutils/photutils.ini
@@ -1,6 +1,6 @@
 [package]
 name: photutils
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 0.2.1
 
 [about]
 home: https://github.com/astropy/${package:name}
@@ -8,13 +8,11 @@ license: BSD
 summary: ${package:name}
 
 [source]
-#fn: ${package:name}-${package:version}.tar.gz
-#url: ${cbc_cgi:url}/${fn}
 git_url: ${about:home}
-#git_tag:
+git_tag: v${package:version}
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 
 [requirements]
 build:
diff --git a/poppy/poppy.ini b/poppy/poppy.ini
index db5e99d..939c801 100644
--- a/poppy/poppy.ini
+++ b/poppy/poppy.ini
@@ -1,6 +1,6 @@
 [package]
 name: poppy
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 0.4.0
 
 [about]
 home: https://github.com/mperrin/${package:name}
@@ -8,13 +8,11 @@ license: BSD
 summary: ${package:name}
 
 [source]
-#fn: ${package:name}-${package:version}.tar.gz
-#url: ${cbc_cgi:url}/${fn}
 git_url: ${about:home}
-#git_tag:
+git_tag: v${package:version}
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 
 [requirements]
 build:
diff --git a/purge_path/purge_path.ini b/purge_path/purge_path.ini
index d70a17a..1454a51 100644
--- a/purge_path/purge_path.ini
+++ b/purge_path/purge_path.ini
@@ -1,6 +1,6 @@
 [package]
 name: purge_path
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 1.0.0
 
 [about]
 home: http://bitbucket.org/jhunkeler/${package:name}
@@ -8,10 +8,11 @@ license: GPL
 summary: ${package:name} a small PATH manipulator
 
 [source]
-git_url: https://bitbucket.org/jhunkeler/${package:name}.git
+git_url: https://bitbucket.org/jhunkeler/${package:name}
+git_tag: ${package:version}
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 
 [requirements]
 build:
diff --git a/pyds9/pyds9.ini b/pyds9/pyds9.ini
index 6dfe1f6..13e6307 100644
--- a/pyds9/pyds9.ini
+++ b/pyds9/pyds9.ini
@@ -1,6 +1,6 @@
 [package]
 name : pyds9
-version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version : 1.8.1
 
 [about]
 home : https://github.com/ericmandel/${package:name}
@@ -8,11 +8,11 @@ license : GPL
 summary : Python connection to SAOimage DS9 via XPA
 
 [source]
-git_url : ${about:home}.git
+git_url : ${about:home}
 git_tag : v1.8
 
 [build]
-number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number : 0
 
 [requirements]
 build : 
diff --git a/pyfftw/pyfftw.ini b/pyfftw/pyfftw.ini
index 989ce0f..dcf17ed 100644
--- a/pyfftw/pyfftw.ini
+++ b/pyfftw/pyfftw.ini
@@ -13,7 +13,7 @@ fn : pyFFTW-${package:version}.tar.gz
 url : https://pypi.python.org/packages/source/p/pyFFTW/${fn}
 
 [build]
-number : 1
+number : 0
 
 [requirements]
 build :
diff --git a/pyraf/pyraf.ini b/pyraf/pyraf.ini
index d69d2fc..373072e 100644
--- a/pyraf/pyraf.ini
+++ b/pyraf/pyraf.ini
@@ -3,14 +3,13 @@ name : pyraf
 version : 2.1.10
 
 [about]
-home : https://pypi.python.org/packages/source/p/${package:name}
+home : https://github.com/spacetelescope/${package:name}
 license : BSD
 summary : ${package:name}
 
 [source]
-fn : ${package:name}-${package:version}.tar.gz
-url : ${about:home}/${fn}
-md5 : 221aed9d6af6377118ffd22f544e7f4b
+git_url: ${about:home}
+git_tag: 
 
 [build]
 number : 0
@@ -19,18 +18,18 @@ number : 0
 build : 
 	d2to1
     astropy >=1.1
-    #pyobjc-core
-    #pyobjc-cocoa
-    #pyobjc-quartz
+    #pyobjc-core [osx]
+    #pyobjc-cocoa [osx]
+    #pyobjc-quartz [osx]
     stsci.distutils
     stsci.tools
 	setuptools
 	python
 run : 
     astropy >=1.1
-    #pyobjc-core
-    #pyobjc-cocoa
-    #pyobjc-quartz
+    #pyobjc-core [osx]
+    #pyobjc-cocoa [osx]
+    #pyobjc-quartz [osx]
     stsci.distutils
     stsci.tools
 	python
diff --git a/pyregion/pyregion.ini b/pyregion/pyregion.ini
index 6226918..91428be 100644
--- a/pyregion/pyregion.ini
+++ b/pyregion/pyregion.ini
@@ -1,6 +1,6 @@
 [package]
 name: pyregion
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 1.1.2
 
 [about]
 home: http://www.stsci.edu/institute/software_hardware/pyraf/stsci_python
@@ -9,9 +9,10 @@ summary: ${package:name}
 
 [source]
 git_url: https://github.com/spacetelescope/${package:name}
+git_tag: 
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 
 [requirements]
 build:
diff --git a/pysynphot/pysynphot.ini b/pysynphot/pysynphot.ini
index c8e8661..a96212e 100644
--- a/pysynphot/pysynphot.ini
+++ b/pysynphot/pysynphot.ini
@@ -1,6 +1,6 @@
 [package]
 name: pysynphot
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 0.9.8.2
 
 [about]
 home: https://github.com/spacetelescope/${package:name}
@@ -9,10 +9,10 @@ summary: ${package:name}
 
 [source]
 git_url: ${about:home}
-#git_tag:
+git_tag: 
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 preserve_egg_dir: yes
 
 [requirements]
diff --git a/python-daemon/python-daemon.ini b/python-daemon/python-daemon.ini
index 302580c..7a48174 100644
--- a/python-daemon/python-daemon.ini
+++ b/python-daemon/python-daemon.ini
@@ -13,7 +13,7 @@ url: https://pypi.python.org/packages/source/p/${package:name}/${fn}
 md5: 73e7f49f525c51fa4a995aea4d80de41
 
 [build]
-number: 1
+number: 0
 
 [requirements]
 build:
diff --git a/pywcs/pywcs.ini b/pywcs/pywcs.ini
index 5e23db1..e74918c 100644
--- a/pywcs/pywcs.ini
+++ b/pywcs/pywcs.ini
@@ -1,6 +1,6 @@
 [package]
 name: pywcs
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 1.12.1
 
 [about]
 home: https://github.com/spacetelescope/${package:name}
@@ -8,13 +8,11 @@ license: BSD
 summary: ${package:name}
 
 [source]
-#fn: ${package:name}-${package:version}.tar.gz
-#url: https://pypi.python.org/packages/source/p/${package:name}/${fn}
-#md5: 5ed527a601ca1eba62c6be64b3dab620
-git_url: ${about:home}.git
+git_url: ${about:home}
+git_tag: 
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 
 [requirements]
 build:
diff --git a/reftools/reftools.ini b/reftools/reftools.ini
index 6d19bad..98cd464 100644
--- a/reftools/reftools.ini
+++ b/reftools/reftools.ini
@@ -1,6 +1,6 @@
 [package]
 name: reftools
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 1.7.1
 
 [about]
 home: http://www.stsci.edu/institute/software_hardware/pyraf/stsci_python
@@ -8,10 +8,11 @@ license: BSD
 summary: ${package:name}
 
 [source]
-git_url: https://github.com/spacetelescope/${package:name}.git
+git_url: https://github.com/spacetelescope/${package:name}
+git_tag: 
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 preserve_egg_dir: yes
 
 [requirements]
diff --git a/specview/specview.ini b/specview/specview.ini
index 828775f..620ece1 100644
--- a/specview/specview.ini
+++ b/specview/specview.ini
@@ -1,6 +1,6 @@
 [package]
 name: specview
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 0.1
 
 [about]
 home: https://github.com/spacetelescope/${package:name}
@@ -9,12 +9,11 @@ summary: ${package:name}
 readme: README.rst
 
 [source]
-#fn: ${package:name}-${package:version}.tar.gz
-#url: ${cbc_cgi:url}/${fn}
 git_url: ${about:home}
+#git_tag:
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 
 [requirements]
 build:
diff --git a/stginga/stginga.ini b/stginga/stginga.ini
index 2cdc941..b4e977f 100644
--- a/stginga/stginga.ini
+++ b/stginga/stginga.ini
@@ -1,6 +1,6 @@
 [package]
 name: stginga
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}
 
 [about]
 home: https://github.com/spacetelescope/${package:name}
@@ -11,6 +11,7 @@ summary: ${package:name}
 #fn: ${package:name}-${package:version}.tar.gz
 #url: ${cbc_cgi:url}/${fn}
 git_url: ${about:home}
+git_tag: 
 
 [build]
 number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
diff --git a/stistools/stistools.ini b/stistools/stistools.ini
index 99b4e0d..e5cae11 100644
--- a/stistools/stistools.ini
+++ b/stistools/stistools.ini
@@ -1,6 +1,6 @@
 [package]
 name: stistools
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 1.1
 
 [about]
 home: http://www.stsci.edu/institute/software_hardware/pyraf/stsci_python
@@ -8,10 +8,11 @@ license: BSD
 summary: ${package:name}
 
 [source]
-git_url: https://github.com/spacetelescope/${package:name}.git
+git_url: https://github.com/spacetelescope/${package:name}
+git_tag: 
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 
 [requirements]
 build:
diff --git a/stsci-data-analysis/stsci-data-analysis.ini b/stsci-data-analysis/stsci-data-analysis.ini
index c295fa2..d211ed8 100644
--- a/stsci-data-analysis/stsci-data-analysis.ini
+++ b/stsci-data-analysis/stsci-data-analysis.ini
@@ -1,6 +1,6 @@
 [package]
 name : stsci-data-analysis
-version : 1.1
+version : 1.0.0
 
 [about]
 home : http://stsci.edu
@@ -18,24 +18,17 @@ number : 0
 build : 
     ${requirements:run}
 run : 
-    astropy >=1.1 [py3k]
-    specview [py3k]
-    astroimtools [py3k]
-    cube-tools [py3k]
-    stginga [py3k]
-    asv [py3k]
-    asdf [py3k]
-    python [py3k]
-
-    astropy >=1.1 [py27]
-    specview [py27]
-    astroimtools [py27]
-    cube-tools [py27]
-    stginga [py27]
-    asv [py27]
-    asdf [py27]
-    python [py27]
-    
+    astropy >=1.1
+    specview ==0.1
+    astroimtools ==0.1
+    cube-tools ==0.0.0
+    stginga ==0.0.0
+    asv ==0.1.1
+    asdf ==1.0.2
+
+    numpy x.x
+    python x.x
+
 [test]
 imports : 
 
diff --git a/stsci-hst/stsci-hst.ini b/stsci-hst/stsci-hst.ini
index fca5341..c2b6061 100644
--- a/stsci-hst/stsci-hst.ini
+++ b/stsci-hst/stsci-hst.ini
@@ -1,6 +1,6 @@
 [package]
 name : stsci-hst
-version : 1.2.2
+version : 1.0.0
 
 [about]
 home : http://www.stsci.edu
@@ -19,77 +19,43 @@ build :
     ${requirements:run}
 run : 
     # Extra
-    purge_path [py3k]
-    purge_path [py27]
+    purge_path >=0.0.1
     # HST
-    acstools [py3k]
-    acstools [py27]
-    astrolib.coords [py3k]
-    astrolib.coords [py27]
-    astropy >=1.1 [py3k]
-    astropy >=1.1 [py27]
-    calcos [py3k]
-    calcos [py27]
-    costools [py3k]
-    costools [py27]
-    crds [py3k]
-    crds [py27]
-    d2to1 [py3k]
-    d2to1 [py27]
-    drizzlepac [py3k]
-    drizzlepac [py27]
-    fitsblender [py3k]
-    fitsblender [py27]
-    hstcal [py3k]
-    hstcal [py27]
-    nictools [py3k]
-    nictools [py27]
-    pyregion [py3k]
-    pyregion [py27]
-    pysynphot [py3k]
-    pysynphot [py27]
-    pywcs [py3k]
-    pywcs [py27]
-    reftools [py3k]
-    reftools [py27]
-    stistools [py3k]
-    stistools [py27]
-    stsci.convolve [py3k]
-    stsci.convolve [py27]
-    stsci.distutils [py3k]
-    stsci.distutils [py27]
-    stsci.image [py3k]
-    stsci.image [py27]
-    stsci.imagemanip [py3k]
-    stsci.imagemanip [py27]
-    stsci.imagestats [py3k]
-    stsci.imagestats [py27]
-    stsci.ndimage [py3k]
-    stsci.ndimage [py27]
-    stsci.numdisplay [py3k]
-    stsci.numdisplay [py27]
-    stsci.sphinxext [py3k]
-    stsci.sphinxext [py27]
-    stsci.stimage [py3k]
-    stsci.stimage [py27]
-    stsci.skypac [py3k]
-    stsci.skypac [py27]
-    stsci.sphere [py3k]
-    stsci.sphere [py27]
-    stsci.tools [py3k]
-    stsci.tools [py27]
-    stwcs [py3k]
-    stwcs [py27]
-    wfpc2tools [py3k]
-    wfpc2tools [py27]
-    wfc3tools [py3k]
-    wfc3tools [py27]
+    acstools ==2.0.0
+    astrolib.coords ==0.39.6
+    astropy >=1.1
+    calcos ==3.1.3
+    costools ==1.2.1
+    crds ==0.0.0
+    d2to1 ==0.2.12
+    drizzlepac ==2.1.3
+    fitsblender ==0.2.6
+    hstcal ==1.0.0
+    nictools ==1.1.3
+    pyregion ==1.1.2
+    pysynphot ==0.9.8.2
+    pywcs ==1.12.1
+    reftools ==1.7.1
+    stistools ==1.1
+    stsci.convolve ==2.1.3
+    stsci.distutils ==0.3.8
+    stsci.image ==2.2.0
+    stsci.imagemanip ==1.1.2
+    stsci.imagestats ==1.4.1
+    stsci.ndimage ==0.10.1
+    stsci.numdisplay ==1.6.1
+    stsci.sphinxext ==1.2.2
+    stsci.stimage ==0.2.1
+    stsci.skypac ==0.9
+    stsci.sphere ==0.2
+    stsci.tools ==3.4.1
+    stwcs ==1.2.3
+    wfpc2tools ==1.0.3
+    wfc3tools ==1.3.1
     
     #Standard
-    numpy [py3k]
-    numpy [py27]
-    python [py3k]
-    python [py27]
+    numpy x.x
+    python x.x
 
 [test]
 imports : 
diff --git a/stsci.convolve/stsci.convolve.ini b/stsci.convolve/stsci.convolve.ini
index 6b4c582..d72e9a0 100644
--- a/stsci.convolve/stsci.convolve.ini
+++ b/stsci.convolve/stsci.convolve.ini
@@ -1,6 +1,6 @@
 [package]
 name: stsci.convolve
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 2.1.3
 
 [about]
 home: https://github.com/embray/${package:name}
@@ -9,9 +9,10 @@ summary: ${package:name}
 
 [source]
 git_url: https://github.com/spacetelescope/${package:name}
+git_tag: 
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 # Namespace package workaround
 preserve_egg_dir: yes
 
diff --git a/stsci.distutils/stsci.distutils.ini b/stsci.distutils/stsci.distutils.ini
index a3c355d..69b544d 100644
--- a/stsci.distutils/stsci.distutils.ini
+++ b/stsci.distutils/stsci.distutils.ini
@@ -1,6 +1,6 @@
 [package]
 name: stsci.distutils
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 0.3.8
 
 [about]
 home: https://github.com/embray/${package:name}
@@ -9,9 +9,10 @@ summary: ${package:name}
 
 [source]
 git_url: https://github.com/spacetelescope/${package:name}
+git_tag: 
 
 [build]
-number: 1
+number: 0
 
 [requirements]
 build:
diff --git a/stsci.image/stsci.image.ini b/stsci.image/stsci.image.ini
index 72bff38..da341d3 100644
--- a/stsci.image/stsci.image.ini
+++ b/stsci.image/stsci.image.ini
@@ -1,6 +1,6 @@
 [package]
 name: stsci.image
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 2.2.0
 
 [about]
 home: https://github.com/embray/${package:name}
@@ -10,9 +10,10 @@ summary: ${package:name}
 
 [source]
 git_url: https://github.com/spacetelescope/stsci.image.git
+git_tag: 
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 # Namespace package workaround
 preserve_egg_dir: yes
 
diff --git a/stsci.imagemanip/stsci.imagemanip.ini b/stsci.imagemanip/stsci.imagemanip.ini
index 78e4a24..9cb41ac 100644
--- a/stsci.imagemanip/stsci.imagemanip.ini
+++ b/stsci.imagemanip/stsci.imagemanip.ini
@@ -1,6 +1,6 @@
 [package]
 name: stsci.imagemanip
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 1.1.2
 
 [about]
 home: https://github.com/embray/${package:name}
@@ -9,9 +9,10 @@ summary: ${package:name}
 
 [source]
 git_url: https://github.com/spacetelescope/${package:name}
+git_tag: 
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 # Namespace package workaround
 preserve_egg_dir: yes
 
diff --git a/stsci.imagestats/stsci.imagestats.ini b/stsci.imagestats/stsci.imagestats.ini
index 8a3d2f0..191d65e 100644
--- a/stsci.imagestats/stsci.imagestats.ini
+++ b/stsci.imagestats/stsci.imagestats.ini
@@ -1,6 +1,6 @@
 [package]
 name: stsci.imagestats
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 1.4.1
 
 [about]
 home: https://github.com/embray/${package:name}
@@ -10,9 +10,10 @@ summary: ${package:name}
 
 [source]
 git_url: https://github.com/spacetelescope/${package:name}
+git_tag: 
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 # Namespace package workaround
 preserve_egg_dir: yes
 
diff --git a/stsci.ndimage/stsci.ndimage.ini b/stsci.ndimage/stsci.ndimage.ini
index 0b597d8..33f74d9 100644
--- a/stsci.ndimage/stsci.ndimage.ini
+++ b/stsci.ndimage/stsci.ndimage.ini
@@ -1,6 +1,6 @@
 [package]
 name: stsci.ndimage
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 0.10.1
 
 [about]
 home: https://github.com/embray/${package:name}
@@ -9,9 +9,10 @@ summary: ${package:name}
 
 [source]
 git_url: https://github.com/spacetelescope/${package:name}
+git_tag: 
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 # Namespace package workaround
 preserve_egg_dir: yes
 
diff --git a/stsci.numdisplay/stsci.numdisplay.ini b/stsci.numdisplay/stsci.numdisplay.ini
index 7608eb6..7545a92 100644
--- a/stsci.numdisplay/stsci.numdisplay.ini
+++ b/stsci.numdisplay/stsci.numdisplay.ini
@@ -1,6 +1,6 @@
 [package]
 name: stsci.numdisplay
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 1.6.1
 
 [about]
 home: https://github.com/embray/${package:name}
@@ -10,9 +10,10 @@ summary: ${package:name}
 
 [source]
 git_url: https://github.com/spacetelescope/${package:name}
+git_tag: 
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 # Namespace package workaround
 preserve_egg_dir: yes
 
diff --git a/stsci.skypac/stsci.skypac.ini b/stsci.skypac/stsci.skypac.ini
index fb0288e..9e487c5 100644
--- a/stsci.skypac/stsci.skypac.ini
+++ b/stsci.skypac/stsci.skypac.ini
@@ -1,6 +1,6 @@
 [package]
 name : stsci.skypac
-version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version : 0.9
 
 [about]
 home : https://github.com/spacetelescope/${package:name}
@@ -8,13 +8,11 @@ license : BSD
 summary : ${package:name}
 
 [source]
-#fn : ${package:name}-${package:version}.tar.gz
-#url : ${about:home}/${fn}
 git_url : ${about:home}
-#git_tag : 
+git_tag: 
 
 [build]
-number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number : 0
 preserve_egg_dir: yes
 
 [requirements]
diff --git a/stsci.sphere/stsci.sphere.ini b/stsci.sphere/stsci.sphere.ini
index 0c9afb3..6837ce2 100644
--- a/stsci.sphere/stsci.sphere.ini
+++ b/stsci.sphere/stsci.sphere.ini
@@ -1,6 +1,6 @@
 [package]
 name: stsci.sphere
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 0.2
 
 [about]
 home: http://www.stsci.edu/institute/software_hardware
@@ -9,9 +9,10 @@ summary: ${package:name}
 
 [source]
 git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name}
+git_tag: 
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 # Namespace package workaround
 preserve_egg_dir: yes
 
diff --git a/stsci.sphinxext/stsci.sphinxext.ini b/stsci.sphinxext/stsci.sphinxext.ini
index b62b3a2..a9f49ba 100644
--- a/stsci.sphinxext/stsci.sphinxext.ini
+++ b/stsci.sphinxext/stsci.sphinxext.ini
@@ -1,20 +1,19 @@
 [package]
 name: stsci.sphinxext
-version: 1.2.1
+version: 1.2.2
 
 [about]
-home: https://pypi.python.org/pypi/${package:name}
+home: https://github.com/spacetelescope/${package:name}
 license: GPL
 summary: ${package:name}
 #readme: README.md
 
 [source]
-fn: ${package:name}-${package:version}.tar.gz
-url: https://pypi.python.org/packages/source/s/stsci.sphinxext/${fn}
-md5: d23f6ad057a4af86a6ce3771bddb1754
+git_url: ${about:home}
+git_tag: 
 
 [build]
-number: 1
+number: 0
 # Namespace package workaround
 preserve_egg_dir: yes
 
diff --git a/stsci.stimage/stsci.stimage.ini b/stsci.stimage/stsci.stimage.ini
index ae34e06..d59bd65 100644
--- a/stsci.stimage/stsci.stimage.ini
+++ b/stsci.stimage/stsci.stimage.ini
@@ -1,6 +1,6 @@
 [package]
 name: stsci.stimage
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 0.2.1
 
 [about]
 home: https://github.com/embray/${package:name}
@@ -9,9 +9,10 @@ summary: ${package:name}
 
 [source]
 git_url: https://github.com/spacetelescope/${package:name}
+git_tag: 
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 # Namespace package workaround
 preserve_egg_dir: yes
 
diff --git a/stsci.tools/stsci.tools.ini b/stsci.tools/stsci.tools.ini
index 435ed1f..dba0cb8 100644
--- a/stsci.tools/stsci.tools.ini
+++ b/stsci.tools/stsci.tools.ini
@@ -1,6 +1,6 @@
 [package]
 name: stsci.tools
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 3.4.1
 
 [about]
 home: https://github.com/embray/${package:name}
@@ -10,9 +10,10 @@ summary: ${package:name}
 
 [source]
 git_url: https://github.com/spacetelescope/${package:name}
+git_tag: 
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 # Namespace package workaround
 preserve_egg_dir: yes
 
diff --git a/stsci/stsci.ini b/stsci/stsci.ini
index e4a9ae0..71fc728 100644
--- a/stsci/stsci.ini
+++ b/stsci/stsci.ini
@@ -1,6 +1,6 @@
 [package]
 name : stsci
-version : 1.8
+version : 1.0.0
 
 [about]
 home : http://stsci.edu
@@ -12,7 +12,7 @@ summary : ${package:name} meta-package
 #url : ${about:home}/${fn}
 
 [build]
-number : 3
+number : 0
 
 [requirements]
 build : 
@@ -24,39 +24,30 @@ run :
 
 
     #STScI Python (aka HST)
-    stsci-hst [py27 or py3k]
+    stsci-hst
 
     #STScI Data Analysis tools
-    stsci-data-analysis [py27 or py3k]
+    stsci-data-analysis
 
     #STScI
-    astropy >=1.1 [py3k]
-    astropy >=1.1 [py27]
-    cfitsio
-    d2to1 [py3k]
-    d2to1 [py27]
-    ds9
-    fftw
-    htc_utils [py3k]
-    htc_utils [py27]
-    imexam [py3k]
-    imexam [py27]
-    #photutils [py3k]
-    #photutils [py27]
-    poppy [py3k]
-    poppy [py27]
-    purge_path [py3k]
-    purge_path [py27]
-    pyfftw [py3k]
-    pyfftw [py27]
-    webbpsf [py3k]
-    webbpsf [py27]
+    astropy >=1.1
+    cfitsio ==3.370
+    d2to1 ==0.2.12
+    ds9 ==7.4
+    fftw ==3.3.4
+    htc_utils >=0.1
+    imexam ==0.5.2
+    photutils ==0.2.1
+    poppy ==0.4.0
+    purge_path >=0.0.1
+    pyds9 ==1.8.1
+    pyfftw ==0.9.2
+    webbpsf ==0.4.0
+    webbpsf-data ==0.4.0
 
     #Standard
-    numpy [py3k]
-    numpy [py27]
-    python [py3k]
-    python [py27]
+    numpy x.x
+    python x.x
 
 [test]
 imports : 
diff --git a/stwcs/stwcs.ini b/stwcs/stwcs.ini
index 094b08f..68a3d9e 100644
--- a/stwcs/stwcs.ini
+++ b/stwcs/stwcs.ini
@@ -1,6 +1,6 @@
 [package]
 name : stwcs
-version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version : 1.2.3
 
 [about]
 home : https://github.com/spacetelescope/${package:name}
@@ -8,13 +8,11 @@ license : BSD
 summary : ${package:name}
 
 [source]
-#fn : ${package:name}-${package:version}.tar.gz
-#url : ${about:home}/${fn}
 git_url : ${about:home}
-#git_tag : 
+git_tag: 
 
 [build]
-number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number : 0
 
 [requirements]
 build : 
@@ -59,14 +57,15 @@ linux :
 
 
 	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 
-        2to3 -w .
     fi
+
 	python setup.py install || exit 1
 
 windows : 
 	python setup.py install
-    2to3 -w .
 	if errorlevel 1 exit 1
 
diff --git a/webbpsf-data/webbpsf-data.ini b/webbpsf-data/webbpsf-data.ini
index cb73d74..df86299 100644
--- a/webbpsf-data/webbpsf-data.ini
+++ b/webbpsf-data/webbpsf-data.ini
@@ -16,10 +16,8 @@ number: 0
 
 [requirements]
 build:
-    python
     
 run:
-    python
 
 [cbc_build]
 linux:
diff --git a/webbpsf/webbpsf.ini b/webbpsf/webbpsf.ini
index 2018a68..979ec9d 100644
--- a/webbpsf/webbpsf.ini
+++ b/webbpsf/webbpsf.ini
@@ -1,6 +1,6 @@
 [package]
 name: webbpsf
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version: 0.4.0
 
 [about]
 home: https://github.com/mperrin/${package:name}
@@ -9,9 +9,10 @@ summary: ${package:name}
 
 [source]
 git_url: ${about:home}
+git_tag: v0.4.0
 
 [build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number: 0
 preserve_egg_dir: True
 
 [requirements]
@@ -23,6 +24,7 @@ build:
     matplotlib
     poppy
     six [py27]
+    webbpsf-data ==0.4.0
     setuptools
     python
     
@@ -34,7 +36,7 @@ run:
     matplotlib
     poppy
     six [py27]
-    webbpsf-data
+    webbpsf-data ==0.4.0
     setuptools
     python
 
diff --git a/wfc3tools/wfc3tools.ini b/wfc3tools/wfc3tools.ini
index 645b7a6..85a2f85 100644
--- a/wfc3tools/wfc3tools.ini
+++ b/wfc3tools/wfc3tools.ini
@@ -1,6 +1,6 @@
 [package]
 name : wfc3tools
-version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version : 1.3.1
 
 [about]
 home : http://
@@ -9,9 +9,10 @@ summary : ${package:name}
 
 [source]
 git_url : https://github.com/spacetelescope/${package:name}
+git_tag: ${package:version}
 
 [build]
-number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number : 0
 
 [requirements]
 build : 
diff --git a/wfpc2tools/wfpc2tools.ini b/wfpc2tools/wfpc2tools.ini
index 3755b8b..8c57bdd 100644
--- a/wfpc2tools/wfpc2tools.ini
+++ b/wfpc2tools/wfpc2tools.ini
@@ -1,6 +1,6 @@
 [package]
 name : wfpc2tools
-version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version : 1.0.3
 
 [about]
 home : http://
@@ -9,9 +9,10 @@ summary : ${package:name}
 
 [source]
 git_url : https://github.com/spacetelescope/${package:name}
+git_tag: 
 
 [build]
-number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number : 0
 
 [requirements]
 build : 
diff --git a/xpa/xpa.ini b/xpa/xpa.ini
index 1979917..f0e031e 100644
--- a/xpa/xpa.ini
+++ b/xpa/xpa.ini
@@ -1,6 +1,6 @@
 [package]
 name : xpa
-version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+version : 2.1.17
 
 [about]
 home : https://github.com/ericmandel/${package:name}
@@ -8,13 +8,11 @@ license : MIT
 summary : Provides seamless communication between many kinds of Unix programs
 
 [source]
-#fn : ${package:name}-${package:version}.tar.gz
-#url : ${about:home}/${fn}
-git_url : ${about:home}.git
-git_tag : v2.1.17
+git_url : ${about:home}
+git_tag: v${package:version}
 
 [build]
-number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+number : 0
 
 [requirements]
 build : 
@@ -44,7 +42,8 @@ linux :
     # ditch python connector library
     rm -rf python
 
-    ./configure --prefix=$$PREFIX
+    ./configure --prefix=$$PREFIX \
+        --enable-shared
     make -j$${CPU_COUNT}
     make install || exit 1