Merge branch 'devel' of https://cta-gitlab.irap.omp.eu/ctools/ctools into 1862_butterfly

Alexander Ziegler
2 parents a37111d1 e77d88fa
Showing 8 changed files with 68 additions and 28 deletions
ChangeLog
NEWS
configure.ac
cscripts/Makefile.am
test/test_ctbin.py
test/test_examples.py.in
test/test_python_cscripts.py
test/test_python_ctools.py
-2017-03-28
+2017-04-05
  
         * Version 1.3.0 released
         ========================
  
+        Copy cscripts into bin directory instead of creating a symbolic links (#1987)
+        If code originates from Git, always compile the Python bindings (#1985)
+        Raise exception instead of exiting with return code in Python tests (#1983)
         Support of map cubes lying outside RoI in ctobssim 
         Support energy boundary FITS file in ctmapcube (#1978)
         Add csebins script (#1976)
 New Features and Important Changes in ctools 1.3.0.dev1
  
-28 March 2017
+5 April 2017
  
  
 Introduction
@@ -11,7 +11,19 @@ ctools release with respect to the precedent release.
  
 Configuration
 -------------
-None
+The Python unit tests now raise exceptions instead of exiting with a non-
+zero return code so that the user is not thrown out of Python after calling
+ctools.test() and cscripts.test() (#1983).
+
+If the code originates from the Git repository the configuration now switches
+to developer mode which implies that the Python bindings are always built.
+This solves the problem that occured for developers that could not get rid
+of existing Python wrappers, even if they modified the Python interface
+(#1985).
+
+The cscripts are now copied into the bin directory upon installation instead
+of creating symbolic links. This avoids problems on some VM file systems on
+which creation of symbolic links does not work (#1987).
  
  
 Python interface
 #############################################################################
 # Configuration for ctools - tools for science analysis of CTA data         #
 # ------------------------------------------------------------------------- #
-# Copyright (C) 2011-2016 Juergen Knoedlseder                               #
+# Copyright (C) 2011-2017 Juergen Knoedlseder                               #
 # ------------------------------------------------------------------------- #
 #                                                                           #
 #  This program is free software: you can redistribute it and/or modify     #
@@ -608,9 +608,10 @@ AC_C_INLINE
 # Python binding requires Python and either the files tools_wrap.cpp and    #
 # tools.py or swig to create these files.  The following conditionals are   #
 # set:                                                                      #
-# WITH_PYTHON   - Python bindings will be built                             #
-# HAVE_SWIG     - swig is available                                         #
-# HAVE_WRAPPERS - wrappers are available                                    #
+# WITH_PYTHON    - Python bindings will be built                            #
+# HAVE_SWIG      - swig is available                                        #
+# HAVE_WRAPPERS  - wrappers are available                                   #
+# BUILD_WRAPPERS - build the Python wrappers                                #
 #############################################################################
 # Initialise flags
 enable_python="no"
@@ -620,6 +621,12 @@ has_swig=&quot;no&quot;
 has_wrappers="no"
 build_wrappers="no"
  
+# Check if the code is a git clone. In that case the systems switches to
+# developer mode which forces building of the Python interface with SWIG.
+AC_CHECK_FILE([.git/HEAD],
+              [from_git=yes;build_wrappers="yes"],
+              [from_git=no])
+
 # Python binding enabled?
 AC_ARG_ENABLE([python-binding],
               AS_HELP_STRING([--enable-python-binding],
@@ -1064,21 +1071,36 @@ else
   echo "  - GammaLib support             (no)    no gammalib library found"
 fi
  
+# Dump developer configuration
+if test "x$from_git" = "xyes"; then
+  echo "  * Developer configuration      (yes)"
+else
+  echo "  * End user configuration       (yes)"
+fi
+
 # Dump Python binding information
 if test "x$ac_enable_python_binding" = "xyes"; then
   if test "x$has_python" = "xyes"; then
     if test "x$has_python_h" = "xyes"; then
-      if test "x$has_wrappers" = "xyes"; then
-        if test "x$has_swig" = "xyes"; then
-          echo "  * Make Python binding          (yes)   use swig for updates"
+      if test "x$build_wrappers" = "xyes"; then
+        if test "x$has_wrappers" = "xyes"; then
+          if test "x$has_swig" = "xyes"; then
+            echo "  * Make Python binding          (yes)   use swig for updates"
+          else
+            echo "  * Make Python binding          (yes)   use wrappers"
+          fi
         else
-          echo "  * Make Python binding          (yes)   use wrappers"
+          if test "x$has_swig" = "xyes"; then
+            echo "  * Make Python binding          (yes)   use swig for building"
+          else
+            echo "  - Make Python binding          (no)    swig required to build wrappers"
+          fi
         fi
       else
-        if test "x$has_swig" = "xyes"; then
-          echo "  * Make Python binding          (yes)   use swig for building"
+        if test "x$has_wrappers" = "xyes"; then
+          echo "  - Make Python binding          (yes)   use existing wrappers"
         else
-          echo "  - Make Python binding          (no)    swig required to build wrappers"
+          echo "  - Make Python binding          (no)    wrappers not found"
         fi
       fi
     else
@@ -223,7 +223,7 @@ EXTRA_DIST = $(binscripts) $(pythonscripts) $(parfiles) \
              $(testscripts) $(testdata) $(testiactdata) \
              $(testiactevents)
  
-# Add install hook rule to create symbolic links for cscripts
+# Add install hook rule to copy cscripts without .py into the bindir
 install-data-hook:
 	@binlist='$(binscripts)';\
 	for p in $$binlist; do \
@@ -232,11 +232,11 @@ install-data-hook:
 	@linklist='$(linkscripts)';\
 	for p in $$linklist; do \
 		rm -rf "$(DESTDIR)$(bindir)/$$p"; \
-		ln -s "$(DESTDIR)$(pyexecdir)/cscripts/$$p.py" "$(DESTDIR)$(bindir)/$$p"; \
-		chmod +x "$(DESTDIR)$(pyexecdir)/cscripts/$$p.py"; \
+		cp "$(DESTDIR)$(pyexecdir)/cscripts/$$p.py" "$(DESTDIR)$(bindir)/$$p"; \
+		chmod +x "$(DESTDIR)$(bindir)/$$p"; \
 	done
  
-# Uninstall hook rule to remove the symbolic links for cscripts
+# Uninstall hook rule to remove the cscripts from the bindir
 uninstall-hook:
 	@linklist='$(linkscripts)';\
 	for p in $$linklist; do \
@@ -30,7 +30,7 @@ from testing import test
 class Test(test):
     """
     Test class for ctbin tool
-    
+
     This test class makes unit tests for the ctbin tool by using it from
     the command line and from Python.
     """
@@ -280,7 +280,7 @@ class Test(test):
     def _check_observation(self, ctbin, nevents, multiplier=1):
         """
         Check content of an observation
-        
+
         Parameters
         ----------
         ctbin : `~ctools.ctbin`
@@ -316,7 +316,7 @@ class Test(test):
     def _check_cube(self, cube, nevents, multiplier=1):
         """
         Check content of event cube
-        
+
         Parameters
         ----------
         cube : `~gammalib.GCTAEventCube`
@@ -532,5 +532,6 @@ if __name__ == &#39;__main__&#39;:
     else:
         rc = 1
  
-    # Exit with return code
-    sys.exit(rc)
+    # Raise an exception in case of failure
+    if not success:
+        raise RuntimeError('At least one error occured during the test.')
@@ -184,8 +184,9 @@ def test(installed=False, debug=False):
     if installed:
         os.system('rm -rf %s' % (path))
  
-    # Exit with return code
-    sys.exit(rc)
+    # Raise an exception in case of failure
+    if not success:
+        raise RuntimeError('At least one error occured during the test.')
  
  
 # ======================== #
@@ -2,7 +2,7 @@
 # ==========================================================================
 # This scripts performs unit tests for the ctools package
 #
-# Copyright (C) 2012-2016 Juergen Knoedlseder
+# Copyright (C) 2012-2017 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
@@ -143,8 +143,9 @@ def test(installed=False):
     if installed:
         os.system('rm -rf %s' % (path))
  
-    # Exit with return code
-    sys.exit(rc)
+    # Raise an exception in case of failure
+    if not success:
+        raise RuntimeError('At least one error occured during the test.')
  
  
 # ======================== #