diff --git a/ChangeLog b/ChangeLog index 3cf7f61..ea8f4e9 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2020-12-02 + + * Bug fix version 1.7.3 released + ================================ + + Import matplotlib first in example scripts (#3423) + + 2020-10-15 * Bug fix version 1.7.2 released diff --git a/NEWS b/NEWS index 4d81d7e..842af27 100755 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ -New Features and Important Changes in ctools 1.7.2 +New Features and Important Changes in ctools 1.7.3 -15 October 2020 +2 December 2020 Introduction diff --git a/README.md b/README.md index 11a757e..1770430 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ctools information ================== -* Version: 1.7.2 (15 October 2020) -* GammaLib dependency: 1.7.2 +* Version: 1.7.3 (15 October 2020) +* GammaLib dependency: 1.7.3 [![Build Status](https://cta-jenkins.irap.omp.eu/buildStatus/icon?job=ctools-integrate-os)](https://cta-jenkins.irap.omp.eu/job/ctools-integrate-os/) diff --git a/configure.ac b/configure.ac index ff60426..e47d005 100755 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,7 @@ ############################################################################# # Initialisation # ############################################################################# -AC_INIT([ctools], [1.7.2], [jurgen.knodlseder@irap.omp.eu], [ctools]) +AC_INIT([ctools], [1.7.3], [jurgen.knodlseder@irap.omp.eu], [ctools]) AC_CONFIG_SRCDIR([src/ctselect/ctselect.cpp]) AC_CONFIG_MACRO_DIR([m4]) #AM_INIT_AUTOMAKE([gnu no-dependencies foreign]) diff --git a/doc/Doxyfile b/doc/Doxyfile index e9b2412..83018a6 100755 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -32,7 +32,7 @@ PROJECT_NAME = ctools # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.7.2 +PROJECT_NUMBER = 1.7.3 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/doc/source/admin/download.rst b/doc/source/admin/download.rst index 948ee2b..981a71f 100755 --- a/doc/source/admin/download.rst +++ b/doc/source/admin/download.rst @@ -3,7 +3,7 @@ Download ======== -The latest ctools release is ``ctools-1.7.2`` (15 October 2020). +The latest ctools release is ``ctools-1.7.3`` (2 December 2020). Below a table of ctools releases. Please read the :ref:`sec_release` to learn more about new features and corrected bugs in a given release. @@ -23,6 +23,9 @@ learn more about new features and corrected bugs in a given release. * - ctools - gammalib - Mac OS X (10.7+) binary disk image + * - `1.7.3 `_ + - `1.7.3 `_ + - `ctools-1.7.3-macosx10.7.dmg `_ * - `1.7.2 `_ - `1.7.2 `_ - `ctools-1.7.2-macosx10.7.dmg `_ diff --git a/doc/source/admin/release_history/1.7.3.rst b/doc/source/admin/release_history/1.7.3.rst new file mode 100644 index 0000000..48fee06 --- /dev/null +++ b/doc/source/admin/release_history/1.7.3.rst @@ -0,0 +1,14 @@ +.. _1.7.3: + +ctools 1.7.3 release (2 December 2020) +====================================== + +Overview +-------- + +ctools 1.7.3 is a bug fix release for ctools release 1.7. + +The following bugs were fixed: + +* [`3423 `_] - + Import matplotlib first in example scripts diff --git a/doc/source/admin/release_history/index.rst b/doc/source/admin/release_history/index.rst index 9c7e432..82ad680 100755 --- a/doc/source/admin/release_history/index.rst +++ b/doc/source/admin/release_history/index.rst @@ -6,6 +6,7 @@ Release History .. toctree:: :maxdepth: 1 + ctools 1.7.3 <1.7.3> ctools 1.7.2 <1.7.2> ctools 1.7.1 <1.7.1> ctools 1.7 <1.7> diff --git a/doc/source/conf.py b/doc/source/conf.py index 230f337..a38a165 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -80,7 +80,7 @@ copyright = u'2014-2019, ctools developers' version = '1.7' # The full version, including alpha/beta/rc tags. -release = '1.7.2' +release = '1.7.3' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/examples/show_butterfly.py b/examples/show_butterfly.py index 61fabc7..70eeb43 100755 --- a/examples/show_butterfly.py +++ b/examples/show_butterfly.py @@ -2,7 +2,7 @@ # ========================================================================== # Shows butterfly diagram created with ctbutterfly # -# Copyright (C) 2014-2019 Michael Mayer +# Copyright (C) 2014-2020 Michael Mayer # # 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 @@ -19,8 +19,6 @@ # # ========================================================================== import sys -import gammalib -import cscripts try: import matplotlib.pyplot as plt plt.figure() @@ -28,6 +26,8 @@ try: except (ImportError, RuntimeError): print('This script needs the "matplotlib" module') sys.exit() +import gammalib +import cscripts # ======================================== # diff --git a/examples/show_irf.py b/examples/show_irf.py index 7698fb5..3faecbb 100755 --- a/examples/show_irf.py +++ b/examples/show_irf.py @@ -2,7 +2,7 @@ # ========================================================================== # Display Instrument Response Function # -# Copyright (C) 2017-2018 Juergen Knoedlseder +# Copyright (C) 2017-2020 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 @@ -20,8 +20,6 @@ # ========================================================================== import sys import math -import gammalib -import cscripts try: import matplotlib.pyplot as plt from matplotlib import ticker @@ -31,6 +29,8 @@ try: except (ImportError, RuntimeError): print('This script needs the "matplotlib" module') sys.exit() +import gammalib +import cscripts # ========= # diff --git a/examples/show_lightcurve.py b/examples/show_lightcurve.py index 501707f..1020749 100755 --- a/examples/show_lightcurve.py +++ b/examples/show_lightcurve.py @@ -2,7 +2,7 @@ # ========================================================================== # Display lightcurve generated by cslightcrv # -# Copyright (C) 2017 Juergen Knoedlseder +# Copyright (C) 2017-2020 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 @@ -19,8 +19,6 @@ # # ========================================================================== import sys -import gammalib -import cscripts try: import matplotlib.pyplot as plt plt.figure() @@ -28,6 +26,8 @@ try: except (ImportError, RuntimeError): print('This script needs the "matplotlib" module') sys.exit() +import gammalib +import cscripts # =============== # diff --git a/examples/show_model.py b/examples/show_model.py index b57531d..306a5f4 100755 --- a/examples/show_model.py +++ b/examples/show_model.py @@ -2,7 +2,7 @@ # ========================================================================== # Shows the photon spectrum of a model # -# Copyright (C) 2015-2016 Juergen Knoedlseder +# Copyright (C) 2015-2020 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 @@ -19,8 +19,6 @@ # # ========================================================================== import sys -import gammalib -import cscripts try: import matplotlib.pyplot as plt plt.figure() @@ -28,6 +26,8 @@ try: except (ImportError, RuntimeError): print('This script needs the "matplotlib" module') sys.exit() +import gammalib +import cscripts # ======================= # diff --git a/examples/show_obs.py b/examples/show_obs.py index 1cb6de7..fe1a174 100755 --- a/examples/show_obs.py +++ b/examples/show_obs.py @@ -2,7 +2,7 @@ # ========================================================================== # Display summary of observation definition XML file # -# Copyright (C) 2016 Michael Mayer +# Copyright (C) 2016-2020 Michael Mayer # # 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 @@ -19,8 +19,6 @@ # # ========================================================================== import sys -import gammalib -import cscripts try: import matplotlib.pyplot as plt plt.figure() @@ -28,6 +26,8 @@ try: except (ImportError, RuntimeError): print('This script needs the "matplotlib" module') sys.exit() +import gammalib +import cscripts # ==================== # diff --git a/examples/show_pha.py b/examples/show_pha.py index 7aa2404..b862fb8 100755 --- a/examples/show_pha.py +++ b/examples/show_pha.py @@ -2,7 +2,7 @@ # ========================================================================== # Show a spectrum in PHA format # -# Copyright (C) 2013-2016 Juergen Knoedlseder +# Copyright (C) 2013-2020 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 @@ -20,8 +20,6 @@ # ========================================================================== import sys import math -import gammalib -import cscripts try: import matplotlib.pyplot as plt plt.figure() @@ -29,6 +27,8 @@ try: except (ImportError, RuntimeError): print('This script needs the "matplotlib" module') sys.exit() +import gammalib +import cscripts # ================= # diff --git a/examples/show_phases.py b/examples/show_phases.py index f7c58ee..476636d 100755 --- a/examples/show_phases.py +++ b/examples/show_phases.py @@ -2,7 +2,7 @@ # ========================================================================== # Display phase information from event list # -# Copyright (C) 2017 Juergen Knoedlseder +# Copyright (C) 2017-2020 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 @@ -19,8 +19,6 @@ # # ========================================================================== import sys -import gammalib -import cscripts try: import matplotlib.pyplot as plt plt.figure() @@ -28,6 +26,8 @@ try: except (ImportError, RuntimeError): print('This script needs the "matplotlib" module') sys.exit() +import gammalib +import cscripts # =========== # diff --git a/examples/show_pointings.py b/examples/show_pointings.py index 02c4b96..7db62a7 100755 --- a/examples/show_pointings.py +++ b/examples/show_pointings.py @@ -2,7 +2,7 @@ # ========================================================================== # Display pointings in observation definition XML file # -# Copyright (C) 2017 Juergen Knoedlseder +# Copyright (C) 2017-2020 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 @@ -19,8 +19,6 @@ # # ========================================================================== import sys -import gammalib -import cscripts try: import matplotlib.pyplot as plt plt.figure() @@ -28,6 +26,8 @@ try: except (ImportError, RuntimeError): print('This script needs the "matplotlib" module') sys.exit() +import gammalib +import cscripts # =============================== # diff --git a/examples/show_pull_evolution.py b/examples/show_pull_evolution.py index 4920388..ba9cf40 100755 --- a/examples/show_pull_evolution.py +++ b/examples/show_pull_evolution.py @@ -2,7 +2,7 @@ # ========================================================================== # Shows the evolution of the mean and rms pull # -# Copyright (C) 2015-2017 Juergen Knoedlseder +# Copyright (C) 2015-2020 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 @@ -19,7 +19,6 @@ # # ========================================================================== import sys -import cscripts try: import matplotlib.pyplot as plt plt.figure() @@ -32,6 +31,7 @@ try: except ImportError: print('This script needs the "numpy" module') sys.exit() +import cscripts # =================== # diff --git a/examples/show_pull_histogram.py b/examples/show_pull_histogram.py index 57d96bb..e90fb82 100755 --- a/examples/show_pull_histogram.py +++ b/examples/show_pull_histogram.py @@ -2,7 +2,7 @@ # ========================================================================== # Shows the pull histogram # -# Copyright (C) 2011-2017 Juergen Knoedlseder +# Copyright (C) 2011-2020 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 @@ -19,7 +19,6 @@ # # ========================================================================== import sys -import cscripts try: import matplotlib.pyplot as plt plt.figure() @@ -32,6 +31,7 @@ try: except ImportError: print('This script needs the "numpy" module') sys.exit() +import cscripts # =================== # diff --git a/examples/show_residuals.py b/examples/show_residuals.py index c992f42..2042e11 100755 --- a/examples/show_residuals.py +++ b/examples/show_residuals.py @@ -2,7 +2,7 @@ # ========================================================================== # Display residuals generated by csresspec # -# Copyright (C) 2017-2019 Luigi Tibaldo +# Copyright (C) 2017-2020 Luigi Tibaldo # # 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 @@ -20,8 +20,6 @@ # ========================================================================== import sys import math -import gammalib -import cscripts try: import matplotlib.pyplot as plt plt.figure() @@ -29,6 +27,8 @@ try: except (ImportError, RuntimeError): print('This script needs the "matplotlib" module') sys.exit() +import gammalib +import cscripts # ======================= # diff --git a/examples/show_response.py b/examples/show_response.py index bc7290b..9d6b422 100755 --- a/examples/show_response.py +++ b/examples/show_response.py @@ -2,7 +2,7 @@ # ========================================================================== # Shows one or several CTA response functions. # -# Copyright (C) 2014-2017 Juergen Knoedlseder +# Copyright (C) 2014-2020 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 @@ -20,8 +20,6 @@ # ========================================================================== import sys import math -import gammalib -import cscripts try: import matplotlib.pyplot as plt plt.figure() @@ -29,6 +27,8 @@ try: except (ImportError, RuntimeError): print('This script needs the "matplotlib" module') sys.exit() +import gammalib +import cscripts # ================================== # diff --git a/examples/show_rmf.py b/examples/show_rmf.py index 83479db..7790e97 100755 --- a/examples/show_rmf.py +++ b/examples/show_rmf.py @@ -2,7 +2,7 @@ # ========================================================================== # Display Redistribution Matrix File # -# Copyright (C) 2018-2019 Juergen Knoedlseder +# Copyright (C) 2018-2020 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 @@ -19,8 +19,6 @@ # # ========================================================================== import sys -import gammalib -import cscripts try: import matplotlib.pyplot as plt plt.figure() @@ -28,6 +26,8 @@ try: except (ImportError, RuntimeError): print('This script needs the "matplotlib" module') sys.exit() +import gammalib +import cscripts # ======== # diff --git a/examples/show_sensitivity.py b/examples/show_sensitivity.py index 7aea2c1..ff4b94c 100755 --- a/examples/show_sensitivity.py +++ b/examples/show_sensitivity.py @@ -2,7 +2,7 @@ # ========================================================================== # Display differential sensitivity plot generated by cssens # -# Copyright (C) 2015-2017 Juergen Knoedlseder +# Copyright (C) 2015-2020 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 @@ -20,8 +20,6 @@ # ========================================================================== import sys import math -import gammalib -import cscripts try: import matplotlib.pyplot as plt plt.figure() @@ -29,6 +27,8 @@ try: except (ImportError, RuntimeError): print('This script needs the "matplotlib" module') sys.exit() +import gammalib +import cscripts # ===================== # diff --git a/examples/show_significance_distribution.py b/examples/show_significance_distribution.py index 20d88af..3bcdefd 100755 --- a/examples/show_significance_distribution.py +++ b/examples/show_significance_distribution.py @@ -2,7 +2,7 @@ # ========================================================================== # Shows the distribution of significances in a given significance map. # -# Copyright (C) 2018-2019 Andreas Specovius +# Copyright (C) 2018-2020 Andreas Specovius # # 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 @@ -46,8 +46,6 @@ # ========================================================================== import sys import math -import gammalib -import cscripts try: import matplotlib.pyplot as plt plt.figure() @@ -60,6 +58,8 @@ try: except ImportError: print('This script needs the "numpy" module') sys.exit() +import gammalib +import cscripts # ======================= # diff --git a/examples/show_spectrum.py b/examples/show_spectrum.py index a199795..0b91071 100755 --- a/examples/show_spectrum.py +++ b/examples/show_spectrum.py @@ -19,8 +19,6 @@ # # ========================================================================== import sys -import gammalib -import cscripts try: import matplotlib.pyplot as plt plt.figure() @@ -33,6 +31,8 @@ try: except ImportError: print('This script needs the "numpy" module') sys.exit() +import gammalib +import cscripts # ===================================== # diff --git a/examples/show_ts_distribution.py b/examples/show_ts_distribution.py index 0a89da8..5bf4998 100755 --- a/examples/show_ts_distribution.py +++ b/examples/show_ts_distribution.py @@ -2,7 +2,7 @@ # ========================================================================== # Display TS distribution generated by cstsdist # -# Copyright (C) 2011-2017 Jurgen Knodlseder +# Copyright (C) 2011-2020 Jurgen Knodlseder # # 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 @@ -21,7 +21,6 @@ import sys import csv import math -import cscripts try: import matplotlib.pyplot as plt plt.figure() @@ -34,6 +33,7 @@ try: except ImportError: print('This script needs the "numpy" module') sys.exit() +import cscripts # ==================== # diff --git a/examples/show_variability_evolution.py b/examples/show_variability_evolution.py index e1adfc8..811b088 100755 --- a/examples/show_variability_evolution.py +++ b/examples/show_variability_evolution.py @@ -2,7 +2,7 @@ # ========================================================================== # Shows source variability evolution created with ctfindvar # -# Copyright (C) 2018 Simon Bonnefoy +# Copyright (C) 2018-2020 Simon Bonnefoy # # 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 @@ -19,8 +19,6 @@ # # ========================================================================== import sys -import gammalib -import cscripts try: import matplotlib.pyplot as plt plt.figure() @@ -28,6 +26,8 @@ try: except (ImportError, RuntimeError): print('This script needs the "matplotlib" module') sys.exit() +import gammalib +import cscripts # ========================== # diff --git a/examples/show_viscube.py b/examples/show_viscube.py index 6f9d711..9ed14ed 100755 --- a/examples/show_viscube.py +++ b/examples/show_viscube.py @@ -2,7 +2,7 @@ # ========================================================================== # Show visibility cube # -# Copyright (C) 2019 Juergen Knoedlseder +# Copyright (C) 2019-2020 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 @@ -19,8 +19,6 @@ # # ========================================================================== import sys -import gammalib -import cscripts try: import matplotlib.pyplot as plt plt.figure() @@ -28,6 +26,8 @@ try: except (ImportError, RuntimeError): print('This script needs the "matplotlib" module') sys.exit() +import gammalib +import cscripts # =========================== # diff --git a/sonar-project.properties b/sonar-project.properties index f166166..fb04049 100755 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,7 +1,7 @@ # Required metadata sonar.projectKey=ctools sonar.projectName=ctools -sonar.projectVersion=1.7.2 +sonar.projectVersion=1.7.3 # Description sonar.projectDescription="Cherenkov Telescope Array Science Analysis Software"