Integrate code.

Jürgen Knödlseder
1 parent 47f56461
Showing 4 changed files with 16 additions and 11 deletions
ChangeLog
NEWS
cscripts/Makefile.am
cscripts/tests/test_unbinned.py
@@ -3,6 +3,7 @@
         * Version 0.10.0 released
         =========================
  
+        Add tests for installed ctools version (#1486)
         Create cscripts Python module, move obsutils in that module (#1470)
         Add csinfo script (#1489)
         Removed obsutils.spectrum() function (replaced by csspec)
@@ -22,13 +22,18 @@ None
 A specific cscripts Python module has been created for cscripts. This module
 can be imported using
  
-    import cscripts
+    >>> import cscripts
  
 The obsutils utility functions have also been moved into the scripts folder.
  
 The obsutils.spectrum() function has been removed as it is now replaced by the
 csspec script.
  
+Some tests for the installed ctools package have been added. They can be
+executed by typing the following under Python:
+
+    >>> cscripts.test()
+
  
 4. Support model
 ----------------
@@ -5,31 +5,30 @@
 #             tsmerge.py
 binscripts = tsmerge.py
  
-# Scripts to be distributed in pythondir
+# Scripts to be distributed in $(pythondir)/cscripts
 pythonscripts = __init__.py \
                 cspull.py cssens.py cstsdist.py cscaldb.py csresmap.py \
                 cshessobs.py csobsdef.py csspec.py cslightcrv.py \
                 csinfo.py \
                 obsutils.py
  
+# Test scripts to be distributed in $(pythondir)/cscripts/tests
+testscripts = tests/__init__.py \
+              tests/test_unbinned.py
+
 # Scripts for which symbolic links will be created in bindir
 linkscripts = cspull cssens cstsdist cscaldb csresmap \
               cshessobs csobsdef csspec cslightcrv \
               csinfo
  
-testscripts = tests/__init__.py \
-              tests/test_unbinned.py \
-              tests/test_binned.py
-
-
 # Distribute scripts
 EXTRA_DIST         = $(binscripts) $(pythonscripts) $(testscripts)
 binscriptsdir      = $(bindir)
 binscripts_DATA    = $(binscripts)
 pythonscriptsdir   = $(pythondir)/cscripts
 pythonscripts_DATA = $(pythonscripts)
-testscriptsdir   = $(pythondir)/cscripts/tests
-testscripts_DATA = $(testscripts)
+testscriptsdir     = $(pythondir)/cscripts/tests
+testscripts_DATA   = $(testscripts)
  
 # Add hook rule to create symbolic links for cscripts
 install-data-hook:
@@ -15,9 +15,9 @@ class TestUnbinnedAnalysis(unittest.TestCase):
     """
  
     def setUp(self):
-        gammalib_dir = os.environ['GAMMALIB']
+        gammalib_dir    = os.environ['GAMMALIB']
         self.model_name = os.path.join(gammalib_dir, "share/models/crab.xml")
-        self.workdir = mkdtemp()
+        self.workdir    = mkdtemp()
  
     def test_unbinned_fits(self):
         """