[gentoo-commits] repo/gentoo:master commit in: dev-python/python-debian/, dev-python/python-debian/files/

[Mike Gilbert]

commit:     34383b63cdb73f700f0e8b672d7a0e83b01dc2f0
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  1 04:25:40 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Dec  1 04:26:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34383b63

dev-python/python-debian: bump to 0.1.36

Package-Manager: Portage-2.3.79_p3, Repoman-2.3.18_p2
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 dev-python/python-debian/Manifest                  |   1 +
 .../files/0.1.36-test-no-apt-pkg.patch             | 117 +++++++++++++++++++++
 dev-python/python-debian/metadata.xml              |  16 +--
 .../python-debian/python-debian-0.1.36.ebuild      |  40 +++++++
 4 files changed, 166 insertions(+), 8 deletions(-)

diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
index 917c0ed1a41..916c6ad918f 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,3 +1,4 @@
 DIST python-debian_0.1.28.tar.xz 292404 BLAKE2B 78634043fc0dabd378bae171a485931b080dc0d31cc7e2ea448c000a1c4250e322f900cf0a0a4c3a8505af6f10da692d0fad948bc253ede7a38e4fe98831924b SHA512 ffbc924fe2dfd5790d49aacf80109bbaa18126bb8d6c9b8ffa25e9ed8b1cdeb28024a8dc202587682088e2e558da1642385faa4afda925cbb2edf6f304592a0d
 DIST python-debian_0.1.31.tar.xz 295720 BLAKE2B 3b3a68ab5604571355a15afac181e488c278ca78ab4c8a6cba4c392a0a89fd778bfd37e69a369d50fbc72f5080cf37fdbd31771f5d973c386795c436112ea347 SHA512 d2bf071b088e53ac132f91e5983c092bddb9736b3fd1394dfd2654fb8b6af7f89982af8debba8c4af21086d4f8a3ef86393fdef25ef18bcf71dcb00a60a8ae5b
 DIST python-debian_0.1.32.tar.xz 296028 BLAKE2B 15e2678a1ec2f4d96baec8b9e3ce7b84d8ad37f520fe9f174d6fe9cac8adbcbb73f628d9c3cdf39eca2639855e797b8f8cef4c9517063d61aa1e3b3ce7f1df2c SHA512 2b55d9a3100028699ec63dd4861a4f60d44e03662cc144784a37cdd980f3ff276e6cd2e535a50cdc6db28bf44affdd576259d73e14e16a2bbeeeda0de0bdd194
+DIST python-debian_0.1.36.tar.xz 308364 BLAKE2B 1cc7e2844db8143a3a4cc4f59c4bbb90bb90ab024b2524335d8ab69947ffe8c64b2b41a54a5d199cd287a3d6b6a0173c75be708af9aedfeb871e354ac1873528 SHA512 3f2ca6d86f6b6d383a1628021a77d19b562b0c409d204dba4de6968d2cdd2c8fb4aa882429fa1ce6af5361352f7a51b339c481dd47937cb103a08132379d77c5

diff --git a/dev-python/python-debian/files/0.1.36-test-no-apt-pkg.patch b/dev-python/python-debian/files/0.1.36-test-no-apt-pkg.patch
new file mode 100644
index 00000000000..64b040852b7
--- /dev/null
+++ b/dev-python/python-debian/files/0.1.36-test-no-apt-pkg.patch
@@ -0,0 +1,117 @@
+From 0b4e4e02e62ab6069e855fc44fec1cbfba3e2f2a Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@g.o>
+Date: Sat, 30 Nov 2019 23:18:05 -0500
+Subject: [PATCH] Remove tests that rely on apt_pkg
+
+---
+ lib/debian/tests/test_deb822.py | 53 ---------------------------------
+ 1 file changed, 53 deletions(-)
+
+diff --git a/lib/debian/tests/test_deb822.py b/lib/debian/tests/test_deb822.py
+index 7101727..64a724c 100755
+--- a/lib/debian/tests/test_deb822.py
++++ b/lib/debian/tests/test_deb822.py
+@@ -40,8 +40,6 @@ else:
+     from StringIO import StringIO
+     BytesIO = StringIO
+ 
+-import apt_pkg   #type: ignore
+-
+ from debian import deb822
+ from debian.debian_support import Version
+ 
+@@ -465,11 +463,6 @@ class TestDeb822(unittest.TestCase):
+         for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=False):
+             self.assertWellParsed(d, PARSED_PACKAGE)
+ 
+-        with self.assertWarns(UserWarning):
+-            # The StringIO is not a real file so this will raise a warning
+-            for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=True):
+-                self.assertWellParsed(d, PARSED_PACKAGE)
+-
+     def test_iter_paragraphs_file(self):
+         text = StringIO()
+         text.write(UNPARSED_PACKAGE)
+@@ -487,10 +480,6 @@ class TestDeb822(unittest.TestCase):
+             for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=False):
+                 self.assertWellParsed(d, PARSED_PACKAGE)
+ 
+-            fh.seek(0)
+-            for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True):
+-                self.assertWellParsed(d, PARSED_PACKAGE)
+-
+ 
+     def test_iter_paragraphs_with_gpg(self):
+         for string in GPG_SIGNED:
+@@ -556,12 +545,7 @@ class TestDeb822(unittest.TestCase):
+                 test_count(deb822.Deb822.iter_paragraphs, 2)
+                 test_count(deb822.Deb822.iter_paragraphs, 2, use_apt_pkg=False)
+ 
+-                # apt_pkg used, should not split
+-                test_count(deb822.Deb822.iter_paragraphs, 1, use_apt_pkg=True)
+-
+                 # Specialised iter_paragraphs force use of apt_pkg and don't split
+-                test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=True)
+-                test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=True)
+                 test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=False)
+                 test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=False)
+ 
+@@ -607,27 +591,11 @@ class TestDeb822(unittest.TestCase):
+                 s.write(b"\n")
+             self.assertEqual(s.getvalue(), packages_content)
+ 
+-    def test_iter_paragraphs_apt_shared_storage_packages(self):
+-        self._test_iter_paragraphs(find_test_file("test_Packages"),
+-                                   deb822.Packages,
+-                                   use_apt_pkg=True, shared_storage=True)
+-    def test_iter_paragraphs_apt_no_shared_storage_packages(self):
+-        self._test_iter_paragraphs(find_test_file("test_Packages"),
+-                                   deb822.Packages,
+-                                   use_apt_pkg=True, shared_storage=False)
+     def test_iter_paragraphs_no_apt_no_shared_storage_packages(self):
+         self._test_iter_paragraphs(find_test_file("test_Packages"),
+                                    deb822.Packages,
+                                    use_apt_pkg=False, shared_storage=False)
+ 
+-    def test_iter_paragraphs_apt_shared_storage_sources(self):
+-        self._test_iter_paragraphs(find_test_file("test_Sources"),
+-                                   deb822.Sources,
+-                                   use_apt_pkg=True, shared_storage=True)
+-    def test_iter_paragraphs_apt_no_shared_storage_sources(self):
+-        self._test_iter_paragraphs(find_test_file("test_Sources"),
+-                                   deb822.Sources,
+-                                   use_apt_pkg=True, shared_storage=False)
+     def test_iter_paragraphs_no_apt_no_shared_storage_sources(self):
+         self._test_iter_paragraphs(find_test_file("test_Sources"),
+                                    deb822.Sources,
+@@ -973,27 +941,6 @@ Description: python modules to work with Debian-related data formats
+             self.assertWellParsed(paragraphs[i],
+                                   PARSED_PARAGRAPHS_WITH_COMMENTS[i])
+ 
+-    def test_iter_paragraphs_comments_use_apt_pkg(self):
+-        """ apt_pkg does not support comments within multiline fields
+-
+-        This test checks that a file with comments inside multiline fields
+-        generates an error from the apt_pkg parser.
+-
+-        See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750247#35
+-                 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807351
+-        """
+-        try:
+-            fd, filename = tempfile.mkstemp()
+-            fp = os.fdopen(fd, 'wb')
+-            fp.write(UNPARSED_PARAGRAPHS_WITH_COMMENTS.encode('utf-8'))
+-            fp.close()
+-
+-            with open_utf8(filename) as fh:
+-                with self.assertRaises(apt_pkg.Error):
+-                    list(deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True))
+-        finally:
+-            os.remove(filename)
+-
+     def test_iter_paragraphs_comments_native(self):
+         paragraphs = list(deb822.Deb822.iter_paragraphs(
+             UNPARSED_PARAGRAPHS_WITH_COMMENTS.splitlines(), use_apt_pkg=False))
+-- 
+2.24.0
+

diff --git a/dev-python/python-debian/metadata.xml b/dev-python/python-debian/metadata.xml
index b45b94729bb..37d58853f5c 100644
--- a/dev-python/python-debian/metadata.xml
+++ b/dev-python/python-debian/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>floppym@g.o</email>
-    <name>Mike Gilbert</name>
-  </maintainer>
-<maintainer type="project">
-    <email>python@g.o</email>
-    <name>Python</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>floppym@g.o</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@g.o</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/dev-python/python-debian/python-debian-0.1.36.ebuild b/dev-python/python-debian/python-debian-0.1.36.ebuild
new file mode 100644
index 00000000000..49012658cf5
--- /dev/null
+++ b/dev-python/python-debian/python-debian-0.1.36.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python modules to work with Debian-related data formats"
+HOMEPAGE="https://packages.debian.org/sid/python-debian"
+SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		app-arch/dpkg
+		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2)
+	)
+"
+
+PATCHES=( "${FILESDIR}/0.1.36-test-no-apt-pkg.patch" )
+
+python_compile_all() {
+	${EPYTHON} lib/debian/doc-debtags > README.debtags || die
+}
+
+python_test() {
+	${EPYTHON} -m unittest discover --verbose lib || die "Testing failed with ${EPYTHON}"
+}