[python-geopandas] 06/07: Use pytest instead of nosetest to not fail all tests.

Bas Couwenberg sebastic at debian.org
Tue Aug 29 10:27:14 UTC 2017


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

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

commit 327ebfbb11e5141d2be4cc1c005a091c3fe1f28d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Aug 29 10:07:14 2017 +0200

    Use pytest instead of nosetest to not fail all tests.
---
 debian/changelog |  1 +
 debian/rules     | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8df154b..a476dfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ python-geopandas (0.3.0-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Drop patches, included upstream.
   * Remove obsolete TRAVIS env var from test commands.
+  * Use pytest instead of nosetest to not fail all tests.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 29 Aug 2017 09:26:55 +0200
 
diff --git a/debian/rules b/debian/rules
index 9c4dbff..f576534 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,16 +16,19 @@ override_dh_auto_build:
 	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bhtml doc/source build/html # HTML generator
 
 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="nosetests -v -e test_geocode.py" dh_auto_test || echo "Ignoring test failures"
+	PYBUILD_BEFORE_TEST="cp -rv examples/ {build_dir}" \
+	PYBUILD_AFTER_TEST="rm -rfv {build_dir}/examples/" \
+	PYBUILD_TEST_ARGS="-v --ignore=geopandas/tests/test_geocode.py --ignore=geopandas/tests/test_plotting.py" \
+	dh_auto_test || echo "Ignoring test failures"
 else
-	PYBUILD_SYSTEM=custom \
-	PYBUILD_TEST_ARGS="nosetests -v -e test_geocode.py" dh_auto_test
+	PYBUILD_BEFORE_TEST="cp -rv examples/ {build_dir}" \
+	PYBUILD_AFTER_TEST="rm -rfv {build_dir}/examples/" \
+	PYBUILD_TEST_ARGS="-v --ignore=geopandas/tests/test_geocode.py --ignore=geopandas/tests/test_plotting.py" \
+	dh_auto_test
 endif
 
 	rm -f examples/nybb_*.zip

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



More information about the Pkg-grass-devel mailing list