Minor changes

7 files changed, 68 insertions, 12 deletions

diff --git a/astrolib.coords/astrolib.coords.ini b/astrolib.coords/astrolib.coords.ini
index d81edbc..b46b11a 100644
--- a/astrolib.coords/astrolib.coords.ini
+++ b/astrolib.coords/astrolib.coords.ini
@@ -32,10 +32,11 @@ commands :
 
 [cbc_build]
 linux : 
-	
+    pip install --no-deps --upgrade --force d2to1 || 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
 
diff --git a/calcos/calcos.ini b/calcos/calcos.ini
index 18af88d..bf9e215 100644
--- a/calcos/calcos.ini
+++ b/calcos/calcos.ini
@@ -3,7 +3,7 @@ name : calcos
 version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
-home : ssh://git@bitbucket.org/stsci_ssb/calcos.git
+home : ssh://git@bitbucket.org/stsci_ssb/${package:name}.git
 license : 
 summary : ${package:name}
 
diff --git a/hstcal/hstcal.ini b/hstcal/hstcal.ini
index 434b1c5..a6d1232 100644
--- a/hstcal/hstcal.ini
+++ b/hstcal/hstcal.ini
@@ -3,14 +3,14 @@ name : hstcal
 version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
-home : http://
+home : ssh://git@bitbucket.org/stsci_ssb/${package:name}.git
 license : BSD
 summary : ${package:name}
 
 [source]
 #fn : ${package:name}-${package:version}.tar.gz
 #url : ${about:home}/${fn}
-git_url : ssh://git@bitbucket.org/jhunkeler/${package:name}
+git_url : ${about:home}
 #git_tag : 
 
 [build]
@@ -18,7 +18,7 @@ number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 
 [requirements]
 build : 
-    #
+    gcc >=4.6 [osx]
 run : 
     #
 
@@ -30,9 +30,9 @@ commands :
 
 [cbc_build]
 linux : 
-    ./configure --prefix=$$PREFIX
+    ./configure --destdir=$$PREFIX
     make
-    make install
+    ./waf install
 
 windows : 
     echo Not yet.
diff --git a/pyasdf/pyasdf.ini b/pyasdf/pyasdf.ini
index b9e7569..446ffb9 100644
--- a/pyasdf/pyasdf.ini
+++ b/pyasdf/pyasdf.ini
@@ -20,7 +20,7 @@ build:
     pyyaml
     jsonschema
     pytest
-    six [py27]
+    six
     setuptools
     python
 
diff --git a/pydrizzle/pydrizzle.ini b/pydrizzle/pydrizzle.ini
index 9d4c102..46cd116 100644
--- a/pydrizzle/pydrizzle.ini
+++ b/pydrizzle/pydrizzle.ini
@@ -21,6 +21,8 @@ build:
     astropy >=1.0
     numpy >=1.6.0
     stsci.distutils
+    stsci.tools
+    pyfits
     setuptools
     python
 
@@ -29,12 +31,39 @@ run:
     astropy-helpers
     astropy >=1.0
     numpy >=1.6.0
+    stsci.tools
+    pyfits
     python
 
 [cbc_build]
 linux:
+    function get_py_version() {
+        python --version 2>&1| awk '{sub(/-.*/,"",$$2);print $$2}' 
+    }
+    export -f get_py_version
+
+    function set_py3k() {
+        version=`get_py_version`
+        major=`echo $$version | cut -d '.' -f 1`
+        minor=`echo $$version | cut -d '.' -f 2`
+        hotfix=`echo $$version | cut -d '.' -f 3`
+        if (( major > 2 )); then
+            export PY3K=1
+        else
+            export PY3K=0
+        fi
+    }
+    export -f set_py3k
+
+    set_py3k
+
+    if [ $$PY3K -ne 0 ]; then
+        sed -i -e "s|stsci.distutils.hooks.tag_svn_revision|#removed|" setup.cfg
+    fi
+    
     echo This d2to1 hack is deadly.
     pip install --no-deps --upgrade --force d2to1 || exit 1
+
     python setup.py install || exit 1
 
 windows:
diff --git a/stsci.stimage/stsci.stimage.ini b/stsci.stimage/stsci.stimage.ini
index 4b233e9..f73a22c 100644
--- a/stsci.stimage/stsci.stimage.ini
+++ b/stsci.stimage/stsci.stimage.ini
@@ -13,7 +13,7 @@ git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name}
 [build]
 number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
 # Namespace package workaround
-#preserve_egg_dir: yes
+preserve_egg_dir: yes
 
 [requirements]
 build:
diff --git a/stwcs/stwcs.ini b/stwcs/stwcs.ini
index c0ad552..a217b43 100644
--- a/stwcs/stwcs.ini
+++ b/stwcs/stwcs.ini
@@ -3,8 +3,8 @@ name : stwcs
 version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
-home : ssh://git@bitbucket.org/stsci_ssb/stwcs.git
-license : 
+home : ssh://git@bitbucket.org/stsci_ssb/${package:name}
+license : BSD
 summary : ${package:name}
 
 [source]
@@ -37,10 +37,36 @@ commands :
 
 [cbc_build]
 linux : 
+    function get_py_version() {
+        python --version 2>&1| awk '{sub(/-.*/,"",$$2);print $$2}' 
+    }
+    export -f get_py_version
+
+    function set_py3k() {
+        version=`get_py_version`
+        major=`echo $$version | cut -d '.' -f 1`
+        minor=`echo $$version | cut -d '.' -f 2`
+        hotfix=`echo $$version | cut -d '.' -f 3`
+        if (( major > 2 )); then
+            export PY3K=1
+        else
+            export PY3K=0
+        fi
+    }
+    export -f set_py3k
+
+    set_py3k
+
+
 	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
+
 windows : 
-	
 	python setup.py install
+    2to3 -w .
 	if errorlevel 1 exit 1