From e5bf0cbe7eb556d4aa217bf25dc12229d5a4719e Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Tue, 11 Aug 2015 13:48:48 -0400
Subject: Fix empty GIT_DESCRIBE_TAG default (0.0.0)

---
 pydrizzle/pydrizzle.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydrizzle')

diff --git a/pydrizzle/pydrizzle.ini b/pydrizzle/pydrizzle.ini
index fe5b556..9d4c102 100644
--- a/pydrizzle/pydrizzle.ini
+++ b/pydrizzle/pydrizzle.ini
@@ -1,6 +1,6 @@
 [package]
 name: pydrizzle
-version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: http://www.stsci.edu/institute/software_hardware/pyraf/stsci_python
-- 
cgit 


From 57d3cd7f5ef7a335fbb0c948951dc174feedde65 Mon Sep 17 00:00:00 2001
From: Joe Hunkeler <jhunkeler@gmail.com>
Date: Wed, 2 Sep 2015 12:26:16 -0400
Subject: Minor changes

---
 pydrizzle/pydrizzle.ini | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'pydrizzle')

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:
-- 
cgit