[eccodes] 69/106: Fixes for python3

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository eccodes.

commit adb6538180dcac128f36d70d63b13e38b188b746
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Dec 5 21:17:40 2016 +0000

    Fixes for python3
---
 debian/patches/python3.patch | 61 +++++++++++++++++++++++++++-----------------
 debian/rules                 |  1 +
 2 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index f960336..d3b98b4 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -3,10 +3,10 @@ Description: Support for Python3
 Forwarded: no
 Last-Updated: 2016-04-30
 
-Index: eccodes-2.0.0/python/test_iterator.py
+Index: eccodes-2.0.2/python/test_iterator.py
 ===================================================================
---- eccodes-2.0.0.orig/python/test_iterator.py
-+++ eccodes-2.0.0/python/test_iterator.py
+--- eccodes-2.0.2.orig/python/test_iterator.py
++++ eccodes-2.0.2/python/test_iterator.py
 @@ -1,7 +1,8 @@
  #!/usr/bin/env python
  
@@ -33,10 +33,10 @@ Index: eccodes-2.0.0/python/test_iterator.py
          grib_iterator_delete(iterid)
          grib_release(gid)
  
-Index: eccodes-2.0.0/python/test_index.py
+Index: eccodes-2.0.2/python/test_index.py
 ===================================================================
---- eccodes-2.0.0.orig/python/test_index.py
-+++ eccodes-2.0.0/python/test_index.py
+--- eccodes-2.0.2.orig/python/test_index.py
++++ eccodes-2.0.2/python/test_index.py
 @@ -1,7 +1,8 @@
  #!/usr/bin/env python
  
@@ -113,10 +113,10 @@ Index: eccodes-2.0.0/python/test_index.py
      main()
 -    #print "------------------------------------"
 +    #print ("------------------------------------")
-Index: eccodes-2.0.0/python/test_keysiterator.py
+Index: eccodes-2.0.2/python/test_keysiterator.py
 ===================================================================
---- eccodes-2.0.0.orig/python/test_keysiterator.py
-+++ eccodes-2.0.0/python/test_keysiterator.py
+--- eccodes-2.0.2.orig/python/test_keysiterator.py
++++ eccodes-2.0.2/python/test_keysiterator.py
 @@ -1,7 +1,8 @@
  #!/usr/bin/env python
  
@@ -140,10 +140,10 @@ Index: eccodes-2.0.0/python/test_keysiterator.py
  fid.close()
 -
 -
-Index: eccodes-2.0.0/python/test_general.py
+Index: eccodes-2.0.2/python/test_general.py
 ===================================================================
---- eccodes-2.0.0.orig/python/test_general.py
-+++ eccodes-2.0.0/python/test_general.py
+--- eccodes-2.0.2.orig/python/test_general.py
++++ eccodes-2.0.2/python/test_general.py
 @@ -1,7 +1,8 @@
  #!/usr/bin/env python
  
@@ -305,10 +305,10 @@ Index: eccodes-2.0.0/python/test_general.py
      main()
 -    print "------------------------------------"
 +    print ("------------------------------------")
-Index: eccodes-2.0.0/python/test_extra.py
+Index: eccodes-2.0.2/python/test_extra.py
 ===================================================================
---- eccodes-2.0.0.orig/python/test_extra.py
-+++ eccodes-2.0.0/python/test_extra.py
+--- eccodes-2.0.2.orig/python/test_extra.py
++++ eccodes-2.0.2/python/test_extra.py
 @@ -1,6 +1,7 @@
  #!/usr/bin/env python
  
@@ -360,10 +360,10 @@ Index: eccodes-2.0.0/python/test_extra.py
  
      grib_write(gid,oid)
  
-Index: eccodes-2.0.0/examples/python/keys_iterator_gts.py
+Index: eccodes-2.0.2/examples/python/keys_iterator_gts.py
 ===================================================================
---- eccodes-2.0.0.orig/examples/python/keys_iterator_gts.py
-+++ eccodes-2.0.0/examples/python/keys_iterator_gts.py
+--- eccodes-2.0.2.orig/examples/python/keys_iterator_gts.py
++++ eccodes-2.0.2/examples/python/keys_iterator_gts.py
 @@ -9,6 +9,7 @@
  # nor does it submit to any jurisdiction.
  #
@@ -391,10 +391,10 @@ Index: eccodes-2.0.0/examples/python/keys_iterator_gts.py
  
          return 1
  
-Index: eccodes-2.0.0/examples/python/keys_iterator_bufr.py
+Index: eccodes-2.0.2/examples/python/keys_iterator_bufr.py
 ===================================================================
---- eccodes-2.0.0.orig/examples/python/keys_iterator_bufr.py
-+++ eccodes-2.0.0/examples/python/keys_iterator_bufr.py
+--- eccodes-2.0.2.orig/examples/python/keys_iterator_bufr.py
++++ eccodes-2.0.2/examples/python/keys_iterator_bufr.py
 @@ -9,6 +9,7 @@
  # nor does it submit to any jurisdiction.
  #
@@ -403,10 +403,10 @@ Index: eccodes-2.0.0/examples/python/keys_iterator_bufr.py
  import traceback
  import sys
  
-Index: eccodes-2.0.0/examples/python/binary_message.py
+Index: eccodes-2.0.2/examples/python/binary_message.py
 ===================================================================
---- eccodes-2.0.0.orig/examples/python/binary_message.py
-+++ eccodes-2.0.0/examples/python/binary_message.py
+--- eccodes-2.0.2.orig/examples/python/binary_message.py
++++ eccodes-2.0.2/examples/python/binary_message.py
 @@ -9,6 +9,7 @@
  # nor does it submit to any jurisdiction.
  #
@@ -415,3 +415,16 @@ Index: eccodes-2.0.0/examples/python/binary_message.py
  import traceback
  import sys
  
+Index: eccodes-2.0.2/python/gribapi/gribapi.py
+===================================================================
+--- eccodes-2.0.2.orig/python/gribapi/gribapi.py
++++ eccodes-2.0.2/python/gribapi/gribapi.py
+@@ -22,7 +22,7 @@ When this is enabed, then the system Pyt
+     - NumPy
+ 
+ """
+-import gribapi_swig as _internal
++from . import gribapi_swig as _internal
+ # from gribapi import gribapi_swig as _internal
+ import types
+ import sys
diff --git a/debian/rules b/debian/rules
index 48fb74e..2f949c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,6 +53,7 @@ override_dh_auto_configure:
 	F77=gfortran dh_auto_configure -- \
 	    ${BUILD_FLAGS}
 	( cd ${BUILDDIR}/data ; tar axpf $(CURDIR)/../eccodes_$(UPSTREAM_VERSION).orig-data.tar.xz )
+	( cd python ; swig -python -module gribapi_swig -o swig_wrap_numpy.c gribapi_swig.i )
 
 override_dh_install:
 	# Move to multiarch dir

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