switch to python 2.7.3; shut off most of herbert/thor

git-svn-id: https://svn.stsci.edu/svn/ssb/etal/steuermann/trunk@795 d34015c8-bcbb-4646-8ac8-8ba5febf221d

4 files changed, 16 insertions, 27 deletions

diff --git a/sm/build_dev.sm b/sm/build_dev.sm
index 0935d01..12aefa6 100644
--- a/sm/build_dev.sm
+++ b/sm/build_dev.sm
@@ -7,8 +7,8 @@
 # install stsci_python into default environment
 # build hstcal
 #	- everywhere
-TABLE build HOST herbert thor arzach bond cadeau banana jwcalibdev
-	CMD dev.py2.7.1 RUN "build_stsci_python dev 2.7.1"
+TABLE build HOST arzach bond cadeau banana jwcalibdev
+	CMD dev.py2.7.3 RUN "build_stsci_python dev 2.7.3"
 		AFTER init/*
 		AFTER *:assemble/dev.stsci_python
 	CMD dev.hstcal RUN "build_hstcal dev"
@@ -20,11 +20,7 @@ TABLE build HOST vxp-dukat
 		AFTER init/*
 		AFTER *:assemble/dev.stsci_python
 
-# newer python environments
-TABLE build HOST jwcalibdev cadeau arzach
-	CMD dev.py2.7.3 RUN "build_stsci_python dev 2.7.3"
-		AFTER init/*
-		AFTER *:assemble/dev.stsci_python
+#
 
 TABLE build HOST arzach
 	CMD ur_docs RUN "/arzach/data1/iraf/work/ur_doc_build/docs/overnight_build"
@@ -72,13 +68,13 @@ TABLE build HOST cadeau banana
 #	- one machine only
 TABLE build HOST arzach
 	CMD dev.stsci_python_sphinxdocs RUN "build_sphinxdocs dev 2.7.3"
-	AFTER build/dev.py2.7.1
+	AFTER build/dev.py2.7.3
 
 # old epydoc documentation - only works on thor; hope we can get rid of
 # epydoc sooner than we have to do anything about this.
 TABLE build HOST thor
-	CMD dev.stsci_python_epydoc RUN "/thor/data2/iraf/epydoc_test/nightly"
-	AFTER build/dev.py2.7.1
+	CMD dev.stsci_python_epydoc RUN "exit 1 ; /thor/data2/iraf/epydoc_test/nightly"
+	AFTER build/dev.py2.7.*
 
 # stamp the IRAF banner file when the builds are complete
 TABLE stamp HOST herbert thor arzach bond cadeau banana jwcalibdev
diff --git a/sm/build_x.sm b/sm/build_x.sm
index 28eaf30..ca6addc 100644
--- a/sm/build_x.sm
+++ b/sm/build_x.sm
@@ -7,8 +7,8 @@
 # install stsci_python into default environment
 # build hstcal
 #	- everywhere
-TABLE build HOST herbert thor arzach bond cadeau banana
-	CMD x.py2.7.1 RUN "build_stsci_python x 2.7.1"
+TABLE build HOST arzach bond cadeau banana
+	CMD x.py2.7.3 RUN "build_stsci_python x 2.7.3"
 		AFTER init/*
 		AFTER *:assemble/x.stsci_python
 	CMD x.hstcal RUN "build_hstcal x"
@@ -37,7 +37,7 @@ TABLE build HOST herbert bond
 
 
 # stsdas for 64 bit machines - get it from a related 32 bit system
-TABLE build HOST thor arzach
+TABLE build HOST arzach
 	CMD x.stsci_iraf_64hack RUN "build_stsci_iraf_64hack x herbert"
 	AFTER herbert:build/x.stsci_iraf*
 
diff --git a/sm/test_dev.sm b/sm/test_dev.sm
index 70ff597..72ea3f4 100644
--- a/sm/test_dev.sm
+++ b/sm/test_dev.sm
@@ -6,8 +6,8 @@ IMPORT "test_common.sm"
 
 # This structure is meant to serialize the regtests so that nothing else
 # is going on at the same time.  The regtests can consume all the CPUs.
-TABLE test_run_dev HOST herbert thor arzach bond cadeau banana
-	CMD test2.7.1 RUN "test_rt dev 2.7.1"
+TABLE test_run_dev HOST arzach bond cadeau banana
+	CMD test2.7.3 RUN "test_rt dev 2.7.3"
 		AFTER stamp/dev
 		AFTER test_setup/okify
 		AFTER test_setup/*
@@ -15,24 +15,17 @@ TABLE test_run_dev HOST herbert thor arzach bond cadeau banana
 TABLE test_run_dev HOST arzach 
 	CMD test2.6.5 RUN "test_rt dev 2.6.5"
 		AFTER stamp/dev
-		AFTER test2.7.1
-
-TABLE test_run_dev HOST cadeau arzach
-	CMD test2.7.3 RUN "test_rt dev 2.7.3"
-		AFTER stamp/dev
-		AFTER test_setup/okify
-		AFTER test_setup/*
-		AFTER OPT test2.6.5
-		AFTER test2.7.1
+		AFTER test2.7.*
 
 TABLE test_run_dev HOST arzach
 	CMD contact RUN "test_contact"
 		AFTER stamp/dev
-		AFTER test2.7.1
+		AFTER test2.7.*
 
 TABLE test_run_dev HOST jwcalibdev
 	CMD contact_jwst RUN "test_contact_jwst"
 		AFTER init/*
+		AFTER test2.7.*
 
 TABLE test_run_dev HOST jwcalibdev
 	CMD jwst RUN "/data1/jwst_rt/rt"
diff --git a/sm/test_x.sm b/sm/test_x.sm
index bf059d4..f83b65d 100644
--- a/sm/test_x.sm
+++ b/sm/test_x.sm
@@ -5,7 +5,7 @@ IMPORT "test_common.sm"
 # This structure is meant to serialize the regtests so that nothing else
 # is going on at the same time.  The regtests can consume all the CPUs.
 TABLE test_run_x HOST arzach cadeau banana
-	CMD test2.7.1 RUN "test_rt x 2.7.1"
+	CMD test2.7.3 RUN "test_rt x 2.7.3"
 		AFTER stamp/x
 		AFTER test_setup/okify
 		AFTER test_setup/*
@@ -14,7 +14,7 @@ TABLE test_run_x HOST arzach cadeau banana
 TABLE test_run_x HOST arzach
 	CMD contact RUN "test_contact"
 		AFTER stamp/x
-		AFTER test2.7.1
+		AFTER test2.7.*
 
 TABLE test_import HOST ssb
         CMD x.import RUN "test_import irafx"