From 58732e19f9ad473e6070bee8890a001489ac301c Mon Sep 17 00:00:00 2001
From: Jürgen Knödlseder <jurgen.knodlseder@irap.omp.eu>
Date: Fri, 27 Jul 2018 12:24:01 +0200
Subject: [PATCH] Do no longer automatically import csroot2caldb (#2652)

---
 ChangeLog                                | 3 ++-
 NEWS                                     | 7 +++++--
 cscripts/__init__.py.in                  | 1 -
 cscripts/ioutils.py                      | 1 -
 doc/source/admin/release_history/1.6.rst | 2 ++
 test/test_csroot2caldb.py                | 5 +++--
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index db63bd9..8b8d43f 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,9 @@
-2018-07-25
+2018-07-27
 
         * Version 1.6.0 released
         ========================
 
+        Do no longer automatically import csroot2caldb (#2652)
         Transparently update parameter files (#2513)
         Change formula for number of true energy bins in csphagen (#2490)
         Remove ctools::is_valid_filename() method
diff --git a/NEWS b/NEWS
index ba7a1bd..801c9e2 100755
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 New Features and Important Changes in ctools 1.6.0
 
-25 July 2018
+27 July 2018
 
 
 Introduction
@@ -288,7 +288,10 @@ parameter due to a bug in the code. This bug was fixed (#2448).
 
 csroot2caldb - Generates calibration database from ROOT file
 ------------------------------------------------------------
-None
+The script is no longer automatically imported by a "import cscript" statement
+since this led to some conflicts with the "--help" option due to the automatic
+opening of a X windows link. To use the tool in Python, use
+"from cscripts.csroot2caldb import csroot2caldb" (#2652).
 
 
 cssens - Computes sensitivity curve
diff --git a/cscripts/__init__.py.in b/cscripts/__init__.py.in
index 91aaa4c..fc13630 100755
--- a/cscripts/__init__.py.in
+++ b/cscripts/__init__.py.in
@@ -80,7 +80,6 @@ from cscripts.csphasecrv    import csphasecrv
 from cscripts.cspull        import cspull
 from cscripts.csresmap      import csresmap
 from cscripts.csresspec     import csresspec
-from cscripts.csroot2caldb  import csroot2caldb
 from cscripts.cssens        import cssens
 from cscripts.csspec        import csspec
 from cscripts.cssrcdetect   import cssrcdetect
diff --git a/cscripts/ioutils.py b/cscripts/ioutils.py
index bb7b096..6a36505 100755
--- a/cscripts/ioutils.py
+++ b/cscripts/ioutils.py
@@ -20,7 +20,6 @@
 import csv
 import sys
 import gammalib
-#import ctools
 
 
 # ========================= #
diff --git a/doc/source/admin/release_history/1.6.rst b/doc/source/admin/release_history/1.6.rst
index 843178a..099c2e2 100644
--- a/doc/source/admin/release_history/1.6.rst
+++ b/doc/source/admin/release_history/1.6.rst
@@ -19,6 +19,8 @@ In particular, this release provides:
 Bug fixes
 ---------
 
+* [`2652 <https://cta-redmine.irap.omp.eu/issues/2652>`_] -
+  Do no longer automatically import :ref:`csroot2caldb`
 * [`2456 <https://cta-redmine.irap.omp.eu/issues/2456>`_] -
   Handle zero model for ``SUBDIV method`` in ``show_response.py``
 * [`2448 <https://cta-redmine.irap.omp.eu/issues/2448>`_] -
diff --git a/test/test_csroot2caldb.py b/test/test_csroot2caldb.py
index ca7f0dc..1d2fbf7 100755
--- a/test/test_csroot2caldb.py
+++ b/test/test_csroot2caldb.py
@@ -19,7 +19,7 @@
 #
 # ==========================================================================
 import os
-import cscripts
+from cscripts.csroot2caldb import csroot2caldb
 from testing import test
 
 
@@ -98,7 +98,8 @@ class Test(test):
         """
         # Set-up csroot2caldb with a maximum of parameters so that the
         # corresponding code gets tests
-        caldb = cscripts.csroot2caldb()
+        #caldb = cscripts.csroot2caldb()
+        caldb = csroot2caldb()
         caldb['infile']        = self._infile
         caldb['outdir']        = 'csroot2caldb_py1'
         caldb['inst']          = 'prod3'
--
libgit2 0.21.4