[Git][debian-gis-team/pyosmium][master] 3 commits: Add upstream patch to fix test failure on i386.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / pyosmium


Commits:
f1ca5fee by Bas Couwenberg at 2018-08-07T19:33:12Z
Add upstream patch to fix test failure on i386.

- - - - -
50ae702e by Bas Couwenberg at 2018-08-07T19:34:06Z
Don't ignore test failures on i386 & hurd-i386.

Revert "Ignore test failures on i386 & hurd-i386."

This reverts commit 99221281b36e66119aa92a395b5b79740136019c.

- - - - -
4b675df1 by Bas Couwenberg at 2018-08-07T19:34:29Z
Set distribution to unstable.

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/0001-tests-use-fuzzy-equal-for-coordinate-floats.patch
- + debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pyosmium (2.14.2-3) unstable; urgency=medium
+
+  * Add upstream patch to fix test failure on i386.
+  * Don't ignore test failures on i386 & hurd-i386.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 07 Aug 2018 21:34:17 +0200
+
 pyosmium (2.14.2-2) unstable; urgency=medium
 
   * Ignore test failures on i386 & hurd-i386.


=====================================
debian/patches/0001-tests-use-fuzzy-equal-for-coordinate-floats.patch
=====================================
--- /dev/null
+++ b/debian/patches/0001-tests-use-fuzzy-equal-for-coordinate-floats.patch
@@ -0,0 +1,31 @@
+Description: tests: use fuzzy equal for coordinate floats
+Author: Sarah Hoffmann <lonvia at denofr.de>
+Origin: https://github.com/osmcode/pyosmium/commit/8450ad70c6e03db5d14b5c3e725bdeb7d6733e76
+Bug: https://github.com/osmcode/pyosmium/issues/68https://github.com/osmcode/pyosmium/issues/68
+
+--- a/test/test_geom.py
++++ b/test/test_geom.py
+@@ -56,17 +56,17 @@ class TestCoordinateConversion(unittest.
+ 
+     def test_lonlat_to_mercator(self):
+         c = o.geom.lonlat_to_mercator(o.geom.Coordinates(0,0))
+-        assert_equals(c.x, 0)
+-        assert_equals(c.y, 0)
++        assert_almost_equals(c.x, 0)
++        assert_almost_equals(c.y, 0)
+ 
+     def test_mercator_lonlat(self):
+         c = o.geom.mercator_to_lonlat(o.geom.Coordinates(0,0))
+-        assert_equals(c.x, 0)
+-        assert_equals(c.y, 0)
++        assert_almost_equals(c.x, 0)
++        assert_almost_equals(c.y, 0)
+ 
+ class TestCoordinates(unittest.TestCase):
+ 
+     def test_coordinate_from_location(self):
+         c = o.geom.Coordinates(o.osm.Location(10.0, -3.0))
+-        assert_equals(c.x, 10.0)
+-        assert_equals(c.y, -3.0)
++        assert_almost_equals(c.x, 10.0)
++        assert_almost_equals(c.y, -3.0)


=====================================
debian/patches/series
=====================================
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-tests-use-fuzzy-equal-for-coordinate-floats.patch


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -7,8 +7,6 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 export PYBUILD_NAME=pyosmium
 
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
 %:
 	dh $@ \
 	    --buildsystem pybuild \
@@ -27,15 +25,8 @@ override_dh_auto_build-indep:
 	(cd doc && PYTHONPATH=$(CURDIR)/.pybuild/cpython3_`py3versions -vd`_pyosmium/build make man)
 
 override_dh_auto_test:
-ifneq (,$(filter $(DEB_BUILD_ARCH),i386 hurd-i386))
-	PYBUILD_SYSTEM=custom \
-	PYBUILD_TEST_ARGS="cd test && {interpreter} run_tests.py" \
-	dh_auto_test || echo "Ignoring test failures"
-else
 	PYBUILD_SYSTEM=custom \
-	PYBUILD_TEST_ARGS="cd test && {interpreter} run_tests.py" \
-	dh_auto_test
-endif
+	PYBUILD_TEST_ARGS="cd test && {interpreter} run_tests.py" dh_auto_test
 
 override_dh_auto_install:
 	PYBUILD_INSTALL_ARGS="--install-scripts=/usr/lib/{package}" dh_auto_install



View it on GitLab: https://salsa.debian.org/debian-gis-team/pyosmium/compare/2ad99f92f054c052b9ee25469d4bd5dcc1885c01...4b675df1ff4a4782d3b5ae0c22eb12cae7c0df65

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/pyosmium/compare/2ad99f92f054c052b9ee25469d4bd5dcc1885c01...4b675df1ff4a4782d3b5ae0c22eb12cae7c0df65
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180807/75ff0742/attachment-0001.html>