[Python-modules-commits] [djangorestframework-gis] 02/06: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository djangorestframework-gis.

commit 6068c119f7fcd80e5c06a612a16ce8e4b5200f18
Merge: b4e8a8f 54b385c
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Tue Oct 27 09:41:39 2015 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...-the-coordinates-are-approximately-equal-.patch | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/django_restframework_gis_tests/tests.py      |  6 ++---
 4 files changed, 35 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index 0f30bc1,0000000..462c48f
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
- 2c5b47b35b4c11ca0ed296cf644d7f4a7ccc8a55
- 2c5b47b35b4c11ca0ed296cf644d7f4a7ccc8a55
++54b385ce3b58632ac82c40b3419a07b4a6dce1ac
++54b385ce3b58632ac82c40b3419a07b4a6dce1ac
 +2e7c34d49cd13f24cc87100cfbd73ffbbbbdc7bb
 +2e7c34d49cd13f24cc87100cfbd73ffbbbbdc7bb
 +djangorestframework-gis_0.9.5.orig.tar.gz
 +9135e37d4b58db41ebc79c5814bfdb86dd59937e
 +25735
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Assert-that-the-coordinates-are-approximately-equal-.patch
index 0000000,0000000..ce8907d
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Assert-that-the-coordinates-are-approximately-equal-.patch
@@@ -1,0 -1,0 +1,30 @@@
++From 54b385ce3b58632ac82c40b3419a07b4a6dce1ac Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Tue, 27 Oct 2015 09:39:24 +0100
++Subject: Assert that the coordinates are approximately equal instead af
++ absolutely equal.
++
++This is necessary because spatialite, which is used by the unittests in the
++Debian package, yields a lower precision when it comes to floating point
++coordinates compared to PostgreSQL.
++---
++ tests/django_restframework_gis_tests/tests.py | 6 ++----
++ 1 file changed, 2 insertions(+), 4 deletions(-)
++
++diff --git a/tests/django_restframework_gis_tests/tests.py b/tests/django_restframework_gis_tests/tests.py
++index c7e4470..6ef8201 100644
++--- a/tests/django_restframework_gis_tests/tests.py
+++++ b/tests/django_restframework_gis_tests/tests.py
++@@ -132,10 +132,8 @@ class TestRestFrameworkGis(TestCase):
++         expected_coords = (6.381495826183805, 53.384066927384985)
++         self.assertEqual(response.status_code, 201)
++         self.assertEqual(Location.objects.count(), 1)
++-        self.assertEquals(
++-            Location.objects.get(name='EWKT input test').geometry.coords,
++-            expected_coords
++-        )
+++        for l, e in zip(Location.objects.get(name='EWKT input test').geometry.coords, expected_coords):
+++            self.assertAlmostEqual(l, e, places=5)
++ 
++     def test_post_location_list_WKT_as_json(self):
++         self.assertEqual(Location.objects.count(), 0)
diff --cc debian/patches/series
index 767e08a,0000000..66adfe7
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +spatialite.patch
 +skip_tests_spatialite.patch
++0003-Assert-that-the-coordinates-are-approximately-equal-.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/djangorestframework-gis.git