aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunk@stsci.edu>2015-11-20 17:05:29 -0500
committerJoseph Hunkeler <jhunk@stsci.edu>2015-11-20 17:05:29 -0500
commit69f91e5025e1c4129386d7269f32d51d19476410 (patch)
tree0bdc5c2f2b488aeb307454b82bf87e4f7cc2e6fa
parenta4c0e7ee5356052abffce5d882da411723b40f31 (diff)
downloadcbc-recipes-69f91e5025e1c4129386d7269f32d51d19476410.tar.gz
Fix hstcal. Reactivate hstcal in stsci-hst.
-rw-r--r--hstcal/hstcal.ini12
-rw-r--r--stsci-hst/stsci-hst.ini4
2 files changed, 11 insertions, 5 deletions
diff --git a/hstcal/hstcal.ini b/hstcal/hstcal.ini
index a6d1232..2cdb83f 100644
--- a/hstcal/hstcal.ini
+++ b/hstcal/hstcal.ini
@@ -30,9 +30,15 @@ commands :
[cbc_build]
linux :
- ./configure --destdir=$$PREFIX
- make
- ./waf install
+ # If you find yourself here wondering why your HSTCAL will not build from source
+ # ... you're not alone.
+ # Make sure your system Python is <= 2.6.
+ # WAF 1.6.4 is the mortal enemy of Python >= 2.7
+ # -- This should be fixed some day.
+
+ /usr/bin/python ./waf configure --destdir=$$PREFIX
+ /usr/bin/python ./waf build
+ /usr/bin/python ./waf install
windows :
echo Not yet.
diff --git a/stsci-hst/stsci-hst.ini b/stsci-hst/stsci-hst.ini
index f8154e8..71c2362 100644
--- a/stsci-hst/stsci-hst.ini
+++ b/stsci-hst/stsci-hst.ini
@@ -45,8 +45,8 @@ run :
fitsblender [py3k]
fitsblender [py27]
# Broken at the moment :(
- #hstcal [py3k]
- #hstcal [py27]
+ hstcal [py3k]
+ hstcal [py27]
nictools [py3k]
nictools [py27]
pyregion [py3k]