[pycoast] 05/07: Drop 0001-Skip-test-in-ContourWriterAGG.patch

[Antonio Valentino]

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

a_valentino-guest pushed a commit to branch master
in repository pycoast.

commit 5a1ac8a59dd818837fb3212bccdbf60892b234e5
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sun Jun 4 15:36:40 2017 +0000

    Drop 0001-Skip-test-in-ContourWriterAGG.patch
---
 debian/changelog                                   |  2 ++
 .../0001-Skip-test-in-ContourWriterAGG.patch       | 29 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 14bd13d..1642a3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ pycoast (0.6.1+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release
   * debian/copyright
     - update copyright date
+  * debian/patches
+    - drop patch 0001-Skip-test-in-ContourWriterAGG.patch, merged upstream
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 04 Jun 2017 15:27:23 +0000
 
diff --git a/debian/patches/0001-Skip-test-in-ContourWriterAGG.patch b/debian/patches/0001-Skip-test-in-ContourWriterAGG.patch
deleted file mode 100644
index beecb80..0000000
--- a/debian/patches/0001-Skip-test-in-ContourWriterAGG.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Sun, 3 Jul 2016 08:37:01 +0000
-Subject: Skip test in ContourWriterAGG
-
----
- pycoast/tests/test_pycoast.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/pycoast/tests/test_pycoast.py b/pycoast/tests/test_pycoast.py
-index 8675a58..98e61bf 100644
---- a/pycoast/tests/test_pycoast.py
-+++ b/pycoast/tests/test_pycoast.py
-@@ -21,7 +21,7 @@ import unittest
- import numpy as np
- from PIL import Image, ImageFont
- 
--from pycoast import ContourWriter
-+from pycoast import ContourWriter, ContourWriterAGG
- 
- 
- def tmp(f):
-@@ -305,6 +305,7 @@ class TestPIL(TestPycoast):
-         self.failUnless(fft_metric(grid_data, res), 'Writing of Brazil shapefiles failed')
- 
- 
-+ at unittest.skipIf(ContourWriterAGG is ContourWriter, 'aggdraw not available')
- class TestPILAGG(TestPycoast):
-     def test_europe_agg(self):
-         from pycoast import ContourWriterAGG
diff --git a/debian/patches/series b/debian/patches/series
index e187e7a..05f27ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-0001-Skip-test-in-ContourWriterAGG.patch
 0002-Skip-offending-tests.patch
 0003-Skip-tests-that-use-shapes.patch

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