[Python-modules-commits] [pypandoc] 05/05: change version to 1.4+ds0-1 (UNRELEASED) New upstream version

[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 17753255e5d60ea391302949e7ccd8bdcb9f1d37
Merge: 51e6849 9d59e83
Author: Elena Grandi <valhalla-d at trueelena.org>
Date:   Fri May 19 19:00:32 2017 +0200

    change version to 1.4+ds0-1 (UNRELEASED)
    New upstream version

 README.md                                          | 97 ++++++++++++----------
 debian/.git-dpm                                    |  6 +-
 debian/changelog                                   |  6 ++
 ...0001-Skip-test-s-that-require-the-network.patch |  7 +-
 ...g-of-unicode-paths-on-non-unicode-locales.patch |  6 +-
 pypandoc/__init__.py                               |  8 +-
 pypandoc/pandoc_download.py                        | 62 ++++++++++----
 setup.cfg                                          |  1 -
 setup.py                                           |  9 ++
 tests.py                                           | 29 ++++---
 10 files changed, 146 insertions(+), 85 deletions(-)

diff --cc debian/.git-dpm
index 1eb327d,0000000..ae5b7e1
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
- f24e93e8ba0403556b2e3b905790ad356c0f3757
- f24e93e8ba0403556b2e3b905790ad356c0f3757
- 4e350f81f02df42ad871d205108145cbf38860a4
++9d59e8362374dfc516cfc606d9ffd81b2f1ed5e1
++9d59e8362374dfc516cfc606d9ffd81b2f1ed5e1
++815856f6cf3fa9d8728011d2273931ae0e1ff548
 +815856f6cf3fa9d8728011d2273931ae0e1ff548
 +pypandoc_1.4+ds0.orig.tar.gz
 +aa92c4100f7d12faa098095b4df378b6fe94a791
 +19865
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 8dd89ff,0000000..1cd475d
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,0 +1,25 @@@
++pypandoc (1.4+ds0-1) UNRELEASED; urgency=medium
++
++  * New upstream version
++
++ -- Elena Grandi <valhalla-d at trueelena.org>  Fri, 19 May 2017 19:00:32 +0200
++
 +pypandoc (1.3.3+ds0-1) unstable; urgency=medium
 +
 +  * New upstream release.
 +  * Minor packaging fixes (docs, watchfile).
 +  * Fix issue with unicode in non-unicode locales (forwarded)
 +
 + -- Elena Grandi <valhalla-d at trueelena.org>  Sat, 05 Nov 2016 14:19:29 +0100
 +
 +pypandoc (1.2.0+ds0-1) unstable; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Elena Grandi <valhalla-d at trueelena.org>  Sat, 30 Jul 2016 16:25:22 +0200
 +
 +pypandoc (1.1.3+ds0-1) unstable; urgency=low
 +
 +  * Initial packaging. Closes: #794109
 +
 + -- Elena Grandi <valhalla-d at trueelena.org>  Wed, 22 Jun 2016 13:05:04 +0200
diff --cc debian/patches/0001-Skip-test-s-that-require-the-network.patch
index 5fdb119,0000000..7583b66
mode 100644,000000..100644
--- a/debian/patches/0001-Skip-test-s-that-require-the-network.patch
+++ b/debian/patches/0001-Skip-test-s-that-require-the-network.patch
@@@ -1,22 -1,0 +1,21 @@@
- From 19c9b81c330719abc5d848a09f3bf429f555b5ee Mon Sep 17 00:00:00 2001
++From e3b4a2d31120f526ab6e70b6f4b0e32757d7b305 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.
 +
- Forwarded: not-needed
 +---
 + tests.py | 1 +
 + 1 file changed, 1 insertion(+)
 +
 +diff --git a/tests.py b/tests.py
- index 1426647..3ffe834 100755
++index 90c801f..f501218 100755
 +--- a/tests.py
 ++++ b/tests.py
- @@ -163,6 +163,7 @@ class TestPypandoc(unittest.TestCase):
++@@ -168,6 +168,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/0002-Fix-parsing-of-unicode-paths-on-non-unicode-locales.patch
index b7b2727,0000000..ee276db
mode 100644,000000..100644
--- a/debian/patches/0002-Fix-parsing-of-unicode-paths-on-non-unicode-locales.patch
+++ b/debian/patches/0002-Fix-parsing-of-unicode-paths-on-non-unicode-locales.patch
@@@ -1,25 -1,0 +1,23 @@@
- From f24e93e8ba0403556b2e3b905790ad356c0f3757 Mon Sep 17 00:00:00 2001
++From 9d59e8362374dfc516cfc606d9ffd81b2f1ed5e1 Mon Sep 17 00:00:00 2001
 +From: Elena Grandi <valhalla-d at trueelena.org>
 +Date: Sat, 5 Nov 2016 13:50:56 +0100
 +Subject: Fix parsing of unicode paths on non-unicode locales
 +
- Forwarded: https://github.com/bebraw/pypandoc/issues/122
- 
 +---
 + pypandoc/__init__.py | 3 +--
 + 1 file changed, 1 insertion(+), 2 deletions(-)
 +
 +diff --git a/pypandoc/__init__.py b/pypandoc/__init__.py
- index 8da7529..c6f18ec 100644
++index abde4e3..6196d88 100644
 +--- a/pypandoc/__init__.py
 ++++ b/pypandoc/__init__.py
 +@@ -149,8 +149,7 @@ def _identify_path(source):
 +     try:
 +         path = os.path.exists(source)
 +     except UnicodeEncodeError:
 +-        source = source.encode('utf-8')
 +-        path = os.path.exists(source)
 ++        path = os.path.exists(source.encode('utf-8'))
 +     except:
 +         path  # still false
 + 

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