[python-geopandas] 03/04: Test is now skipped without patch

[Johan Van de Wauw]

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

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

commit 9216254db4ffeef8a8f3c03d02a1dc3d83374fd0
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Thu Feb 5 16:35:22 2015 +0100

    Test is now skipped without patch
---
 ...kip-tests-if-building-on-debian-no-internet.patch | 20 --------------------
 debian/patches/series                                |  1 -
 debian/rules                                         |  4 ++--
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/debian/patches/0001-Skip-tests-if-building-on-debian-no-internet.patch b/debian/patches/0001-Skip-tests-if-building-on-debian-no-internet.patch
deleted file mode 100644
index 6cc8c43..0000000
--- a/debian/patches/0001-Skip-tests-if-building-on-debian-no-internet.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Johan Van de Wauw <johan.vandewauw at gmail.com>
-Date: Thu, 18 Dec 2014 08:54:15 +0100
-Subject: Skip tests if building on debian (no internet)
-
----
- tests/test_geocode.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tests/test_geocode.py b/tests/test_geocode.py
-index f108454..ca7a8e7 100644
---- a/tests/test_geocode.py
-+++ b/tests/test_geocode.py
-@@ -14,6 +14,7 @@ from .util import unittest
- 
- def _skip_if_no_geopy():
-     try:
-+        raise nose.SkipTest("Skip Geopy tests on debian with no internet access")
-         import geopy
-     except ImportError:
-         raise nose.SkipTest("Geopy not installed. Skipping tests.")
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index dd18df8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Skip-tests-if-building-on-debian-no-internet.patch
diff --git a/debian/rules b/debian/rules
index e8a52c1..2856d39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,11 @@
 #!/usr/bin/make -f
 
 export PYBUILD_NAME=geopandas
-export PYBUILD_TEST_NOSE=1
+export PYBUILD_TEST_PYTEST=1
 export PYBUILD_BEFORE_TEST=cp -r {dir}/tests {build_dir} ;cp -r {dir}/examples {build_dir};cp -r {dir}/debian/source/include-binaries/*.zip {build_dir}/examples/
 export PYBUILD_AFTER_TEST=rm -rf {build_dir}/examples {build_dir}/tests
 #disable geopy test as these require online access
-export PYBUILD_TEST_ARGS=--exclude test_geopy
+export PYBUILD_TEST_ARGS=tests -k "not test_geocode"
 
 %:
 	dh  $@ --with python2,python3,sphinxdoc --buildsystem pybuild

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