Import and test IACT scripts only for Python 2.6 or later.

Jürgen Knödlseder
1 parent 18741613
Showing 6 changed files with 104 additions and 81 deletions
ChangeLog
NEWS
configure.ac
cscripts/Makefile.am
cscripts/__init__.py.in
test/test_cscripts.sh.in
-2016-02-25  Juergen Knoedlseder  <jurgen.knodlseder@irap.omp.eu>
+2016-02-26  Juergen Knoedlseder  <jurgen.knodlseder@irap.omp.eu>
  
         * Version 1.1.0 released
         ========================
  
+        Test and import IACT scripts only for Python 2.6+ (#1715)
         Adapt to revise GTime operators (#1714)
         Add publish() methods to tools producing images (#1710)
         Read ahead output filename in cterror (#1700)
@@ -2,7 +2,7 @@ New Features and Important Changes in ctools 1.1.0
  
 Author(s) : Juergen Knoedlseder
  
-25 February 2016
+26 February 2016
  
  
 1. Introduction
@@ -18,7 +18,10 @@ None
  
 3. Python interface
 -------------------
-None
+The IACT scripts csfindobs, csiactcopy, csiactdata, and csiactobs are only
+imported into th cscripts module and tested if the Python version is 2.6 or
+newer. These scripts make use of the json Python module that is only became
+available from Python 2.6 on.
  
  
 4. Support model
@@ -603,9 +603,9 @@ if test &quot;x$ac_enable_python_binding&quot; = &quot;xno&quot;; then
 else
  
   # Do we have Python and Python.h?
-  AM_PATH_PYTHON([2.5],
+  AM_PATH_PYTHON([2.3],
                  [has_python="yes"],
-                 [AC_MSG_WARN([Python >= 2.5 not found. Python >= 2.5 is required to build python binding. Python can be obtained from http://www.python.org])])
+                 [AC_MSG_WARN([Python >= 2.3 not found. Python >= 2.3 is required to build python binding. Python can be obtained from http://www.python.org])])
  
   # It would really be weired if Python has not been found, as barely every system has Python. Maybe
   # it was not found because the autoconf is so old, and in an early version of the AM_PATH_PYTHON
@@ -3,16 +3,18 @@
 # Scripts to be distributed in $(pyexecdir)/cscripts
 pythonscripts = __init__.py \
                 cspull.py cssens.py cstsdist.py cscaldb.py csresmap.py \
-                csiactobs.py csiactdata.py csobsdef.py csspec.py cslightcrv.py csobsinfo.py \
+                csobsdef.py csspec.py cslightcrv.py csobsinfo.py \
                 csinfo.py csmodelinfo.py csmodelmerge.py cstsmapmerge.py \
-                csobs2caldb.py csfindobs.py csiactcopy.py \
+                csobs2caldb.py \
+                csfindobs.py csiactcopy.py csiactdata.py csiactobs.py \
                 obsutils.py
  
 # Scripts for which symbolic links will be created in bindir
 linkscripts = cspull cssens cstsdist cscaldb csresmap \
-              csiactobs csiactdata csobsdef csspec cslightcrv csobsinfo \
+              csobsdef csspec cslightcrv csobsinfo \
               csinfo csmodelinfo csmodelmerge cstsmapmerge \
-              csobs2caldb csfindobs csiactcopy
+              csobs2caldb \
+              csfindobs csiactcopy csiactdata csiactobs
  
 # Distribute scripts
 EXTRA_DIST         = $(binscripts) $(pythonscripts)
 # ==========================================================================
 # cscripts Python module
 #
-# Copyright (C) 2015 Juergen Knoedlseder
+# Copyright (C) 2015-2016 Juergen Knoedlseder
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,12 +17,14 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # ==========================================================================
+# Python version check
+import sys
+req_version = (2,7)
+cur_version = sys.version_info
  
 # List all scripts in this module
 __all__ = [
     "cscaldb",
-    "csiactdata",
-    "csiactobs",
     "csinfo",
     "cslightcrv",
     "csmodelinfo",
@@ -37,17 +39,18 @@ __all__ = [
     "cstsdist",
     "cstsmapmerge",
     "csfindobs",
-    "csiactobs",
-    "csiactdata",
-    "csiactcopy",
     "obsutils",
     "test",
 ]
+if cur_version > req_version:
+    __all__.extend(["csfindobs",
+                    "csiactcopy",
+                    "csiactdata",
+                    "csiactobs"])
+
  
 # Import
 from .cscaldb      import cscaldb
-from .csiactdata   import csiactdata
-from .csiactobs    import csiactobs
 from .csinfo       import csinfo
 from .cslightcrv   import cslightcrv
 from .csmodelinfo  import csmodelinfo
@@ -61,11 +64,17 @@ from .cssens       import cssens
 from .csspec       import csspec
 from .cstsdist     import cstsdist
 from .cstsmapmerge import cstsmapmerge
-from .csfindobs    import csfindobs
-from .csiactobs    import csiactobs
-from .csiactdata   import csiactdata
-from .csiactcopy   import csiactcopy
 from . import obsutils
+if cur_version > req_version:
+    from .csfindobs    import csfindobs
+    from .csiactcopy   import csiactcopy
+    from .csiactdata   import csiactdata
+    from .csiactobs    import csiactobs
+
+# Delete version check variables
+del sys
+del req_version
+del cur_version
  
 # Add test function
 def test():
@@ -483,66 +483,74 @@ $ECHO &quot; ok&quot;
  
  
 #
-# Test csiactcopy
-# ===============
-$ECHO -n "Test csiactcopy: "
-chmod +x @abs_top_srcdir@/cscripts/csiactcopy.py
-@abs_top_srcdir@/cscripts/csiactcopy.py \
-  remote_master="iactdata/master.json" \
-  outpath="iactdata_test" \
-  prodname="unit-test" > csiactcopy.log
-$ECHO -n "."
-if [ -s "iactdata_test/master.json" ]
-then
+# Optional tests for Python 2.6++ (scripts needing json module)
+# =============================================================
+python_version=`echo @PYTHON_VERSION@ | sed 's/\(10\.[[0-9]]*\).*/\1/' | sed -e 's/\.//g'`
+if [ $python_version -ge 26 ]; then
+
+  #
+  # Test csfindobs
+  # ==============
+  $ECHO -n "Test csfindobs: "
+  chmod +x @abs_top_srcdir@/cscripts/csfindobs.py
+  @abs_top_srcdir@/cscripts/csfindobs.py \
+    datapath="iactdata/" \
+    prodname="unit-test" \
+    ra="83.6331" \
+    dec="22.01" \
+    rad="1.0" \
+    outfile="iactrunlist.dat" > csfindobs.log
   $ECHO -n "."
-else
-  $ECHO " iactdata_test/master.json file is not valid"
-  exit 1
-fi
-$ECHO " ok"
-
-
-#
-# Test csfindobs
-# ==============
-$ECHO -n "Test csfindobs: "
-chmod +x @abs_top_srcdir@/cscripts/csfindobs.py
-@abs_top_srcdir@/cscripts/csfindobs.py \
-  datapath="iactdata/" \
-  prodname="unit-test" \
-  ra="83.6331" \
-  dec="22.01" \
-  rad="1.0" \
-  outfile="iactrunlist.dat" > csfindobs.log
-$ECHO -n "."
-if [ -s "iactrunlist.dat" ]
-then
+  if [ -s "iactrunlist.dat" ]
+  then
+    $ECHO -n "."
+  else
+    $ECHO " iactdata/runlist.txt file is not valid"
+    exit 1
+  fi
+  $ECHO " ok"
+
+
+  #
+  # Test csiactcopy
+  # ===============
+  $ECHO -n "Test csiactcopy: "
+  chmod +x @abs_top_srcdir@/cscripts/csiactcopy.py
+  @abs_top_srcdir@/cscripts/csiactcopy.py \
+    remote_master="iactdata/master.json" \
+    outpath="iactdata_test" \
+    prodname="unit-test" > csiactcopy.log
   $ECHO -n "."
-else
-  $ECHO " iactdata/runlist.txt file is not valid"
-  exit 1
-fi
-$ECHO " ok"
-
-
-#
-# Test csiactobs
-# ==============
-$ECHO -n "Test csiactobs: "
-chmod +x @abs_top_srcdir@/cscripts/csiactobs.py
-@abs_top_srcdir@/cscripts/csiactobs.py \
-  datapath="iactdata/" \
-  prodname="unit-test" \
-  infile="iactrunlist.dat" \
-  bkgpars="1" \
-  outobs="obs2.xml" \
-  outmodel="bkgmodels.xml" > csiactobs.log
-$ECHO -n "."
-if [ -s "obs2.xml" ]
-then
+  if [ -s "iactdata_test/master.json" ]
+  then
+    $ECHO -n "."
+  else
+    $ECHO " iactdata_test/master.json file is not valid"
+    exit 1
+  fi
+  $ECHO " ok"
+
+
+  #
+  # Test csiactobs
+  # ==============
+  $ECHO -n "Test csiactobs: "
+  chmod +x @abs_top_srcdir@/cscripts/csiactobs.py
+  @abs_top_srcdir@/cscripts/csiactobs.py \
+    datapath="iactdata/" \
+    prodname="unit-test" \
+    infile="iactrunlist.dat" \
+    bkgpars="1" \
+    outobs="obs2.xml" \
+    outmodel="bkgmodels.xml" > csiactobs.log
   $ECHO -n "."
-else
-  $ECHO " obs.xml file is not valid"
-  exit 1
-fi
-$ECHO " ok"
+  if [ -s "obs2.xml" ]
+  then
+    $ECHO -n "."
+  else
+    $ECHO " obs.xml file is not valid"
+    exit 1
+  fi
+  $ECHO " ok"
+
+fi  # Python 2.6+ specific tests