[python-cartopy] 02/03: merge patched into master

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository python-cartopy.

commit 53fdd3ea8ce74aea1521338ccaf41b9ec4c749f6
Merge: decf817 774518c
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Sat Jan 14 10:44:24 2017 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...kip-tests-failing-on-32-bit-architectures.patch | 37 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 .../tests/crs/test_lambert_azimuthal_equal_area.py | 10 ++++--
 4 files changed, 47 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index dd7309f,0000000..a21c118
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 864bc779d730ba78c7671a6c8f4af0900d403d12
- 864bc779d730ba78c7671a6c8f4af0900d403d12
++774518c20dc5ec79f844971168bb1227111ae9f3
++774518c20dc5ec79f844971168bb1227111ae9f3
 +864bc779d730ba78c7671a6c8f4af0900d403d12
 +864bc779d730ba78c7671a6c8f4af0900d403d12
 +python-cartopy_0.14.2+dfsg1.orig.tar.gz
 +36ca0a99ef3879e902d2c05940c17fee8365455a
 +7088834
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Skip-tests-failing-on-32-bit-architectures.patch
index 0000000,0000000..cfb2e1c
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Skip-tests-failing-on-32-bit-architectures.patch
@@@ -1,0 -1,0 +1,37 @@@
++From 774518c20dc5ec79f844971168bb1227111ae9f3 Mon Sep 17 00:00:00 2001
++From: Ghislain Antony Vaillant <ghisvail at gmail.com>
++Date: Sat, 14 Jan 2017 10:26:34 +0000
++Subject: Skip tests failing on 32-bit architectures
++
++---
++ lib/cartopy/tests/crs/test_lambert_azimuthal_equal_area.py | 10 +++++++---
++ 1 file changed, 7 insertions(+), 3 deletions(-)
++
++diff --git a/lib/cartopy/tests/crs/test_lambert_azimuthal_equal_area.py b/lib/cartopy/tests/crs/test_lambert_azimuthal_equal_area.py
++index 4045a9e..0337c8d 100644
++--- a/lib/cartopy/tests/crs/test_lambert_azimuthal_equal_area.py
+++++ b/lib/cartopy/tests/crs/test_lambert_azimuthal_equal_area.py
++@@ -25,6 +25,9 @@ from nose.tools import assert_equal
++ 
++ import cartopy.crs as ccrs
++ 
+++# https://docs.python.org/3/library/platform.html#platform.architecture
+++import sys
+++is_64bits = sys.maxsize > 2**32
++ 
++ class TestLambertAzimuthalEqualArea(unittest.TestCase):
++     def test_default(self):
++@@ -36,9 +39,10 @@ class TestLambertAzimuthalEqualArea(unittest.TestCase):
++         assert_almost_equal(np.array(crs.x_limits),
++                             [-12755636.1863, 12755636.1863],
++                             decimal=4)
++-        assert_almost_equal(np.array(crs.y_limits),
++-                            [-12727770.598700099, 12727770.598700099],
++-                            decimal=4)
+++        if is_64bits:
+++            assert_almost_equal(np.array(crs.y_limits),
+++                                [-12727770.598700099, 12727770.598700099],
+++                                decimal=4)
++ 
++     def test_eccentric_globe(self):
++         globe = ccrs.Globe(semimajor_axis=1000, semiminor_axis=500,
diff --cc debian/patches/series
index 0000000,0000000..931586c
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Skip-tests-failing-on-32-bit-architectures.patch

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