[segyio] 01/04: New upstream version 1.3.8

[Jørgen Kvalsvik]

This is an automated email from the git hooks/post-receive script.

jokva-guest pushed a commit to annotated tag debian/1.3.8-1
in repository segyio.

commit 766dd3731934603443b5eeab29342e207eab40cb
Author: Jørgen Kvalsvik <jokva at statoil.com>
Date:   Sat Nov 25 13:01:04 2017 +0100

    New upstream version 1.3.8
---
 .travis.yml              |  2 ++
 changelog.md             |  7 +++++++
 python/CMakeLists.txt    | 19 +++++++++++++++++--
 python/segyio/version.py |  2 +-
 setup.py                 |  4 ++--
 5 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 847e839..ac009a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,12 +62,14 @@ install:
         brew update && brew install cppcheck;
     fi
   - pip install -r requirements.txt
+  - pip install bandit
 
 before_script:
   - enabled="-DBUILD_PYTHON=OFF -DBUILD_MEX=OFF"
   - if [[ -n "${MB_PYTHON_VERSION+1}" ]]; then
         enabled="$enabled -DBUILD_PYTHON=ON -DREQUIRE_PYTHON=ON";
     fi
+  - bandit -r python
   - cmake --version
   - mkdir build
   - pushd build
diff --git a/changelog.md b/changelog.md
index f3f3cb6..63699d4 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,10 @@
+# 1.3.8
+* Automate python ast analysis with bandit on travis
+* The installed python extension is built without rpath
+* The numpy minimum requirement is handled in setup.py
+* The python installation layout can be configured via cmake
+  e.g. -DPYTHON_INSTALL_LAYOUT=deb
+
 # 1.3.7
 * Makefiles can turn off version detection from git from env or via args
 
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 6a9dd7d..8f7e091 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -20,14 +20,22 @@ if (NOT PYTHON_EXECUTABLE)
     return()
 endif()
 
+if (PYTHON_INSTALL_LAYOUT)
+    set(setup-install-layout --install-layout ${PYTHON_INSTALL_LAYOUT})
+endif()
+
 set(python ${PYTHON_EXECUTABLE})
 
 if (NOT WIN32)
-    # setuptools on microsoft compilers doesn't support the --library-dir flag
-    # and crashes, so only pass it on non-microsoft platforms
+    # setuptools on microsoft compilers doesn't support the --library-dir or
+    # --buil-dir flag and crashes, so only pass it on non-microsoft platforms
     set(setup-py-libdir build_ext
                             --rpath        $<TARGET_FILE_DIR:segyio-shared>
                             --library-dirs $<TARGET_FILE_DIR:segyio-shared>)
+
+    set(install-no-rpath install_lib --build-dir build/install)
+    set(build-no-rpath --library-dirs $<TARGET_FILE_DIR:segyio-shared>
+                       build --build-lib build/install)
 endif ()
 
 set(setup-py ${CMAKE_SOURCE_DIR}/setup.py)
@@ -63,6 +71,11 @@ add_custom_target(
     # install the lib in the build-dir so that the examples can load that from
     # current working dir
     COMMAND ${python} ${setup-py} ${setup-py-libdir} install_lib -d .
+
+    # to maintain good make && make install behaviour, the extension is built
+    # twice, one with rpath (for testing and build-dir-local) and one for
+    # installation
+    COMMAND ${python} ${setup-py} build_ext ${build-no-rpath}
 )
 
 add_dependencies(segyio-python segyio-shared)
@@ -82,9 +95,11 @@ execute_process(COMMAND
 ${python} ${setup-py}
     install_egg_info --install-dir .
     egg_info --egg-base .
+    ${install-no-rpath}
     install --prefix=${CMAKE_INSTALL_PREFIX}
             --single-version-externally-managed
             --record installed-files
+            ${setup-install-layout}
             \${root_destdir}
 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 )")
diff --git a/python/segyio/version.py b/python/segyio/version.py
index 7005c3e..f8118c5 100644
--- a/python/segyio/version.py
+++ b/python/segyio/version.py
@@ -1 +1 @@
-version = '1.3.7'
+version = '1.3.8'
diff --git a/setup.py b/setup.py
index 29c03c0..7bac141 100644
--- a/setup.py
+++ b/setup.py
@@ -102,8 +102,8 @@ setup(name='segyio',
         libraries=['segyio'] + extra_libs
         )],
       platforms='any',
-      requires=['numpy'],
-      install_requires=['numpy'],
+      requires=['numpy(>=1.10)'],
+      install_requires=['numpy(>=1.10)'],
       test_suite='test',
       setup_requires=['setuptools_scm'],
       classifiers=[

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/segyio.git