30 files changed, 246 insertions, 373 deletions

diff --git a/acstools/acstools.ini b/acstools/acstools.ini
new file mode 100644
index 0000000..4ed1fcf
--- /dev/null
+++ b/acstools/acstools.ini
@@ -0,0 +1,40 @@
+[package]
+name: acstools
+version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+
+[about]
+home: http://www.stsci.edu/institute/software_hardware/pyraf/stsci_python
+license: BSD
+summary: ${package:name}
+
+[source]
+git_url: ssh://git@bitbucket.org/stsci_ssb/acstools.git
+
+[build]
+number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+
+[requirements]
+build:
+    d2to1
+    stsci.distutils
+    python
+    astropy
+    stsci.tools
+    setuptools
+run:
+    setuptools
+    python
+
+[cbc_build]
+linux:
+    echo This d2to1 hack is deadly.
+    pip install --no-deps --upgrade --force d2to1 || exit 1
+    python setup.py install || exit 1
+
+windows:
+    echo This d2to1 hack is deadly.
+    pip install --no-deps --upgrade --force d2to1
+    if errorlevel 1 exit 1
+
+    python setup.py install || exit 1
+    if errorlevel 1 exit 1
diff --git a/aprio/aprio.ini b/aprio/aprio.ini
index eeb3431..89c313a 100644
--- a/aprio/aprio.ini
+++ b/aprio/aprio.ini
@@ -1,6 +1,6 @@
 [package]
 name: aprio
-version: 1.0
+version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
 
 [about]
 home: http://bitbucket.org/jhunkeler/${package:name}
@@ -9,32 +9,29 @@ summary: ${package:name} is an automatic renice daemon.
 readme: README.md
 
 [source]
-#fn: ${package:name}-${package:version}.tar.gz
-#url: ${cbc_cgi:url}/${fn}
-#url: http://bull.shit
 git_url: https://bitbucket.org/jhunkeler/aprio.git
 
 [build]
-number: 1
+number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 
 [requirements]
 build:
+    python
+    argparse >=1.1 [py26]
+    setuptools
     psutil
     python-daemon
-    argparse [py26]
-    python
 run:
     psutil
     python-daemon
-    argparse [py26]
     python
 
 
 [cbc_build]
 linux:
-    python setup.py install --single-version-externally-managed --record=record.txt || exit 1
+    python setup.py install || exit 1
 
 windows:
-    python setup.py install --single-version-externally-managed --record=record.txt
+    python setup.py install
     if errorlevel 1 exit 1
 
diff --git a/asdf-standard/asdf-standard.ini b/asdf-standard/asdf-standard.ini
index fe3c5c2..4fac4f3 100644
--- a/asdf-standard/asdf-standard.ini
+++ b/asdf-standard/asdf-standard.ini
@@ -19,14 +19,13 @@ number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 [requirements]
 build:
     sphinx
-    #sphinx_bootstrap_theme
     jsonschema
     pyyaml
     mistune
     six [py27]
     setuptools
     python
-    
+
 run:
     nose
     astropy
@@ -35,7 +34,7 @@ run:
 
 [cbc_build]
 linux:
-    python setup.py install || exit 1 
+    python setup.py install || exit 1
 
 windows:
     python setup.py install
diff --git a/astropy-helpers/astropy-helpers.ini b/astropy-helpers/astropy-helpers.ini
index 5c651bf..6bed0f6 100644
--- a/astropy-helpers/astropy-helpers.ini
+++ b/astropy-helpers/astropy-helpers.ini
@@ -1,6 +1,6 @@
 [package]
 name: astropy-helpers
-version: 1.0.2.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0") }}.git
 
 [about]
 home: http://github.com/astropy/${package:name}
@@ -14,7 +14,7 @@ readme: README.rst
 git_url: ${about:home}
 
 [build]
-number: 1
+number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 
 [requirements]
 build:
@@ -28,8 +28,8 @@ run:
 
 [cbc_build]
 linux:
-    python setup.py install || exit 1 
-    
+    python setup.py install || exit 1
+
 
 windows:
     python setup.py install
diff --git a/astropy/astropy.ini b/astropy/astropy.ini
index 8c08900..067bae8 100644
--- a/astropy/astropy.ini
+++ b/astropy/astropy.ini
@@ -1,6 +1,6 @@
 [package]
 name: astropy
-version: 1.0.3.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
 
 [about]
 home: http://github.com/astropy/${package:name}
@@ -14,7 +14,7 @@ readme: README.rst
 git_url: ${about:home}
 
 [build]
-number: 1
+number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 
 [requirements]
 build:
@@ -24,7 +24,7 @@ build:
     setuptools
     numpy
     python
-    
+
 run:
     jinja2
     cython
@@ -35,7 +35,7 @@ run:
 
 [cbc_build]
 linux:
-    python setup.py install --offline || exit 1 
+    python setup.py install --offline || exit 1
 
 windows:
     python setup.py install --offline
diff --git a/test/test.ini b/cbc-test-package/cbc_test_package.ini
index 6816222..37491e4 100644
--- a/test/test.ini
+++ b/cbc-test-package/cbc_test_package.ini
@@ -1,34 +1,32 @@
 [package]

-name: test

+name: cbc_test_package

 version: 1.0.0

 

 [about]

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

 license: GPL

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

-readme: README.md

 

 [source]

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

-url: ${cbc_cgi:url}/${fn}

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

 

 [build]

 number: 1

 

 [requirements]

 build:

-    python

     setuptools

+    python

 

 run:

     python

-    

-    

-[cbc_build]

-prefix: /usr/local

-win_prefix: c:\anaconda3\

 

+[test]

+imports:

+    cbc_test_package

 

+[cbc_build]

 linux:

     python setup.py install || exit 1

 

diff --git a/cfitsio/cfitsio.ini b/cfitsio/cfitsio.ini
index c13c160..8809aee 100644
--- a/cfitsio/cfitsio.ini
+++ b/cfitsio/cfitsio.ini
@@ -10,7 +10,7 @@ summary: ${package:name}
 
 [source]
 fn: ${package:name}${cbc_build:version}.tar.gz
-url: ${cbc_cgi:url}/${fn}
+url: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${fn}
 
 [build]
 number: 1
diff --git a/d2to1/d2to1.ini b/d2to1/d2to1.ini
index c042e07..37de38b 100644
--- a/d2to1/d2to1.ini
+++ b/d2to1/d2to1.ini
@@ -1,20 +1,18 @@
 [package]
 name: d2to1
-version: 0.2.11
+version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
 
 [about]
 home: https://github.com/embray/${package:name}
 license: GPL
-summary: ${package:name} is an automatic renice daemon.
-#readme: README.md
+summary: ${package:name}
 
 [source]
-#fn: ${package:name}-${package:version}.tar.gz
-#url: ${cbc_cgi:url}/${fn}
-git_url: https://github.com/embray/d2to1.git
+git_url: https://github.com/embray/${package:name}.git
+git_tag: 0.2.12
 
 [build]
-number: 1
+number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 
 [requirements]
 build:
diff --git a/drizzle/drizzle.ini b/drizzle/drizzle.ini
index 28de0b5..3c6e3ed 100644
--- a/drizzle/drizzle.ini
+++ b/drizzle/drizzle.ini
@@ -25,7 +25,7 @@ build:
     numpy >=1.6.0
     setuptools
     python
-    
+
 run:
     d2to1
     nose
@@ -38,7 +38,7 @@ run:
 linux:
     echo This d2to1 hack is deadly.
     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
diff --git a/iraf/iraf.ini b/iraf/iraf.ini
index a859df6..0d6f77e 100644
--- a/iraf/iraf.ini
+++ b/iraf/iraf.ini
@@ -9,8 +9,9 @@ summary: NOAO Image Reduction and Analysis Facility
 
 [source]
 # Remember, always 32-bit! Now feast upon my tears.
-fn: ${package:name}.lnux.x86.fixup.tar.gz
-url: ${cbc_cgi:url}/${fn}
+#fn: ${package:name}.lnux.x86.fixup.tar.gz
+#url: ${cbc_cgi:url}/${fn}
+git_url: https://bitbucket.org/jhunkeler/${package:name}
 
 # Tarball should be generated with:
 # git archive --format tar.gz --prefix iraf/ -o ../iraf.lnux.x86.fixup.tar.gz -v master
@@ -29,7 +30,7 @@ run:
 linux:
     export TERM=xterm
     FAKEHOME=$$PREFIX/iraf/fakehome
-    cp -a `pwd` $$PREFIX
+    cp -a `pwd` $$PREFIX/iraf
     cd $$PREFIX/iraf
     ./install \
         --accept-defaults \
@@ -42,6 +43,6 @@ linux:
     rm -f bin
     ln -s bin.linux bin
     ln -s bin.linux bin.linux64
-    
+
 windows:
     echo Not supported on Windows
diff --git a/iraf_ureka/iraf.ini b/iraf_ureka/iraf.ini
deleted file mode 100644
index d47870a..0000000
--- a/iraf_ureka/iraf.ini
+++ /dev/null
@@ -1,40 +0,0 @@
-[package]
-name: iraf
-version: 2.16
-
-[about]
-home: http://bitbucket.org/jhunkeler/${package:name}
-license: BSD
-summary: ${package:name} is hard
-#readme: README.md
-
-[source]
-fn: ${package:name}.tar.bz2
-url: ${cbc_cgi:url}/${fn}
-
-[build]
-number: 1
-
-[requirements]
-build:
-    python
-run:
-    python
-
-[cbc_build]
-linux:
-    # Replace hard-coded HOST and IRAF defines
-    sed -i -e "/#define\\tHOST/c \\
-    \\#define HOST \"$$PREFIX/iraf/unix/\"" unix/hlib/libc/iraf.h
-    
-    sed -i -e "/#define\\tIRAF/c \\
-    \\#define IRAF \"$$PREFIX/iraf/\"" unix/hlib/libc/iraf.h
-    
-    # Destroy hard-coded header paths. Rely on CFLAGS like normal humans.
-    sed -i -e 's|/home/jhunk/Ureka/iraf/unix/hlib/libc/||g' unix/hlib/libc/iraf.h
-    
-    #Pseudo-install
-    cp -a `pwd` $$PREFIX
-    
-windows:
-    echo Not supported on Windows
diff --git a/pyasdf/pyasdf.ini b/pyasdf/pyasdf.ini
index 77bd32f..d822b40 100644
--- a/pyasdf/pyasdf.ini
+++ b/pyasdf/pyasdf.ini
@@ -1,6 +1,6 @@
 [package]
 name: pyasdf
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: http://github.com/spacetelescope/${package:name}
@@ -8,10 +8,7 @@ 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) }}
@@ -24,7 +21,7 @@ build:
     jsonschema
     setuptools
     python
-    
+
 run:
     astropy-helpers
     astropy
@@ -35,7 +32,7 @@ run:
 
 [cbc_build]
 linux:
-    python setup.py install || exit 1 
+    python setup.py install || exit 1
 
 windows:
     python setup.py install
diff --git a/pydrizzle/pydrizzle.ini b/pydrizzle/pydrizzle.ini
new file mode 100644
index 0000000..fe5b556
--- /dev/null
+++ b/pydrizzle/pydrizzle.ini
@@ -0,0 +1,42 @@
+[package]
+name: pydrizzle
+version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+
+[about]
+home: http://www.stsci.edu/institute/software_hardware/pyraf/stsci_python
+license: BSD
+summary: ${package:name}
+
+[source]
+git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name}
+
+[build]
+number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+
+[requirements]
+build:
+    d2to1
+    nose
+    astropy-helpers
+    astropy >=1.0
+    numpy >=1.6.0
+    stsci.distutils
+    setuptools
+    python
+
+run:
+    nose
+    astropy-helpers
+    astropy >=1.0
+    numpy >=1.6.0
+    python
+
+[cbc_build]
+linux:
+    echo This d2to1 hack is deadly.
+    pip install --no-deps --upgrade --force d2to1 || exit 1
+    python setup.py install || exit 1
+
+windows:
+    python setup.py install
+    if errorlevel 1 exit 1
diff --git a/pyfits/pyfits-cfitsio.patch b/pyfits/pyfits-cfitsio.patch
index f2103b2..64e7057 100644
--- a/pyfits/pyfits-cfitsio.patch
+++ b/pyfits/pyfits-cfitsio.patch
@@ -1,131 +1,3 @@
-diff -u -p --recursive a/pyfits-3.3/setup.cfg b/pyfits-3.3/setup.cfg
---- setup.cfg	2014-07-17 14:36:07.000000000 -0400
-+++ setup.cfg	2015-07-05 19:25:45.313176685 -0400
-@@ -35,101 +35,29 @@ scripts =
- 	scripts/fitscheck
- 	scripts/fitsdiff
- 
--[extension=pyfits.compression]
--sources = 
--	cextern/cfitsio/adler32.c
--	cextern/cfitsio/buffers.c
--	cextern/cfitsio/cfileio.c
--	cextern/cfitsio/checksum.c
--	cextern/cfitsio/crc32.c
--	cextern/cfitsio/deflate.c
--	cextern/cfitsio/drvrfile.c
--	cextern/cfitsio/drvrgsiftp.c
--	cextern/cfitsio/drvrmem.c
--	cextern/cfitsio/drvrnet.c
--	cextern/cfitsio/drvrsmem.c
--	cextern/cfitsio/editcol.c
--	cextern/cfitsio/edithdu.c
--	cextern/cfitsio/eval_f.c
--	cextern/cfitsio/eval_l.c
--	cextern/cfitsio/eval_y.c
--	cextern/cfitsio/fitscore.c
--	cextern/cfitsio/fits_hcompress.c
--	cextern/cfitsio/fits_hdecompress.c
--	cextern/cfitsio/getcolb.c
--	cextern/cfitsio/getcol.c
--	cextern/cfitsio/getcold.c
--	cextern/cfitsio/getcole.c
--	cextern/cfitsio/getcoli.c
--	cextern/cfitsio/getcolj.c
--	cextern/cfitsio/getcolk.c
--	cextern/cfitsio/getcoll.c
--	cextern/cfitsio/getcolsb.c
--	cextern/cfitsio/getcols.c
--	cextern/cfitsio/getcolui.c
--	cextern/cfitsio/getcoluj.c
--	cextern/cfitsio/getcoluk.c
--	cextern/cfitsio/getkey.c
--	cextern/cfitsio/group.c
--	cextern/cfitsio/grparser.c
--	cextern/cfitsio/histo.c
--	cextern/cfitsio/imcompress.c
--	cextern/cfitsio/infback.c
--	cextern/cfitsio/inffast.c
--	cextern/cfitsio/inflate.c
--	cextern/cfitsio/inftrees.c
--	cextern/cfitsio/iraffits.c
--	cextern/cfitsio/modkey.c
--	cextern/cfitsio/pliocomp.c
--	cextern/cfitsio/putcolb.c
--	cextern/cfitsio/putcol.c
--	cextern/cfitsio/putcold.c
--	cextern/cfitsio/putcole.c
--	cextern/cfitsio/putcoli.c
--	cextern/cfitsio/putcolj.c
--	cextern/cfitsio/putcolk.c
--	cextern/cfitsio/putcoll.c
--	cextern/cfitsio/putcolsb.c
--	cextern/cfitsio/putcols.c
--	cextern/cfitsio/putcolu.c
--	cextern/cfitsio/putcolui.c
--	cextern/cfitsio/putcoluj.c
--	cextern/cfitsio/putcoluk.c
--	cextern/cfitsio/putkey.c
--	cextern/cfitsio/quantize.c
--	cextern/cfitsio/region.c
--	cextern/cfitsio/ricecomp.c
--	cextern/cfitsio/scalnull.c
--	cextern/cfitsio/swapproc.c
--	cextern/cfitsio/trees.c
--	cextern/cfitsio/uncompr.c
--	cextern/cfitsio/wcssub.c
--	cextern/cfitsio/wcsutil.c
--	cextern/cfitsio/zcompress.c
--	cextern/cfitsio/zuncompress.c
--	cextern/cfitsio/zutil.c
--	src/compressionmodule.c
--include_dirs = 
--	numpy
--	cextern/cfitsio
--extra_compile_args = 
--	-Wno-declaration-after-statement
--	-Wno-unused-variable
--	-Wno-parentheses
--	-Wno-uninitialized
--	-Wno-format
--	-Wno-strict-prototypes
--	-Wno-unused
--	-Wno-comments
--	-Wno-switch
--optional = True
--fail_message = 
--	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
--	Failed to build PyFITS tile compression support.  PyFITS will still
--	function, but without the ability to read or write compressed images.
--	Please seek support from help@stsci.edu if you need this capability.
--	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
--
-+#[extension=pyfits.compression]
-+#sources = 
-+#	src/compressionmodule.c
-+#include_dirs = 
-+#	numpy
-+#extra_compile_args = 
-+#	-Wno-declaration-after-statement
-+#	-Wno-unused-variable
-+#	-Wno-parentheses
-+#	-Wno-uninitialized
-+#	-Wno-format
-+#	-Wno-strict-prototypes
-+#	-Wno-unused
-+#	-Wno-comments
-+#	-Wno-switch
-+#optional = True
-+#fail_message = 
-+#	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-+#	Failed to build PyFITS tile compression support.  PyFITS will still
-+#	function, but without the ability to read or write compressed images.
-+#	Please seek support from help@stsci.edu if you need this capability.
-+#	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-+#
- [global]
- setup-hooks = 
- 	stsci.distutils.hooks.version_setup_hook
 diff -u -p --recursive a/pyfits-3.3/setup.py b/pyfits-3.3/setup.py
 --- setup.py	2014-06-09 16:07:11.000000000 -0400
 +++ setup.py	2015-07-05 20:46:43.071332734 -0400
@@ -161,7 +33,7 @@ diff -u -p --recursive a/pyfits-3.3/setup.py b/pyfits-3.3/setup.py
 +    pass
  
  setup(
-     setup_requires=['d2to1>=0.2.5', 'stsci.distutils>=0.3'],
+     setup_requires=['d2to1>=0.2.12', 'stsci.distutils>=0.3'],
      d2to1=True,
 -    zip_safe=False
 +    use_2to3=True,
diff --git a/pyfits/pyfits.ini b/pyfits/pyfits.ini
index 5e43c6a..27a0b59 100644
--- a/pyfits/pyfits.ini
+++ b/pyfits/pyfits.ini
@@ -1,41 +1,40 @@
 [package]
 name: pyfits
-version: 3.3
+version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
 
 [about]
-home: https://github.com/embray/${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: ${cbc_cgi:url}/${fn}
+git_url: ${about:home}.git
+
 patches:
-    ${package:name}-cfitsio.patch
+    ${package:name}-cfitsio.patch [py34]
 
 [build]
-number: 1
+number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 
 [requirements]
 build:
+    setuptools
     yaml
     pyyaml
-    setuptools 
+    d2to1
     stsci.distutils
     pkgconfig
     cfitsio
     numpy
-    d2to1
     python
 
 run:
+    stsci.distutils
+    setuptools
     yaml
     pyyaml
     cfitsio
     numpy
-    stsci.distutils
-    d2to1
     python
 
 
diff --git a/pyqtgraph/pyqtgraph.ini b/pyqtgraph/pyqtgraph.ini
index e89e9a9..6689e44 100644
--- a/pyqtgraph/pyqtgraph.ini
+++ b/pyqtgraph/pyqtgraph.ini
@@ -1,33 +1,34 @@
 [package]
 name: pyqtgraph
-version: 0.9.10
+# They release with $name-$version... conda doesn't handle that
+version: 0.0.0
 
 [about]
 home: http://www.pyqtgraph.org/
 license: MIT
 summary: ${package:name}
-readme: README.md
 
 [source]
-fn: ${package:name}-${package:version}.tar.gz
-url: ${cbc_cgi:url}/${fn}
+git_url: https://github.com/${package:name}/${package:name}
+git_tag: develop
 
 [build]
-number: 1
+number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 
 [requirements]
 build:
     numpy
     setuptools
     python
-    
+
 run:
+    pyqt
     numpy
     python
 
 [cbc_build]
 linux:
-    python setup.py install || exit 1 
+    python setup.py install || exit 1
 
 windows:
     python setup.py install
diff --git a/pysynphot/pysynphot.ini b/pysynphot/pysynphot.ini
index 9087168..74448a7 100644
--- a/pysynphot/pysynphot.ini
+++ b/pysynphot/pysynphot.ini
@@ -1,6 +1,6 @@
 [package]
 name: pysynphot
-version: 0.9.6
+version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
 
 [about]
 home: http://github.com/spacetelescope/${package:name}
@@ -8,11 +8,10 @@ license: BSD
 summary: ${package:name}
 
 [source]
-fn: ${package:name}-${package:version}.tar.gz
-url: ${cbc_cgi:url}/${fn}
+git_url: ${about:home}
 
 [build]
-number: 1
+number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 
 [requirements]
 build:
@@ -27,7 +26,7 @@ build:
     matplotlib
     setuptools
     python
-    
+
 run:
     d2to1
     nose
@@ -44,8 +43,8 @@ run:
 [cbc_build]
 linux:
     echo This d2to1 hack is deadly.
-    pip install --no-deps --upgrade --force d2to1 || exit 1
-    python setup.py install || exit 1 
+    #pip install --no-deps --upgrade --force d2to1 || exit 1
+    python setup.py install || exit 1
 
 windows:
     python setup.py install
diff --git a/python-daemon/python-daemon.ini b/python-daemon/python-daemon.ini
index b17094a..302580c 100644
--- a/python-daemon/python-daemon.ini
+++ b/python-daemon/python-daemon.ini
@@ -24,7 +24,6 @@ run:
     lockfile
     python
 
-
 [cbc_build]
 linux:
     python setup.py install || exit 1
diff --git a/specview/specview.ini b/specview/specview.ini
index 490053b..2bfa2bd 100644
--- a/specview/specview.ini
+++ b/specview/specview.ini
@@ -1,6 +1,6 @@
 [package]
 name: specview
-#version: 0.2
+version: git
 
 [about]
 home: http://github.com/spacetelescope/${package:name}
@@ -11,10 +11,10 @@ readme: README.rst
 [source]
 #fn: ${package:name}-${package:version}.tar.gz
 #url: ${cbc_cgi:url}/${fn}
-git_url: ${about:home}.git
+git_url: ${about:home}
 
 [build]
-number: 1
+number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 
 [requirements]
 build:
@@ -24,7 +24,7 @@ build:
     pyqtgraph
     setuptools
     python
-    
+
 run:
     astropy
     numpy
@@ -34,8 +34,8 @@ run:
 
 [cbc_build]
 linux:
-    python setup.py install || exit 1 
+    python setup.py install --offline || exit 1
 
 windows:
-    python setup.py install
+    python setup.py install --offline
     if errorlevel 1 exit 1
diff --git a/stsci-iraf/stsci-iraf.ini b/stsci-iraf/stsci-iraf.ini
deleted file mode 100644
index f772824..0000000
--- a/stsci-iraf/stsci-iraf.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[package]
-name: stsci-iraf
-version: 3.17
-
-[about]
-home: http://bitbucket.org/jhunkeler/${package:name}
-license: BSD
-summary: ${package:name} is hard
-#readme: README.md
-
-[source]
-fn: ${package:name}.tar.bz2
-url: ${cbc_cgi:url}/${fn}
-
-[build]
-number: 1
-
-[requirements]
-build:
-    iraf
-    python
-run:
-    iraf
-    python
-
-[cbc_build]
-linux:
-    # Fix extern.pkg
-    sed -i -e "s|/home/jhunk/Ureka/variants/common/iraf|$$PREFIX/stsci-iraf/iraf|g" extern.pkg
-    
-    # Fix scripts
-    find iraf/rvsao -type f | xargs sed -i -e "s|#!/home/jhunk/Ureka|$$PREFIX|g"
-    
-    #Pseudo-install
-    cp -a `pwd` $$PREFIX
-    
-windows:
-    echo Not supported on Windows
diff --git a/stsci.convolve/stsci.convolve.ini b/stsci.convolve/stsci.convolve.ini
index f7457e6..bda143d 100644
--- a/stsci.convolve/stsci.convolve.ini
+++ b/stsci.convolve/stsci.convolve.ini
@@ -1,20 +1,17 @@
 [package]
 name: stsci.convolve
-version: 2.2.0
+version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
 
 [about]
 home: https://github.com/embray/${package:name}
 license: GPL
 summary: ${package:name}
-#readme: README.md
 
 [source]
-fn: ${package:name}-${package:version}.tar.gz
-url: ${cbc_cgi:url}/${fn}
-#git_url: git@bitbucket.org:jhunkeler/stsci.tools.git
+git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name}
 
 [build]
-number: 1
+number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 # Namespace package workaround
 preserve_egg_dir: yes
 
@@ -24,7 +21,7 @@ build:
     stsci.distutils
     numpy
     python
-    
+
 run:
     d2to1
     stsci.distutils
@@ -39,5 +36,9 @@ linux:
     python setup.py install || exit 1
 
 windows:
-    python setup.py install --single-version-externally-managed --record=record.txt
+    echo This d2to1 hack is deadly.
+    pip install --no-deps --upgrade --force d2to1
+    if errorlevel 1 exit 1
+
+    python setup.py install
     if errorlevel 1 exit 1
diff --git a/stsci.distutils/stsci.distutils.ini b/stsci.distutils/stsci.distutils.ini
index bf5c3fe..7bc3bf9 100644
--- a/stsci.distutils/stsci.distutils.ini
+++ b/stsci.distutils/stsci.distutils.ini
@@ -1,17 +1,14 @@
 [package]
 name: stsci.distutils
-version: 0.3.7
+version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
 
 [about]
 home: https://github.com/embray/${package:name}
 license: GPL
 summary: ${package:name}
-#readme: README.md
 
 [source]
-fn: ${package:name}-${package:version}.tar.gz
-url: ${cbc_cgi:url}/${fn}
-#git_url: git@bitbucket.org:jhunkeler/stsci.distutils.git
+git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name}
 
 [build]
 number: 1
@@ -19,9 +16,9 @@ number: 1
 [requirements]
 build:
     d2to1
+    setuptools
     python
 run:
-    d2to1
     nose
     python
 
@@ -33,5 +30,9 @@ linux:
     python setup.py install || exit 1
 
 windows:
-    python setup.py install --single-version-externally-managed --record=record.txt || exit 1
+    echo This d2to1 hack is deadly.
+    REM pip install --no-deps --upgrade --force d2to1
+    if errorlevel 1 exit 1
+
+    python setup.py install
     if errorlevel 1 exit 1
diff --git a/stsci.image/stsci.image.ini b/stsci.image/stsci.image.ini
index 7987703..b8406bc 100644
--- a/stsci.image/stsci.image.ini
+++ b/stsci.image/stsci.image.ini
@@ -1,6 +1,6 @@
 [package]
 name: stsci.image
-version: 2.1
+version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
 
 [about]
 home: https://github.com/embray/${package:name}
@@ -9,12 +9,10 @@ summary: ${package:name}
 #readme: README.md
 
 [source]
-fn: ${package:name}-${package:version}.tar.gz
-url: ${cbc_cgi:url}/${fn}
-#git_url: git@bitbucket.org:jhunkeler/stsci.image.git
+git_url: ssh://git@bitbucket.org/stsci_ssb/stsci.image.git
 
 [build]
-number: 1
+number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 # Namespace package workaround
 preserve_egg_dir: yes
 
@@ -28,7 +26,7 @@ build:
     pyfits
     numpy
     python
-    
+
 run:
     d2to1
     stsci.distutils
@@ -43,8 +41,11 @@ run:
 linux:
     echo This d2to1 hack is deadly.
     pip install --no-deps --upgrade --force d2to1 || exit 1
-    python setup.py install --single-version-externally-managed --record=record.txt || exit 1
+    python setup.py install || exit 1
 
 windows:
-    python setup.py install --single-version-externally-managed --record=record.txt
+    pip install --no-deps --upgrade --force d2to1
+    if errorlevel 1 exit 1
+
+    python setup.py install
     if errorlevel 1 exit 1
diff --git a/stsci.imagemanip/stsci.imagemanip.ini b/stsci.imagemanip/stsci.imagemanip.ini
index 27189b4..33825d1 100644
--- a/stsci.imagemanip/stsci.imagemanip.ini
+++ b/stsci.imagemanip/stsci.imagemanip.ini
@@ -1,20 +1,17 @@
 [package]
 name: stsci.imagemanip
-version: 1.1
+version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
 
 [about]
 home: https://github.com/embray/${package:name}
 license: GPL
 summary: ${package:name}
-#readme: README.md
 
 [source]
-fn: ${package:name}-${package:version}.tar.gz
-url: ${cbc_cgi:url}/${fn}
-#git_url: git@bitbucket.org:jhunkeler/stsci.imagemanip.git
+git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name}
 
 [build]
-number: 1
+number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 # Namespace package workaround
 preserve_egg_dir: yes
 
@@ -29,7 +26,7 @@ build:
     pyfits
     numpy
     python
-    
+
 run:
     d2to1
     stsci.distutils
@@ -45,8 +42,12 @@ run:
 linux:
     echo This d2to1 hack is deadly.
     pip install --no-deps --upgrade --force d2to1 || exit 1
-    python setup.py install --single-version-externally-managed --record=record.txt || exit 1
+    python setup.py install || exit 1
 
 windows:
-    python setup.py install --single-version-externally-managed --record=record.txt
+    echo This d2to1 hack is deadly.
+    pip install --no-deps --upgrade --force d2to1
+    if errorlevel 1 exit 1
+
+    python setup.py install
     if errorlevel 1 exit 1
diff --git a/stsci.imagestats/stsci.imagestats.ini b/stsci.imagestats/stsci.imagestats.ini
index 2d04e4e..d119de7 100644
--- a/stsci.imagestats/stsci.imagestats.ini
+++ b/stsci.imagestats/stsci.imagestats.ini
@@ -1,6 +1,6 @@
 [package]
 name: stsci.imagestats
-version: 1.4
+version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
 
 [about]
 home: https://github.com/embray/${package:name}
@@ -9,12 +9,10 @@ summary: ${package:name}
 #readme: README.md
 
 [source]
-fn: ${package:name}-${package:version}.tar.gz
-url: ${cbc_cgi:url}/${fn}
-#git_url: git@bitbucket.org:jhunkeler/stsci.imagestats.git
+git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name}
 
 [build]
-number: 1
+number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 # Namespace package workaround
 preserve_egg_dir: yes
 
@@ -26,12 +24,11 @@ build:
     stsci.convolve
     stsci.image
     stsci.imagemanip
-    distribute
     setuptools
     pyfits
     numpy
     python
-    
+
 run:
     d2to1
     stsci.distutils
@@ -39,7 +36,6 @@ run:
     stsci.convolve
     stsci.image
     stsci.imagemanip
-    distribute
     pyfits
     numpy
     python
@@ -52,5 +48,9 @@ linux:
     python setup.py install || exit 1
 
 windows:
-    python setup.py install --single-version-externally-managed --record=record.txt
+    echo This d2to1 hack is deadly.
+    pip install --no-deps --upgrade --force d2to1
+    if errorlevel 1 exit 1
+
+    python setup.py install
     if errorlevel 1 exit 1
diff --git a/stsci.ndimage/stsci.ndimage.ini b/stsci.ndimage/stsci.ndimage.ini
index 3ccb940..bb73792 100644
--- a/stsci.ndimage/stsci.ndimage.ini
+++ b/stsci.ndimage/stsci.ndimage.ini
@@ -1,35 +1,30 @@
 [package]
 name: stsci.ndimage
-version: 0.10.0
+version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
 
 [about]
 home: https://github.com/embray/${package:name}
 license: GPL
 summary: ${package:name}
-#readme: README.md
 
 [source]
-fn: ${package:name}-${package:version}.tar.gz
-url: ${cbc_cgi:url}/${fn}
-#git_url: git@bitbucket.org:jhunkeler/stsci.ndimage.git
+git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name}
 
 [build]
-number: 1
+number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 # Namespace package workaround
 preserve_egg_dir: no
 
 [requirements]
 build:
     d2to1
-    distribute
     setuptools
     pyfits
     numpy
     python
-    
+
 run:
     d2to1
-    distribute
     pyfits
     numpy
     python
@@ -42,5 +37,9 @@ linux:
     python setup.py install || exit 1
 
 windows:
-    python setup.py install --single-version-externally-managed --record=record.txt
+    echo This d2to1 hack is deadly.
+    pip install --no-deps --upgrade --force d2to1
+    if errorlevel 1 exit 1
+
+    python setup.py install
     if errorlevel 1 exit 1
diff --git a/stsci.numdisplay/stsci.numdisplay.ini b/stsci.numdisplay/stsci.numdisplay.ini
index 0e5dc36..675d1a7 100644
--- a/stsci.numdisplay/stsci.numdisplay.ini
+++ b/stsci.numdisplay/stsci.numdisplay.ini
@@ -1,6 +1,6 @@
 [package]
 name: stsci.numdisplay
-version: 1.6
+version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
 
 [about]
 home: https://github.com/embray/${package:name}
@@ -9,12 +9,10 @@ summary: ${package:name}
 #readme: README.md
 
 [source]
-fn: ${package:name}-${package:version}.tar.gz
-url: ${cbc_cgi:url}/${fn}
-#git_url: git@bitbucket.org:jhunkeler/stsci.numdisplay.git
+git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name}
 
 [build]
-number: 1
+number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 # Namespace package workaround
 preserve_egg_dir: no
 
@@ -22,16 +20,14 @@ preserve_egg_dir: no
 build:
     d2to1
     stsci.tools
-    distribute
     setuptools
     pyfits
     numpy
     python
-    
+
 run:
     d2to1
     stsci.tools
-    distribute
     pyfits
     numpy
     python
@@ -44,5 +40,9 @@ linux:
     python setup.py install || exit 1
 
 windows:
-    python setup.py install --single-version-externally-managed --record=record.txt
+    echo This d2to1 hack is deadly.
+    pip install --no-deps --upgrade --force d2to1
+    if errorlevel 1 exit 1
+
+    python setup.py install
     if errorlevel 1 exit 1
diff --git a/stsci.sphinxext/stsci.sphinxext.ini b/stsci.sphinxext/stsci.sphinxext.ini
index 58a189d..eba3b67 100644
--- a/stsci.sphinxext/stsci.sphinxext.ini
+++ b/stsci.sphinxext/stsci.sphinxext.ini
@@ -3,15 +3,15 @@ name: stsci.sphinxext
 version: 1.2.1
 
 [about]
-home: https://github.com/embray/${package:name}
+home: https://pypi.python.org/pypi/${package:name}
 license: GPL
 summary: ${package:name}
 #readme: README.md
 
 [source]
 fn: ${package:name}-${package:version}.tar.gz
-url: ${cbc_cgi:url}/${fn}
-#git_url: git@bitbucket.org:jhunkeler/stsci.sphinxext.git
+url: https://pypi.python.org/packages/source/s/stsci.sphinxext/${fn}
+md5: d23f6ad057a4af86a6ce3771bddb1754
 
 [build]
 number: 1
@@ -22,14 +22,12 @@ preserve_egg_dir: no
 build:
     d2to1
     stsci.distutils
-    distribute
     setuptools
     python
-    
+
 run:
     d2to1
     stsci.distutils
-    distribute
     python
 
 
@@ -40,5 +38,9 @@ linux:
     python setup.py install || exit 1
 
 windows:
-    python setup.py install --single-version-externally-managed --record=record.txt
+    echo This d2to1 hack is deadly.
+    pip install --no-deps --upgrade --force d2to1
+    if errorlevel 1 exit 1
+
+    python setup.py install
     if errorlevel 1 exit 1
diff --git a/stsci.stimage/stsci.stimage.ini b/stsci.stimage/stsci.stimage.ini
index 4c1571e..49576ba 100644
--- a/stsci.stimage/stsci.stimage.ini
+++ b/stsci.stimage/stsci.stimage.ini
@@ -1,20 +1,17 @@
 [package]
 name: stsci.stimage
-version: 0.2
+version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
 
 [about]
 home: https://github.com/embray/${package:name}
 license: GPL
 summary: ${package:name}
-#readme: README.md
 
 [source]
-fn: ${package:name}-${package:version}.tar.gz
-url: ${cbc_cgi:url}/${fn}
-#git_url: git@bitbucket.org:jhunkeler/stsci.stimage.git
+git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name}
 
 [build]
-number: 1
+number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 # Namespace package workaround
 #preserve_egg_dir: yes
 
@@ -22,15 +19,13 @@ number: 1
 build:
     d2to1
     stsci.distutils
-    distribute
     setuptools
     numpy
     python
-    
+
 run:
     d2to1
     stsci.distutils
-    distribute
     numpy
     python
 
@@ -42,5 +37,9 @@ linux:
     python setup.py install || exit 1
 
 windows:
-    python setup.py install --single-version-externally-managed --record=record.txt
+    echo This d2to1 hack is deadly.
+    pip install --no-deps --upgrade --force d2to1
+    if errorlevel 1 exit 1
+
+    python setup.py install
     if errorlevel 1 exit 1
diff --git a/stsci.tools/stsci.tools.ini b/stsci.tools/stsci.tools.ini
index b911fa3..943f053 100644
--- a/stsci.tools/stsci.tools.ini
+++ b/stsci.tools/stsci.tools.ini
@@ -1,6 +1,6 @@
 [package]
 name: stsci.tools
-version: 3.2.2
+version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
 
 [about]
 home: https://github.com/embray/${package:name}
@@ -9,28 +9,29 @@ summary: ${package:name}
 #readme: README.md
 
 [source]
-fn: ${package:name}-${package:version}.tar.gz
-url: ${cbc_cgi:url}/${fn}
-#git_url: git@bitbucket.org:jhunkeler/stsci.tools.git
+git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name}
 
 [build]
-number: 1
+number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 # Namespace package workaround
 preserve_egg_dir: yes
 
 [requirements]
 build:
     d2to1
+    setuptools
     stsci.distutils
     pyfits
     numpy
+    astropy
     python
-    
+
 run:
     d2to1
     stsci.distutils
     pyfits
     numpy
+    astropy
     python
 
 
@@ -41,5 +42,9 @@ linux:
     python setup.py install || exit 1
 
 windows:
-    python setup.py install --single-version-externally-managed --record=record.txt
+    echo This d2to1 hack is deadly.
+    pip install --no-deps --upgrade --force d2to1
+    if errorlevel 1 exit 1
+
+    python setup.py install
     if errorlevel 1 exit 1