[python-geopandas] 01/02: Ignore test failures on i386, package not normally built there. (closes: #860621)

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository python-geopandas.

commit d0fa8f4f4692bbbf70982b8cd2946706dce0d6d5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Apr 19 10:22:12 2017 +0200

    Ignore test failures on i386, package not normally built there. (closes: #860621)
---
 debian/changelog |  8 ++++++++
 debian/rules     | 10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 92645d2..edfb12f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-geopandas (0.2.1-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Ignore test failures on i386, package not normally built there.
+    (closes: #860621)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 19 Apr 2017 10:21:07 +0200
+
 python-geopandas (0.2.1-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/rules b/debian/rules
index 85e45e3..0c0560d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
 export PYBUILD_NAME=geopandas
 
 %:
@@ -16,8 +18,16 @@ override_dh_auto_build:
 override_dh_auto_test:
 	# Disable geocode tests as these require online access
 	cp -v debian/nybb_*.zip examples/
+
+# Ignore test failures on problematic architectures only
+ifneq (,$(findstring $(DEB_BUILD_ARCH),"i386"))
+	PYBUILD_SYSTEM=custom \
+	PYBUILD_TEST_ARGS="TRAVIS=1 nosetests -v -e test_geocode.py" dh_auto_test || echo "Ignoring test failures"
+else
 	PYBUILD_SYSTEM=custom \
 	PYBUILD_TEST_ARGS="TRAVIS=1 nosetests -v -e test_geocode.py" dh_auto_test
+endif
+
 	rm -f examples/nybb_*.zip
 
 override_dh_auto_install:

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