This is an automated email from the git hooks/post-receive script. johanvdw-guest pushed a commit to branch master in repository fiona.
commit 6d5a08324d107da2163317d6cad4d37bd86380fd Author: Johan Van de Wauw <johan.vandew...@gmail.com> Date: Wed Oct 22 22:36:39 2014 +0200 Remove patches (included in upstream release) --- ...01-Skip-gpkg-test-if-fixture-is-not-found.patch | 56 ---------------------- debian/patches/series | 1 - 2 files changed, 57 deletions(-) diff --git a/debian/patches/0001-Skip-gpkg-test-if-fixture-is-not-found.patch b/debian/patches/0001-Skip-gpkg-test-if-fixture-is-not-found.patch deleted file mode 100644 index 34f7490..0000000 --- a/debian/patches/0001-Skip-gpkg-test-if-fixture-is-not-found.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 8111b99638a55cf9833fd79a05a8911a8c82c6c7 Mon Sep 17 00:00:00 2001 -From: Sean Gillies <s...@mapbox.com> -Date: Tue, 14 Oct 2014 08:33:48 -0700 -Subject: [PATCH] Skip gpkg test if fixture is not found. - -Closes #167. ---- - tests/test_geopackage.py | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/tests/test_geopackage.py b/tests/test_geopackage.py -index 3cc599d..d990d34 100644 ---- a/tests/test_geopackage.py -+++ b/tests/test_geopackage.py -@@ -1,15 +1,20 @@ - - import logging - import os -+import os.path - import shutil - import sys - import tempfile - import unittest - -+import pytest -+ - import fiona - from fiona.collection import supported_drivers - from fiona.errors import FionaValueError, DriverError, SchemaError, CRSError - from fiona.ogrext import calc_gdal_version_num, get_gdal_version_num -+ -+ - logging.basicConfig(stream=sys.stderr, level=logging.DEBUG) - - -@@ -21,6 +26,8 @@ class ReadingTest(unittest.TestCase): - def tearDown(self): - pass - -+ @pytest.mark.skipif(not os.path.exists('docs/data/test_uk.gpkg'), -+ reason="Requires geopackage fixture") - def test_gpkg(self): - if get_gdal_version_num() < calc_gdal_version_num(1, 11, 0): - self.assertRaises(DriverError, fiona.open, 'docs/data/test_uk.gpkg', 'r', driver="GPKG") -@@ -37,6 +44,8 @@ class WritingTest(unittest.TestCase): - def tearDown(self): - shutil.rmtree(self.tempdir) - -+ @pytest.mark.skipif(not os.path.exists('docs/data/test_uk.gpkg'), -+ reason="Requires geopackage fixture") - def test_gpkg(self): - schema = {'geometry': 'Point', - 'properties': [('title', 'str')]} --- -2.1.1 - diff --git a/debian/patches/series b/debian/patches/series index 7f76322..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +0,0 @@ -0001-Skip-gpkg-test-if-fixture-is-not-found.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/fiona.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel