[pyresample] 05/07: Drop 0003-fix-tests-on-big-endian-architectures.patch

Antonio Valentino a_valentino-guest at moszumanska.debian.org
Mon Feb 5 07:26:59 UTC 2018


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

a_valentino-guest pushed a commit to branch master
in repository pyresample.

commit f4c799f24516cf8d1101a4574c8b9029dedb1772
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Mon Feb 5 07:07:47 2018 +0000

    Drop 0003-fix-tests-on-big-endian-architectures.patch
---
 debian/changelog                                   |  3 ++
 ...003-fix-tests-on-big-endian-architectures.patch | 60 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 3 insertions(+), 61 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 339ee7d..6845ea4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ pyresample (1.8.0-1) UNRELEASED; urgency=medium
   * Drop debian/source.lintian-overrides: no longer necessary
   * New python3-pyresample.lintian-overrides for:
     python-package-depends-on-package-from-other-python-variant
+  * debian/patches
+    - drop 0003-fix-tests-on-big-endian-architectures.patch:
+      applied upstream
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 14 Jan 2018 17:53:48 +0000
 
diff --git a/debian/patches/0003-fix-tests-on-big-endian-architectures.patch b/debian/patches/0003-fix-tests-on-big-endian-architectures.patch
deleted file mode 100644
index fbe6d0b..0000000
--- a/debian/patches/0003-fix-tests-on-big-endian-architectures.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Sat, 23 Dec 2017 09:47:39 +0100
-Subject: fix tests on big-endian architectures
-
----
- pyresample/test/test_geometry.py | 34 ++++++++++++++++++++--------------
- 1 file changed, 20 insertions(+), 14 deletions(-)
-
-diff --git a/pyresample/test/test_geometry.py b/pyresample/test/test_geometry.py
-index e26a26e..4db031f 100644
---- a/pyresample/test/test_geometry.py
-+++ b/pyresample/test/test_geometry.py
-@@ -216,13 +216,24 @@ class Test(unittest.TestCase):
- 
-     def test_get_array_hashable(self):
-         arr = np.array([1.2, 1.3, 1.4, 1.5])
--
--        np.testing.assert_allclose(np.array([ 51,  51,  51,  51,  51,  51, 243,
--                                           63, 205, 204, 204, 204, 204,
--                                           204, 244,  63, 102, 102, 102, 102,
--                                           102, 102, 246,  63,   0,   0,
--                                           0,   0,   0,   0, 248,  63],
--                                           dtype=np.uint8),
-+        if sys.byteorder == 'little':
-+            # arr.view(np.uint8)
-+            reference = np.array([ 51,  51,  51,  51,  51,  51, 243,
-+                                   63, 205, 204, 204, 204, 204,
-+                                   204, 244,  63, 102, 102, 102, 102,
-+                                   102, 102, 246,  63,   0,   0,
-+                                   0,   0,   0,   0, 248,  63],
-+                                   dtype=np.uint8)
-+        else:
-+            # on le machines use arr.byteswap().view(np.uint8)
-+            reference = np.array([ 63, 243,  51,  51,  51,  51,  51,
-+                                   51,  63, 244, 204, 204, 204,
-+                                   204, 204, 205,  63, 246, 102, 102,
-+                                   102, 102, 102, 102,  63, 248,
-+                                   0,   0,   0,   0,   0,   0],
-+                                   dtype=np.uint8)
-+
-+        np.testing.assert_allclose(reference,
-                                     geometry.get_array_hashable(arr))
- 
-         try:
-@@ -231,13 +242,8 @@ class Test(unittest.TestCase):
-             pass
-         else:
-             xrarr = xr.DataArray(arr)
--            np.testing.assert_allclose(np.array([ 51,  51,  51,  51,  51,  51, 243,
--                                           63, 205, 204, 204, 204, 204,
--                                           204, 244,  63, 102, 102, 102, 102,
--                                           102, 102, 246,  63,   0,   0,
--                                           0,   0,   0,   0, 248,  63],
--                                           dtype=np.uint8),
--                                    geometry.get_array_hashable(arr))
-+            np.testing.assert_allclose(reference,
-+                                       geometry.get_array_hashable(arr))
- 
-             xrarr.attrs['hash'] = 42
-             self.assertEqual(geometry.get_array_hashable(xrarr),
diff --git a/debian/patches/series b/debian/patches/series
index 1947fea..b939e25 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-fix-doc-build.patch
 0002-fix-proj4-initialization.patch
-0003-fix-tests-on-big-endian-architectures.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pyresample.git



More information about the Pkg-grass-devel mailing list