[Python-modules-commits] [pypandoc] 05/08: merge patched into master

[Elena Grandi]

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

valhalla-guest pushed a commit to branch master
in repository pypandoc.

commit a227d5a89b33b3a88fcf54f5fbc5150fff037b08
Merge: 266e233 19c9b81
Author: Elena Grandi <valhalla-d at trueelena.org>
Date:   Sat Nov 5 12:47:34 2016 +0100

    merge patched into master

 debian/.git-dpm                                     |  4 ++--
 .../0001-Skip-test-s-that-require-the-network.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 tests.py                                            |  1 +
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 683e7f7,0000000..377abc9
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 4e350f81f02df42ad871d205108145cbf38860a4
- 4e350f81f02df42ad871d205108145cbf38860a4
++19c9b81c330719abc5d848a09f3bf429f555b5ee
++19c9b81c330719abc5d848a09f3bf429f555b5ee
 +4e350f81f02df42ad871d205108145cbf38860a4
 +4e350f81f02df42ad871d205108145cbf38860a4
 +pypandoc_1.3.3+ds0.orig.tar.gz
 +ba9713e7edc6f6b5433b4e909917484a06b39b10
 +18968
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Skip-test-s-that-require-the-network.patch
index 0000000,0000000..feba3e0
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Skip-test-s-that-require-the-network.patch
@@@ -1,0 -1,0 +1,21 @@@
++From 19c9b81c330719abc5d848a09f3bf429f555b5ee Mon Sep 17 00:00:00 2001
++From: Elena Grandi <valhalla-d at trueelena.org>
++Date: Sat, 5 Nov 2016 12:47:21 +0100
++Subject: Skip test(s) that require the network.
++
++---
++ tests.py | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/tests.py b/tests.py
++index 1426647..3ffe834 100755
++--- a/tests.py
+++++ b/tests.py
++@@ -163,6 +163,7 @@ class TestPypandoc(unittest.TestCase):
++             received = pypandoc.convert(file_url, 'rst')
++             self.assertEqualExceptForNewlineEnd(expected, received)
++ 
+++    @unittest.skip('requires network')
++     def test_basic_conversion_from_http_url(self):
++         url = 'https://raw.githubusercontent.com/bebraw/pypandoc/master/README.md'
++         received = pypandoc.convert(url, 'html')
diff --cc debian/patches/series
index 0000000,0000000..925fd05
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Skip-test-s-that-require-the-network.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pypandoc.git