[python-geopandas] 03/03: Skip geocoding tests if building on debian (no internet)

[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 67c6b06485b8dd02dae171070ba759a63a1f4461
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Thu Dec 18 08:58:42 2014 +0100

    Skip geocoding tests if building on debian (no internet)
---
 ...kip-tests-if-building-on-debian-no-internet.patch | 20 ++++++++++++++++++++
 debian/patches/series                                |  1 +
 debian/rules                                         |  3 ---
 3 files changed, 21 insertions(+), 3 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
new file mode 100644
index 0000000..6cc8c43
--- /dev/null
+++ b/debian/patches/0001-Skip-tests-if-building-on-debian-no-internet.patch
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 0000000..dd18df8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Skip-tests-if-building-on-debian-no-internet.patch
diff --git a/debian/rules b/debian/rules
index 7ffdba4..675efd3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,6 @@
 
 export PYBUILD_NAME=geopandas
 export PYBUILD_TEST_NOSE=1
-#Disable tests using geocoding -> does not work offline
-export PYBUILD_BEFORE_TEST=mv {dir}/tests/test_geocode.py {dir}/tests/test_geocode.disabled ||true
-export PYBUILD_AFTER_TEST=mv {dir}/tests/test_geocode.disabled {dir}/tests/test_geocode.py ||true
 
 %:
 	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