From b130ceb3d0150d2eb24980517ee18c68da80c165 Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Thu, 20 Aug 2020 14:54:36 +0200 Subject: [PATCH] Copy Python module into pyext/ctools folder (#3322) --- .gitignore | 1 + ChangeLog | 3 ++- NEWS | 6 ++++-- README.md | 2 +- doc/source/admin/release_history/1.7.1.rst | 4 +++- pyext/Makefile.am | 7 ++++++- 6 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 2224049..ac6551d 100755 --- a/.gitignore +++ b/.gitignore @@ -54,6 +54,7 @@ pyext/build/ pyext/setup.py pyext/ctools/__init__.py pyext/ctools/tools.py +pyext/ctools/_tools.so pyext/ctools/tools_wrap.cpp cscripts/__init__.py src/ctbin/ctbin diff --git a/ChangeLog b/ChangeLog index ffad0c4..35f13ca 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,9 @@ -2020-08-19 +2020-08-20 * Bug fix version 1.7.1 released ================================ + Copy Python module into pyext/ctools folder (#3322) Add units to reference manual of response cube tools (#3321) Speed-up ctbin for stacked event binning (#3275) diff --git a/NEWS b/NEWS index 7f6eecd..ce314c9 100755 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ New Features and Important Changes in ctools 1.7.1 -19 August 2020 +20 August 2020 Introduction @@ -11,7 +11,9 @@ ctools release with respect to the precedent release. Configuration ------------- -None +The Python module is now copied from pyext/build/ctools/ctools into +pyext/ctools since code generated using recent swig versions needs the module +in that place (#3322). Documentation diff --git a/README.md b/README.md index 69442e2..5173350 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ctools information ================== -* Version: 1.7.1 (19 August 2019) +* Version: 1.7.1 (20 August 2019) * GammaLib dependency: 1.7.1 [![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/doc/source/admin/release_history/1.7.1.rst b/doc/source/admin/release_history/1.7.1.rst index e281afe..2b335ba 100644 --- a/doc/source/admin/release_history/1.7.1.rst +++ b/doc/source/admin/release_history/1.7.1.rst @@ -1,6 +1,6 @@ .. _1.7.1: -ctools 1.7.1 release (19 August 2020) +ctools 1.7.1 release (20 August 2020) ===================================== Overview @@ -10,6 +10,8 @@ ctools 1.7.1 is a bug fix release for ctools release 1.7. The following bugs were fixed: +* [`3322 `_] - + Copy Python module into pyext/ctools folder * [`3321 `_] - Add units to reference manual of response cube tools diff --git a/pyext/Makefile.am b/pyext/Makefile.am index b576b13..351ef2c 100755 --- a/pyext/Makefile.am +++ b/pyext/Makefile.am @@ -1,7 +1,7 @@ ############################################################################# # Makefile for ctools Python extension module # # ------------------------------------------------------------------------- # -# Copyright (C) 2011-2017 Juergen Knoedlseder # +# Copyright (C) 2011-2020 Juergen Knoedlseder # # ------------------------------------------------------------------------- # # # # This program is free software: you can redistribute it and/or modify # @@ -160,6 +160,11 @@ if IS_ELCAPITAN install_name_tool -add_rpath ${GAMMALIB}/lib $$f; \ done endif + -for f in build/ctools/ctools/_*.so; do \ + dst=`echo $$f | sed 's/build\/ctools\///g'`; \ + cp $$f $$dst; \ + echo "Copied "$$f" -> "$$dst; \ + done # Install the ctools Python module install-exec-local: -- libgit2 0.21.4