Iftach Sadeh / ctools

Commit b130ceb3d0150d2eb24980517ee18c68da80c165

Authored by Jürgen Knödlseder
1 parent 3b3748f3

Copy Python module into pyext/ctools folder (#3322)

Inline Side-by-side
Showing 6 changed files with 17 additions and 6 deletions
.gitignore
  View file @b130ceb
@@ -54,6 +54,7 @@ pyext/build/ @@ -54,6 +54,7 @@ pyext/build/
54 pyext/setup.py 54 pyext/setup.py
55 pyext/ctools/__init__.py 55 pyext/ctools/__init__.py
56 pyext/ctools/tools.py 56 pyext/ctools/tools.py
  57 +pyext/ctools/_tools.so
57 pyext/ctools/tools_wrap.cpp 58 pyext/ctools/tools_wrap.cpp
58 cscripts/__init__.py 59 cscripts/__init__.py
59 src/ctbin/ctbin 60 src/ctbin/ctbin
ChangeLog
  View file @b130ceb
1 -2020-08-19 1 +2020-08-20
2 2
3 * Bug fix version 1.7.1 released 3 * Bug fix version 1.7.1 released
4 ================================ 4 ================================
5 5
  6 + Copy Python module into pyext/ctools folder (#3322)
6 Add units to reference manual of response cube tools (#3321) 7 Add units to reference manual of response cube tools (#3321)
7 Speed-up ctbin for stacked event binning (#3275) 8 Speed-up ctbin for stacked event binning (#3275)
8 9
1 New Features and Important Changes in ctools 1.7.1 1 New Features and Important Changes in ctools 1.7.1
2 2
3 -19 August 2020 3 +20 August 2020
4 4
5 5
6 Introduction 6 Introduction
@@ -11,7 +11,9 @@ ctools release with respect to the precedent release. @@ -11,7 +11,9 @@ ctools release with respect to the precedent release.
11 11
12 Configuration 12 Configuration
13 ------------- 13 -------------
14 -None 14 +The Python module is now copied from pyext/build/ctools/ctools into
  15 +pyext/ctools since code generated using recent swig versions needs the module
  16 +in that place (#3322).
15 17
16 18
17 Documentation 19 Documentation
README.md
  View file @b130ceb
1 ctools information 1 ctools information
2 ================== 2 ==================
3 -* Version: 1.7.1 (19 August 2019) 3 +* Version: 1.7.1 (20 August 2019)
4 * GammaLib dependency: 1.7.1 4 * GammaLib dependency: 1.7.1
5 5
6 [![Build Status](https://cta-jenkins.irap.omp.eu/buildStatus/icon?job=ctools-integrate-os)](https://cta-jenkins.irap.omp.eu/job/ctools-integrate-os/) 6 [![Build Status](https://cta-jenkins.irap.omp.eu/buildStatus/icon?job=ctools-integrate-os)](https://cta-jenkins.irap.omp.eu/job/ctools-integrate-os/)
doc/source/admin/release_history/1.7.1.rst
  View file @b130ceb
1 .. _1.7.1: 1 .. _1.7.1:
2 2
3 -ctools 1.7.1 release (19 August 2020) 3 +ctools 1.7.1 release (20 August 2020)
4 ===================================== 4 =====================================
5 5
6 Overview 6 Overview
@@ -10,6 +10,8 @@ ctools 1.7.1 is a bug fix release for ctools release 1.7. @@ -10,6 +10,8 @@ ctools 1.7.1 is a bug fix release for ctools release 1.7.
10 10
11 The following bugs were fixed: 11 The following bugs were fixed:
12 12
  13 +* [`3322 <https://cta-redmine.irap.omp.eu/issues/3322>`_] -
  14 + Copy Python module into pyext/ctools folder
13 * [`3321 <https://cta-redmine.irap.omp.eu/issues/3321>`_] - 15 * [`3321 <https://cta-redmine.irap.omp.eu/issues/3321>`_] -
14 Add units to reference manual of response cube tools 16 Add units to reference manual of response cube tools
15 17
pyext/Makefile.am
  View file @b130ceb
1 ############################################################################# 1 #############################################################################
2 # Makefile for ctools Python extension module # 2 # Makefile for ctools Python extension module #
3 # ------------------------------------------------------------------------- # 3 # ------------------------------------------------------------------------- #
4 -# Copyright (C) 2011-2017 Juergen Knoedlseder # 4 +# Copyright (C) 2011-2020 Juergen Knoedlseder #
5 # ------------------------------------------------------------------------- # 5 # ------------------------------------------------------------------------- #
6 # # 6 # #
7 # This program is free software: you can redistribute it and/or modify # 7 # This program is free software: you can redistribute it and/or modify #
@@ -160,6 +160,11 @@ if IS_ELCAPITAN @@ -160,6 +160,11 @@ if IS_ELCAPITAN
160 install_name_tool -add_rpath ${GAMMALIB}/lib $$f; \ 160 install_name_tool -add_rpath ${GAMMALIB}/lib $$f; \
161 done 161 done
162 endif 162 endif
  163 + -for f in build/ctools/ctools/_*.so; do \
  164 + dst=`echo $$f | sed 's/build\/ctools\///g'`; \
  165 + cp $$f $$dst; \
  166 + echo "Copied "$$f" -> "$$dst; \
  167 + done
163 168
164 # Install the ctools Python module 169 # Install the ctools Python module
165 install-exec-local: 170 install-exec-local: