Lili Yang / ctools

Commit 6c5343c696ad129b0c28879df2316b73665f1052

Authored by Jürgen Knödlseder
1 parent 033ed45c

Do no longer import obsutils, analysisutils, plotutils scripts upon ctools import.

Inline Side-by-side
Showing 5 changed files with 21 additions and 10 deletions
ChangeLog
  View file @6c5343c
  1 +2015-02-02 Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu>
  2 +
  3 + * Bug fix version 0.8.2 released
  4 + ================================
  5 +
  6 + Do not import automatically Python scripts
  7 +
  8 +
1 2015-01-08 Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu> 9 2015-01-08 Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu>
2 10
3 * Bug fix version 0.8.1 released 11 * Bug fix version 0.8.1 released
1 -New Features and Important Changes in ctools 0.8.1 1 +New Features and Important Changes in ctools 0.8.2
2 2
3 Author(s) : Juergen Knoedlseder 3 Author(s) : Juergen Knoedlseder
4 4
5 -8 January 2015 5 +2 February 2015
6 6
7 7
8 1. Introduction 8 1. Introduction
@@ -18,8 +18,11 @@ None @@ -18,8 +18,11 @@ None
18 18
19 3. Python interface 19 3. Python interface
20 ------------------- 20 -------------------
21 -Include Python wrapper files in source code distribution (they were  
22 -missing for version 0.8.0) 21 +The ctools module does no longer import automatically Python scripts. This
  22 +prevents to break the ctools interface in case that some dependencies in
  23 +the scripts are broken. Scripts (such as obsutils, analysisutils or plotutils)
  24 +are support scripts that may not be fully supported throughout the
  25 +development. They may be moved into a special contributions area in the future.
23 26
24 27
25 4. Support model 28 4. Support model
configure.ac
  View file @6c5343c
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 ############################################################################# 29 #############################################################################
30 # Initialisation # 30 # Initialisation #
31 ############################################################################# 31 #############################################################################
32 -AC_INIT([ctools], [0.8.1], [jurgen.knodlseder@irap.omp.eu], [ctools]) 32 +AC_INIT([ctools], [0.8.2], [jurgen.knodlseder@irap.omp.eu], [ctools])
33 AC_CONFIG_SRCDIR([src/ctselect/ctselect.cpp]) 33 AC_CONFIG_SRCDIR([src/ctselect/ctselect.cpp])
34 AC_CONFIG_MACRO_DIR([m4]) 34 AC_CONFIG_MACRO_DIR([m4])
35 #AM_INIT_AUTOMAKE([gnu no-dependencies]) 35 #AM_INIT_AUTOMAKE([gnu no-dependencies])
ctools.pc.in
  View file @6c5343c
@@ -6,9 +6,9 @@ includedir=${prefix}/include @@ -6,9 +6,9 @@ includedir=${prefix}/include
6 Name: ctools 6 Name: ctools
7 Description: CTA science analysis tools 7 Description: CTA science analysis tools
8 URL: http://cta.irap.omp.eu/ctools 8 URL: http://cta.irap.omp.eu/ctools
9 -Version: 0.8.1 9 +Version: 0.8.2
10 Requires: 10 Requires:
11 -Requires.private: gammalib >= 0.9.0 11 +Requires.private: gammalib >= 0.9.2
12 Conflicts: 12 Conflicts:
13 Cflags: -I${includedir}/ctools @OPENMP_CXXFLAGS@ 13 Cflags: -I${includedir}/ctools @OPENMP_CXXFLAGS@
14 Libs: -L${libdir} -lctools 14 Libs: -L${libdir} -lctools
pyext/ctools/__init__.py
  View file @6c5343c
1 # Import sub modules 1 # Import sub modules
2 from .tools import * 2 from .tools import *
3 -import obsutils  
4 -import analysisutils  
5 -import plotutils 3 +#import obsutils (require explicit from ctools import obsutils)
  4 +#import analysisutils (require explicit from ctools import obsutils)
  5 +#import plotutils (require explicit from ctools import obsutils)
6 6
7 # Remove swig register stuff 7 # Remove swig register stuff
8 bad_entries = [entry for entry in list(locals()) 8 bad_entries = [entry for entry in list(locals())