[ismrmrd] 208/281: Revert "restore compatibility with numpy 1.6"

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to annotated tag ismrmrd0.5
in repository ismrmrd.

commit 02cc2f28ff5115b15461efccbed8a859339b3833
Author: Ghislain Vaillant <ghisvail at gmail.com>
Date:   Fri Feb 28 14:10:42 2014 +0000

    Revert "restore compatibility with numpy 1.6"
    
    This reverts commit 6e07c3ad5ef4f972f16b20999d931b60e05dfd53.
---
 bindings/CMakeLists.txt          | 6 +++++-
 bindings/python/ismrmrd_python.i | 5 +----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt
index 3b31948..e3ef242 100644
--- a/bindings/CMakeLists.txt
+++ b/bindings/CMakeLists.txt
@@ -8,7 +8,11 @@ if(SWIG_FOUND)
     if(PYTHONLIBS_FOUND)
         find_package(NumPy)
         if(NUMPY_FOUND)
-            add_subdirectory(python)
+            if (NUMPY_VERSION VERSION_LESS "1.7")
+                message("NumPy version < 1.7. Not building Python bindings")
+            else (${NUMPY_VERSION} VERSION_LESS "1.7")
+                add_subdirectory(python)
+            endif (NUMPY_VERSION VERSION_LESS "1.7")
         else(NUMPY_FOUND)
             message("NumPy not found. Not building Python bindings")
         endif(NUMPY_FOUND)
diff --git a/bindings/python/ismrmrd_python.i b/bindings/python/ismrmrd_python.i
index 6c784e8..e577e81 100644
--- a/bindings/python/ismrmrd_python.i
+++ b/bindings/python/ismrmrd_python.i
@@ -2,10 +2,7 @@
 
 %{
 
-// for compatibility with Numpy version <= 1.6
-#if NPY_FEATURE_VERSION < 0x00000007
-#define NPY_ARRAY_FARRAY NPY_FARRAY
-#endif
+#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
 
 #include "ismrmrd_hdf5.h"
 #include "numpy/arrayobject.h"

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