From 6c5343c696ad129b0c28879df2316b73665f1052 Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Mon, 2 Feb 2015 18:09:11 +0100 Subject: [PATCH] Do no longer import obsutils, analysisutils, plotutils scripts upon ctools import. --- ChangeLog | 8 ++++++++ NEWS | 11 +++++++---- configure.ac | 2 +- ctools.pc.in | 4 ++-- pyext/ctools/__init__.py | 6 +++--- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0e5cc32..1fef8ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2015-02-02 Juergen Knoedlseder + + * Bug fix version 0.8.2 released + ================================ + + Do not import automatically Python scripts + + 2015-01-08 Juergen Knoedlseder * Bug fix version 0.8.1 released diff --git a/NEWS b/NEWS index 0f86c85..abe143d 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,8 @@ -New Features and Important Changes in ctools 0.8.1 +New Features and Important Changes in ctools 0.8.2 Author(s) : Juergen Knoedlseder -8 January 2015 +2 February 2015 1. Introduction @@ -18,8 +18,11 @@ None 3. Python interface ------------------- -Include Python wrapper files in source code distribution (they were -missing for version 0.8.0) +The ctools module does no longer import automatically Python scripts. This +prevents to break the ctools interface in case that some dependencies in +the scripts are broken. Scripts (such as obsutils, analysisutils or plotutils) +are support scripts that may not be fully supported throughout the +development. They may be moved into a special contributions area in the future. 4. Support model diff --git a/configure.ac b/configure.ac index 5558ded..a57eb1e 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ ############################################################################# # Initialisation # ############################################################################# -AC_INIT([ctools], [0.8.1], [jurgen.knodlseder@irap.omp.eu], [ctools]) +AC_INIT([ctools], [0.8.2], [jurgen.knodlseder@irap.omp.eu], [ctools]) AC_CONFIG_SRCDIR([src/ctselect/ctselect.cpp]) AC_CONFIG_MACRO_DIR([m4]) #AM_INIT_AUTOMAKE([gnu no-dependencies]) diff --git a/ctools.pc.in b/ctools.pc.in index 180906a..ac140b8 100644 --- a/ctools.pc.in +++ b/ctools.pc.in @@ -6,9 +6,9 @@ includedir=${prefix}/include Name: ctools Description: CTA science analysis tools URL: http://cta.irap.omp.eu/ctools -Version: 0.8.1 +Version: 0.8.2 Requires: -Requires.private: gammalib >= 0.9.0 +Requires.private: gammalib >= 0.9.2 Conflicts: Cflags: -I${includedir}/ctools @OPENMP_CXXFLAGS@ Libs: -L${libdir} -lctools diff --git a/pyext/ctools/__init__.py b/pyext/ctools/__init__.py index e226be6..9c86e0f 100644 --- a/pyext/ctools/__init__.py +++ b/pyext/ctools/__init__.py @@ -1,8 +1,8 @@ # Import sub modules from .tools import * -import obsutils -import analysisutils -import plotutils +#import obsutils (require explicit from ctools import obsutils) +#import analysisutils (require explicit from ctools import obsutils) +#import plotutils (require explicit from ctools import obsutils) # Remove swig register stuff bad_entries = [entry for entry in list(locals()) -- libgit2 0.21.4